1f349/bluebell
4
0
Fork 0
mirror of https://github.com/1f349/site-hosting.git synced 2025-01-21 06:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change old path to 'old@[...]'

Browse Source
This commit is contained in:
Melon 2025-01-07 21:18:37 +00:00
parent 4a02ed02d6
commit 7cd63ac46d
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
upload/upload.go
View File

@ -43,8 +43,6 @@ func (h *Handler) Handle(rw http.ResponseWriter, req *http.Request, params httpr
site := params.ByName("site") site := params.ByName("site")
branch := params.ByName("branch") branch := params.ByName("branch")
site = strings.ReplaceAll(site, "*", "")
siteConf, err := h.db.GetSiteByDomain(req.Context(), site) siteConf, err := h.db.GetSiteByDomain(req.Context(), site)
if err != nil { if err != nil {
http.Error(rw, "", http.StatusNotFound) 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) siteBranchPath := filepath.Join(site, "@"+branch)
// try the new "old@[...]" and old "@[...].old" paths
err := h.storageFs.RemoveAll(siteBranchPath + ".old") err := h.storageFs.RemoveAll(siteBranchPath + ".old")
if err != nil && !errors.Is(err, fs.ErrNotExist) { if err != nil && !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("failed to remove old site branch %s: %w", siteBranchPath, err) 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) { if err != nil && !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("failed to save an old copy of the site: %w", err) return fmt.Errorf("failed to save an old copy of the site: %w", err)
} }