mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-06 23:44:20 -04:00
When dumping trim the standard suffices instead of a random suffix (#19440)
* When dumping trim the standard suffices instead of a random suffix Instead of using the `path.Ext()` to trim the last "extension" suffix, just iterate through the supported suffices and trim those. Fix #19424 Signed-off-by: Andrew Thornton <art27@cantab.net> * fix enum with to have correct supported types only Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
a7f0ce6207
commit
1e319ba41a
@ -86,7 +86,7 @@ func (o outputType) String() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var outputTypeEnum = &outputType{
|
var outputTypeEnum = &outputType{
|
||||||
Enum: []string{"zip", "rar", "tar", "sz", "tar.gz", "tar.xz", "tar.bz2", "tar.br", "tar.lz4"},
|
Enum: []string{"zip", "tar", "tar.sz", "tar.gz", "tar.xz", "tar.bz2", "tar.br", "tar.lz4"},
|
||||||
Default: "zip",
|
Default: "zip",
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,7 +160,12 @@ func runDump(ctx *cli.Context) error {
|
|||||||
fatal("Deleting default logger failed. Can not write to stdout: %v", err)
|
fatal("Deleting default logger failed. Can not write to stdout: %v", err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fileName = strings.TrimSuffix(fileName, path.Ext(fileName))
|
for _, suffix := range outputTypeEnum.Enum {
|
||||||
|
if strings.HasSuffix(fileName, "."+suffix) {
|
||||||
|
fileName = strings.TrimSuffix(fileName, "."+suffix)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
fileName += "." + outType
|
fileName += "." + outType
|
||||||
}
|
}
|
||||||
setting.LoadFromExisting()
|
setting.LoadFromExisting()
|
||||||
|
Loading…
Reference in New Issue
Block a user