ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(trainbit): remove unnecessary operation (#3881)

Browse Source
This commit is contained in:
Night Space 2023-03-18 13:52:36 +08:00 committed by GitHub
parent 8b109cfe40
commit 023107226c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/trainbit/driver.go
View File

@ -119,7 +119,7 @@ func (d *Trainbit) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
query := &url.Values{} query := &url.Values{}
query.Add("q", strings.Split(dstDir.GetID(), "_")[1]) query.Add("q", strings.Split(dstDir.GetID(), "_")[1])
query.Add("guid", guid) query.Add("guid", guid)
query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false))) query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + "."))
endpoint.RawQuery = query.Encode() endpoint.RawQuery = query.Encode()
var total int64 var total int64
total = 0 total = 0

26
drivers/trainbit/util.go
View File

@ -88,36 +88,18 @@ func getToken(apiKey string, AUSHELLPORTAL string) (string, string, error) {
} }
func local2provider(filename string, isFolder bool) string { func local2provider(filename string, isFolder bool) string {
filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
if isFolder { if isFolder {
return filename return filename
} }
return strings.Join([]string{filename, ".delete_suffix."}, "") return filename + ".delete_suffix"
} }
func provider2local(filename string) string { func provider2local(filename string) string {
index := strings.LastIndex(filename, ".delete_suffix.") index := strings.LastIndex(filename, ".delete_suffix")
if index != -1 { if index != -1 {
filename = filename[:index] filename = filename[:index]
} }
rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1) return filename
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
} }
func parseRawFileObject(rawObject []any) ([]model.Obj, error) { func parseRawFileObject(rawObject []any) ([]model.Obj, error) {
@ -132,7 +114,7 @@ func parseRawFileObject(rawObject []any) ([]model.Obj, error) {
if isFolder { if isFolder {
name = object["name"].(string) name = object["name"].(string)
} else { } else {
name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".") name = object["name"].(string) + object["ext"].(string)
} }
modified, err := time.Parse("2006/01/02 15:04:05", object["modified"].(string)) modified, err := time.Parse("2006/01/02 15:04:05", object["modified"].(string))
if err != nil { if err != nil {