Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-06 08:22:24 +01:00
Code Issues Projects Releases Wiki Activity

fix (patch): bundle issue on plugin patch

Browse source
This commit is contained in:
MickaelK 2025-03-17 12:24:13 +11:00
parent 299ff86b54
commit 542ead9c25
1 changed files with 57 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
server/ctrl/static.go
View file

@ -340,46 +340,13 @@ func ServeFile(chroot string) func(*App, http.ResponseWriter, *http.Request) {
}
// case: patch must be apply because of a "StaticPatch" plugin
for _, patch := range Hooks.Get.StaticPatch() {
patchFile, err := patch.Open(strings.TrimPrefix(filePath, "/"))
if err != nil {
continue
}
defer patchFile.Close()
patchFiles, _, err := gitdiff.Parse(patchFile)
if err != nil {
Log.Debug("ctrl::static cannot parse patch file - %s", err.Error())
break
} else if len(patchFiles) != 1 {
Log.Debug("ctrl::static unepected patch file size - must be 1, got %d", len(patchFiles))
break
}
origFile, err := WWWPublic.Open(filePath)
if err != nil {
Log.Debug("ctrl::static cannot open public file - %+v", err.Error())
continue
}
originalBuffer, err := io.ReadAll(origFile)
if err != nil {
Log.Debug("ctrl::static cannot read public file - %+v", err.Error())
continue
}
var output bytes.Buffer
origFile.Close()
if err := gitdiff.Apply(
&output,
bytes.NewReader(originalBuffer),
patchFiles[0],
); err != nil {
Log.Debug("ctrl::static cannot apply patch - %s", err.Error())
break
}
if f := applyPatch(filePath); f != nil {
head.Set("Content-Type", GetMimeType(filepath.Ext(filePath)))
head.Set("Cache-Control", "no-cache")
head.Set("Pragma", "no-cache")
head.Set("Expires", "0")
res.WriteHeader(http.StatusOK)
res.Write(output.Bytes())
res.Write(f.Bytes())
return
}
@ -465,7 +432,13 @@ func ServeBundle(ctx *App, res http.ResponseWriter, req *http.Request) {
urls := req.URL.Query()["url"]
for i := 0; i < len(urls); i++ {
curPath := "assets" + strings.TrimPrefix(urls[i], "/assets/"+BUILD_REF)
file, err := WWWPublic.Open(curPath + ".gz")
var file io.ReadCloser
var err error
if f := applyPatch(curPath); f != nil {
file = io.NopCloser(f)
fmt.Fprintf(res, "event: %s\n", "static::raw")
} else {
file, err = WWWPublic.Open(curPath + ".gz")
if err != nil {
file, err = WWWPublic.Open(curPath)
if err != nil {
@ -476,6 +449,7 @@ func ServeBundle(ctx *App, res http.ResponseWriter, req *http.Request) {
} else {
fmt.Fprintf(res, "event: %s\n", "static::gzip")
}
}
fmt.Fprintf(res, "id: %s\n", urls[i])
fmt.Fprintf(res, "data: ")
b, _ := io.ReadAll(file)
@ -488,6 +462,46 @@ func ServeBundle(ctx *App, res http.ResponseWriter, req *http.Request) {
res.(http.Flusher).Flush()
}
func applyPatch(filePath string) (file *bytes.Buffer) {
for _, patch := range Hooks.Get.StaticPatch() {
patchFile, err := patch.Open(strings.TrimPrefix(filePath, "/"))
if err != nil {
continue
}
defer patchFile.Close()
patchFiles, _, err := gitdiff.Parse(patchFile)
if err != nil {
Log.Debug("ctrl::static cannot parse patch file - %s", err.Error())
break
} else if len(patchFiles) != 1 {
Log.Debug("ctrl::static unepected patch file size - must be 1, got %d", len(patchFiles))
break
}
origFile, err := WWWPublic.Open(filePath)
if err != nil {
Log.Debug("ctrl::static cannot open public file - %+v", err.Error())
continue
}
originalBuffer, err := io.ReadAll(origFile)
if err != nil {
Log.Debug("ctrl::static cannot read public file - %+v", err.Error())
continue
}
var output bytes.Buffer
origFile.Close()
if err := gitdiff.Apply(
&output,
bytes.NewReader(originalBuffer),
patchFiles[0],
); err != nil {
Log.Debug("ctrl::static cannot apply patch - %s", err.Error())
break
}
return &output
}
return nil
}
func InitPluginList(code []byte) {
listOfPackages := regexp.MustCompile(`\t_?\s*\"(github.com/[^\"]+)`).FindAllStringSubmatch(string(code), -1)
for _, packageNameMatch := range listOfPackages {