aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fischer@muhq.space>2023-07-31 18:17:44 +0200
committerFlorian Fischer <florian.fischer@muhq.space>2023-07-31 18:17:44 +0200
commit157867933ff77037555983eb9c085e8e9471a348 (patch)
tree92d533f346a5d72116405a9255e03312c3419641
parent1e74e284c06a099b3917e932886da4549faab950 (diff)
downloadWRMS-157867933ff77037555983eb9c085e8e9471a348.tar.gz
WRMS-157867933ff77037555983eb9c085e8e9471a348.zip
bumble up a possible error creating the upload directory
-rw-r--r--player.go2
-rw-r--r--upload.go8
2 files changed, 6 insertions, 4 deletions
diff --git a/player.go b/player.go
index b8db8fa..d819abc 100644
--- a/player.go
+++ b/player.go
@@ -53,7 +53,7 @@ func NewMpvPlayer(wrms *Wrms, backends []string) *MpvPlayer {
case "local":
b = NewLocalBackend(wrms.Config.LocalMusicDir)
case "upload":
- b = NewUploadBackend(wrms.Config.UploadDir)
+ b, err = NewUploadBackend(wrms.Config.UploadDir)
default:
llog.Error("Not supported backend %s", backend)
}
diff --git a/upload.go b/upload.go
index 7a0ecc8..1596857 100644
--- a/upload.go
+++ b/upload.go
@@ -17,20 +17,22 @@ type UploadBackend struct {
uploadDir string
}
-func NewUploadBackend(uploadDir string) *UploadBackend {
+func NewUploadBackend(uploadDir string) (*UploadBackend, error) {
b := UploadBackend{uploadDir: uploadDir}
dirInfo, err := os.Stat(uploadDir)
if os.IsNotExist(err) {
- os.MkdirAll(uploadDir, 0750)
+ if err = os.MkdirAll(uploadDir, 0750); err != nil {
+ return nil, err
+ }
} else if !dirInfo.IsDir() {
llog.Fatal("upload directory %s exists and is not a directory", uploadDir)
}
b.setupUploadRoute()
- return &b
+ return &b, nil
}
func (b *UploadBackend) upload(w http.ResponseWriter, r *http.Request) {