Skip to content

Commit 5b92875

Browse files
committed
fix(archive): use url base name instead of fs name for alias root
1 parent b2800b0 commit 5b92875

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/serverHandler/archive.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,16 @@ func (h *handler) archive(
122122
filterCallback filterCallback,
123123
cbWriteFile archiveCallback,
124124
) {
125-
targetFilename := pageData.ItemName + fileSuffix
125+
var itemName string
126+
_, hasAlias := h.aliases.byUrlPath(pageData.rawReqPath)
127+
if hasAlias {
128+
itemName = path.Base(pageData.rawReqPath)
129+
}
130+
if len(itemName) == 0 || itemName == "/" {
131+
itemName = pageData.ItemName
132+
}
133+
134+
targetFilename := itemName + fileSuffix
126135
writeArchiveHeader(w, contentType, targetFilename)
127136

128137
if !needResponseBody(r.Method) {

src/serverHandler/responseData.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func getItemName(info os.FileInfo, r *http.Request) (itemName string) {
211211
if info != nil {
212212
itemName = info.Name()
213213
}
214-
if len(itemName) == 0 || itemName == "." {
214+
if len(itemName) == 0 || itemName == "." || itemName == "/" {
215215
itemName = strings.Replace(r.Host, ":", "_", -1)
216216
}
217217
return

0 commit comments

Comments
 (0)