From f5d9cd2ff4d465e2a300860e32687e13054c2a6c Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:07:24 +0100 Subject: [PATCH 1/7] use path inside package cmd --- internal/theme/theme.go | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index d824bec..ca67bab 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -71,8 +71,12 @@ func (t *Theme) Package(dstDir string) (string, error) { filename := fmt.Sprintf("%s.zip", "theme") - if dstDir != "." { - filename = fmt.Sprintf("%s/%s", dstDir, filename) + // if dstDir != "." { + // filename = fmt.Sprintf("%s/%s", dstDir, filename) + // } + + if t.Path != "." { + filename = filepath.Join(t.Path, filename) } err := createZipThemePackage(t.Path, filename) @@ -118,7 +122,7 @@ func (t *Theme) Upload(remoteThemeId *int) (int, error) { return -1, fmt.Errorf("Not a valid theme folder") } - filename, err := t.Package("/tmp") + filename, err := t.Package(filepath.Join(t.Path, "tmp")) if err != nil { return -1, err @@ -164,6 +168,8 @@ func (t *Theme) Delete() error { } func createZipThemePackage(srcDir string, destZip string) error { + fmt.Println(srcDir) + fmt.Println(destZip) zipFile, err := os.Create(destZip) if err != nil { return err @@ -183,7 +189,15 @@ func createZipThemePackage(srcDir string, destZip string) error { return err } - if relPath == "." || relPath == ".." || relPath == destZip { + // fmt.Println(path) + if relPath == "." || relPath == ".." || relPath == destZip{ + return nil + } + + // fmt.Println(path) + // fmt.Println(destZip) + if (path == "." || path == ".." || path == destZip) { + fmt.Println("Hit the thing", path) return nil } From bbbafd0dd69178164f5819723cf6e04d6a6e1e03 Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:42:57 +0100 Subject: [PATCH 2/7] simplified filename creation --- internal/theme/theme.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index ca67bab..cb5e3c8 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -69,15 +69,7 @@ func (t *Theme) Package(dstDir string) (string, error) { dstDir = "." } - filename := fmt.Sprintf("%s.zip", "theme") - - // if dstDir != "." { - // filename = fmt.Sprintf("%s/%s", dstDir, filename) - // } - - if t.Path != "." { - filename = filepath.Join(t.Path, filename) - } + filename := filepath.Join(t.Path, "tmp", "theme.zip") err := createZipThemePackage(t.Path, filename) From 40418eee325238251a68a39fb8bec38bf671e0eb Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:43:10 +0100 Subject: [PATCH 3/7] non capitalized error strtings --- internal/theme/theme.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index cb5e3c8..680d06e 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -62,7 +62,7 @@ func NewTheme(path string) (*Theme, error) { func (t *Theme) Package(dstDir string) (string, error) { if !t.IsValid() { - return "", fmt.Errorf("Not a valid theme folder") + return "", fmt.Errorf("not a valid theme folder") } if dstDir == "" { @@ -111,7 +111,7 @@ func (t *Theme) Upload(remoteThemeId *int) (int, error) { // create a zip file of the theme if !t.IsValid() { - return -1, fmt.Errorf("Not a valid theme folder") + return -1, fmt.Errorf("not a valid theme folder") } filename, err := t.Package(filepath.Join(t.Path, "tmp")) From e3c288aeab7ade8bde453b3256d80b173b8dc8f7 Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:43:27 +0100 Subject: [PATCH 4/7] Create missing folders to zip path first --- internal/theme/theme.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index 680d06e..edd5d1b 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -162,6 +162,12 @@ func (t *Theme) Delete() error { func createZipThemePackage(srcDir string, destZip string) error { fmt.Println(srcDir) fmt.Println(destZip) + + // Create the folder to the zip first if needed + if err := os.MkdirAll(filepath.Dir(destZip), os.ModePerm); err != nil { + return err + } + zipFile, err := os.Create(destZip) if err != nil { return err From 60518237511bdebddd177c72b6dda7922849b350 Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:43:45 +0100 Subject: [PATCH 5/7] simplified the if statement --- internal/theme/theme.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index edd5d1b..5ff47fd 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -187,15 +187,12 @@ func createZipThemePackage(srcDir string, destZip string) error { return err } - // fmt.Println(path) if relPath == "." || relPath == ".." || relPath == destZip{ return nil } - // fmt.Println(path) - // fmt.Println(destZip) - if (path == "." || path == ".." || path == destZip) { - fmt.Println("Hit the thing", path) + // Don't add again the zip inside the same zip file + if (path == destZip) { return nil } From 05e361bc063c242c7e6226b5969be86566ffb2d0 Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 11:54:07 +0100 Subject: [PATCH 6/7] added debug logger for sucessfull theme upload --- internal/theme/theme.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index 5ff47fd..626f383 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -272,6 +272,8 @@ func uploadFile(filename string, themeId *int, url string) (*ThemeUploadResponse return nil, fmt.Errorf("upload fallito: %s", resp.Status) } + logger.Debug("File Upload successfully") + var themeResp ThemeUploadResponse if err := json.NewDecoder(resp.Body).Decode(&themeResp); err != nil { From abddea5ccfc126b9a21aa1f10f1cc09cf39e93b1 Mon Sep 17 00:00:00 2001 From: LnrdRmj Date: Thu, 30 Jan 2025 12:08:30 +0100 Subject: [PATCH 7/7] fix some logs --- internal/theme/theme.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/theme/theme.go b/internal/theme/theme.go index 626f383..f823409 100644 --- a/internal/theme/theme.go +++ b/internal/theme/theme.go @@ -160,9 +160,6 @@ func (t *Theme) Delete() error { } func createZipThemePackage(srcDir string, destZip string) error { - fmt.Println(srcDir) - fmt.Println(destZip) - // Create the folder to the zip first if needed if err := os.MkdirAll(filepath.Dir(destZip), os.ModePerm); err != nil { return err @@ -272,7 +269,7 @@ func uploadFile(filename string, themeId *int, url string) (*ThemeUploadResponse return nil, fmt.Errorf("upload fallito: %s", resp.Status) } - logger.Debug("File Upload successfully") + logger.Info("File Upload successfully") var themeResp ThemeUploadResponse