✨ Extract folder

model/account.go

@@ -36,12 +36,13 @@ type Account struct {
 	DownProxyUrl string `json:"down_proxy_url"` // 用于中转下载服务的URL 两处 1. path请求中返回的链接 2. down下载时进行302
 	APIProxyUrl  string `json:"api_proxy_url"`  // 用于中转api的地址
 	// for s3
-	Bucket       string `json:"bucket"`
-	Endpoint     string `json:"endpoint"`
-	Region       string `json:"region"`
-	AccessKey    string `json:"access_key"`
-	AccessSecret string `json:"access_secret"`
-	CustomHost   string `json:"custom_host"`
+	Bucket        string `json:"bucket"`
+	Endpoint      string `json:"endpoint"`
+	Region        string `json:"region"`
+	AccessKey     string `json:"access_key"`
+	AccessSecret  string `json:"access_secret"`
+	CustomHost    string `json:"custom_host"`
+	ExtractFolder string `json:"extract_folder"`
 }
 
 var accountsMap = map[string]Account{}

model/file.go

@@ -25,14 +25,6 @@ func SortFiles(files []File, account *Account) {
 		return
 	}
 	sort.Slice(files, func(i, j int) bool {
-		if files[i].IsDir() || files[j].IsDir() {
-			if !files[i].IsDir() {
-				return false
-			}
-			if !files[j].IsDir() {
-				return true
-			}
-		}
 		switch account.OrderBy {
 		case "name":
 			{
@@ -59,6 +51,24 @@ func SortFiles(files []File, account *Account) {
 	})
 }
 
+func ExtractFolder(files []File, account *Account) {
+	if account.ExtractFolder == "" {
+		return
+	}
+	front := account.ExtractFolder == "front"
+	sort.Slice(files, func(i, j int) bool {
+		if files[i].IsDir() || files[j].IsDir() {
+			if !files[i].IsDir() {
+				return !front
+			}
+			if !files[j].IsDir() {
+				return front
+			}
+		}
+		return false
+	})
+}
+
 func (f File) GetSize() uint64 {
 	return uint64(f.Size)
 }