From 7cd63ac46d0f7cde909a53016ec471544577c79b Mon Sep 17 00:00:00 2001 From: MrMelon54 Date: Tue, 7 Jan 2025 21:18:37 +0000 Subject: [PATCH] Change old path to 'old@[...]' --- upload/upload.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/upload/upload.go b/upload/upload.go index 26169ce..7611e84 100644 --- a/upload/upload.go +++ b/upload/upload.go @@ -43,8 +43,6 @@ func (h *Handler) Handle(rw http.ResponseWriter, req *http.Request, params httpr site := params.ByName("site") branch := params.ByName("branch") - site = strings.ReplaceAll(site, "*", "") - siteConf, err := h.db.GetSiteByDomain(req.Context(), site) if err != nil { http.Error(rw, "", http.StatusNotFound) @@ -83,12 +81,17 @@ func (h *Handler) extractTarGzUpload(fileData io.Reader, site, branch string) er } siteBranchPath := filepath.Join(site, "@"+branch) + // try the new "old@[...]" and old "@[...].old" paths err := h.storageFs.RemoveAll(siteBranchPath + ".old") if err != nil && !errors.Is(err, fs.ErrNotExist) { return fmt.Errorf("failed to remove old site branch %s: %w", siteBranchPath, err) } + err = h.storageFs.RemoveAll("old" + siteBranchPath) + if err != nil && !errors.Is(err, fs.ErrNotExist) { + return fmt.Errorf("failed to remove old site branch %s: %w", siteBranchPath, err) + } - err = h.storageFs.Rename(siteBranchPath, siteBranchPath+".old") + err = h.storageFs.Rename(siteBranchPath, "old"+siteBranchPath) if err != nil && !errors.Is(err, fs.ErrNotExist) { return fmt.Errorf("failed to save an old copy of the site: %w", err) }