From 2469ec062724f39d594f84d1c62362da01b9a644 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Mon, 30 Dec 2019 00:05:39 +0100 Subject: Also handle uploads --- system/admin/upload/upload.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'system/admin/upload/upload.go') diff --git a/system/admin/upload/upload.go b/system/admin/upload/upload.go index fd29796..e19c3af 100644 --- a/system/admin/upload/upload.go +++ b/system/admin/upload/upload.go @@ -41,11 +41,6 @@ func StoreFiles(req *http.Request) (map[string]string, error) { req.Form.Set("timestamp", ts) // get or create upload directory to save files from request - pwd, err := os.Getwd() - if err != nil { - err := fmt.Errorf("Failed to locate current directory: %s", err) - return nil, err - } i, err := strconv.ParseInt(ts, 10, 64) if err != nil { @@ -57,7 +52,7 @@ func StoreFiles(req *http.Request) (map[string]string, error) { urlPathPrefix := "api" uploadDirName := "uploads" - uploadDir := filepath.Join(pwd, uploadDirName, fmt.Sprintf("%d", tm.Year()), fmt.Sprintf("%02d", tm.Month())) + uploadDir := filepath.Join(cfg.UploadDir(), fmt.Sprintf("%d", tm.Year()), fmt.Sprintf("%02d", tm.Month())) err = os.MkdirAll(uploadDir, os.ModeDir|os.ModePerm) if err != nil { return nil, err -- cgit v1.2.3 From 6ee81caea4649d3fc3bb6b5bde0628cb91c8e6f5 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Mon, 30 Dec 2019 00:52:57 +0100 Subject: Fix missing imports --- system/admin/upload/upload.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/admin/upload/upload.go') diff --git a/system/admin/upload/upload.go b/system/admin/upload/upload.go index e19c3af..a5a2d1c 100644 --- a/system/admin/upload/upload.go +++ b/system/admin/upload/upload.go @@ -14,6 +14,8 @@ import ( "strconv" "time" + "github.com/ponzu-cms/ponzu/system/cfg" + "github.com/ponzu-cms/ponzu/system/db" "github.com/ponzu-cms/ponzu/system/item" ) @@ -41,7 +43,6 @@ func StoreFiles(req *http.Request) (map[string]string, error) { req.Form.Set("timestamp", ts) // get or create upload directory to save files from request - i, err := strconv.ParseInt(ts, 10, 64) if err != nil { return nil, err @@ -51,7 +52,6 @@ func StoreFiles(req *http.Request) (map[string]string, error) { urlPathPrefix := "api" uploadDirName := "uploads" - uploadDir := filepath.Join(cfg.UploadDir(), fmt.Sprintf("%d", tm.Year()), fmt.Sprintf("%02d", tm.Month())) err = os.MkdirAll(uploadDir, os.ModeDir|os.ModePerm) if err != nil { -- cgit v1.2.3