serv/tube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove use of temporary file

Browse source
This commit is contained in:
James Mills 2020-03-22 18:58:37 +10:00
parent 06b7ddf175
commit 2dced8e3ce
No known key found for this signature in database
GPG key ID: AC4C014F1440EBD6
2 changed files with 52 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/app.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
"html/template"
"io"
"io/ioutil"
"net"
"net/http"
"os"
@ -201,15 +200,6 @@ func (a *App) uploadHandler(w http.ResponseWriter, r *http.Request) {
return
}
tf, err := ioutil.TempFile("", "tube-upload-*.mp4")
if err != nil {
err := fmt.Errorf("error creating tempory file: %w", err)
log.Error(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer os.Remove(tf.Name())
of := filepath.Join(
a.Library.Paths[collection].Path,
fmt.Sprintf(
@ -229,7 +219,7 @@ func (a *App) uploadHandler(w http.ResponseWriter, r *http.Request) {
"-acodec", "aac",
"-strict", "-2",
"-loglevel", "quiet",
tf.Name(),
of,
); err != nil {
err := fmt.Errorf("error transcoding video: %w", err)
log.Error(err)
@ -237,15 +227,8 @@ func (a *App) uploadHandler(w http.ResponseWriter, r *http.Request) {
return
}
if err := os.Rename(tf.Name(), of); err != nil {
err := fmt.Errorf("error renaming temporary file to output file: %w", err)
log.Error(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if err := os.Remove(fn); err != nil {
err := fmt.Errorf("error removing file: %w", err)
err := fmt.Errorf("error removing uploaded file: %w", err)
log.Error(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return

100
app/rice-box.go
View file

File diff suppressed because one or more lines are too long