github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: In-place unarchive

pull/3756/head
Laurynas Gadliauskas 2021-05-31 15:09:48 +03:00
parent a4b607d5a0
commit 641b3c45ed
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -94,6 +94,6 @@ help:
@sed -n 's/^## //p' $(MAKEFILE_LIST) | column -t -s ':' | sed -e 's/^/ /' | sort @sed -n 's/^## //p' $(MAKEFILE_LIST) | column -t -s ':' | sed -e 's/^/ /' | sort
.PHONY: build-release-bin .PHONY: build-release-bin
build-release-bin: build-release-bin: build-frontend
GO111MODULE=on GOOS=linux GOARCH=amd64 $(GO) build -ldflags '$(LDFLAGS)' -o bin/filebrowser-$(VERSION) GO111MODULE=on GOOS=linux GOARCH=amd64 $(GO) build -ldflags '$(LDFLAGS)' -o bin/filebrowser-$(VERSION)
tar -C bin -czf "dist/filebrowser-$(VERSION).tar.gz" "filebrowser-$(VERSION)" tar -C bin -czf "dist/filebrowser-$(VERSION).tar.gz" "filebrowser-$(VERSION)"

2
files/listing.go
View File

@ -110,7 +110,7 @@ func (l byModified) Less(i, j int) bool {
} }
func (l *Listing) FilterItems(fn func(fi *FileInfo) bool) { func (l *Listing) FilterItems(fn func(fi *FileInfo) bool) {
var filtered []*FileInfo filtered := []*FileInfo{}
for _, item := range l.Items { for _, item := range l.Items {
if fn(item) { if fn(item) {
filtered = append(filtered, item) filtered = append(filtered, item)

3
http/resource.go
View File

@ -229,7 +229,8 @@ func resourcePatchHandler(fileCache FileCache) handleFunc {
override := r.URL.Query().Get("override") == "true" override := r.URL.Query().Get("override") == "true"
rename := r.URL.Query().Get("rename") == "true" rename := r.URL.Query().Get("rename") == "true"
if !override && !rename { unarchive := r.URL.Query().Get("action") == "unarchive"
if !override && !rename && !unarchive {
if _, err = d.user.Fs.Stat(dst); err == nil { if _, err = d.user.Fs.Stat(dst); err == nil {
return http.StatusConflict, nil return http.StatusConflict, nil
} }