summaryrefslogtreecommitdiff
path: root/app/app.go
diff options
context:
space:
mode:
authorJames Mills <prologic@shortcircuit.net.au>2020-03-22 18:58:37 +1000
committerJames Mills <prologic@shortcircuit.net.au>2020-03-22 18:58:37 +1000
commit2dced8e3ce275a058e64477938c6bd6afbbf3a7e (patch)
tree88f360f2e8067b638431e0383d324e03d5b50e80 /app/app.go
parent06b7ddf17578292391e90d07d4daf47e6845e037 (diff)
Remove use of temporary file
Diffstat (limited to 'app/app.go')
-rw-r--r--app/app.go21
1 files changed, 2 insertions, 19 deletions
diff --git a/app/app.go b/app/app.go
index 4257bea..d315abc 100644
--- a/app/app.go
+++ b/app/app.go
@@ -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