Skip to content

Fix theme push #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LnrdRmj wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix theme push #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5d9cd2
use path inside package cmd
LnrdRmj Jan 30, 2025
bbbafd0
simplified filename creation
LnrdRmj Jan 30, 2025
40418ee
non capitalized error strtings
LnrdRmj Jan 30, 2025
e3c288a
Create missing folders to zip path first
LnrdRmj Jan 30, 2025
6051823
simplified the if statement
LnrdRmj Jan 30, 2025
05e361b
added debug logger for sucessfull theme upload
LnrdRmj Jan 30, 2025
abddea5
fix some logs
LnrdRmj Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions internal/theme/theme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,14 @@ 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 == "" {
dstDir = "."
}

filename := fmt.Sprintf("%s.zip", "theme")

if dstDir != "." {
filename = fmt.Sprintf("%s/%s", dstDir, filename)
}
filename := filepath.Join(t.Path, "tmp", "theme.zip")

err := createZipThemePackage(t.Path, filename)

Expand Down Expand Up @@ -115,10 +111,10 @@ 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("/tmp")
filename, err := t.Package(filepath.Join(t.Path, "tmp"))

if err != nil {
return -1, err
Expand Down Expand Up @@ -164,6 +160,11 @@ func (t *Theme) Delete() error {
}

func createZipThemePackage(srcDir string, destZip string) error {
// 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
Expand All @@ -183,7 +184,12 @@ func createZipThemePackage(srcDir string, destZip string) error {
return err
}

if relPath == "." || relPath == ".." || relPath == destZip {
if relPath == "." || relPath == ".." || relPath == destZip{
return nil
}

// Don't add again the zip inside the same zip file
if (path == destZip) {
return nil
}

Expand Down Expand Up @@ -263,6 +269,8 @@ func uploadFile(filename string, themeId *int, url string) (*ThemeUploadResponse
return nil, fmt.Errorf("upload fallito: %s", resp.Status)
}

logger.Info("File Upload successfully")

var themeResp ThemeUploadResponse

if err := json.NewDecoder(resp.Body).Decode(&themeResp); err != nil {
Expand Down