Fix filename issue caused by LimitLength

iawia002 · Sep 29, 2019 · 795edc2 · 795edc2
1 parent b5f6f3e
commit 795edc2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/downloader/downloader.go b/downloader/downloader.go
@@ -180,9 +180,9 @@ func Download(v Data, refer string, chunkSizeMB int) error {
 		stream string
 	)
 	if config.OutputName == "" {
-		title = utils.FileName(v.Title)
+		title = utils.FileName(v.Title, "")
 	} else {
-		title = utils.FileName(config.OutputName)
+		title = utils.FileName(config.OutputName, "")
 	}
 	if config.Stream == "" {
 		stream = v.sortedStreams[0].name

diff --git a/extractors/bilibili/bilibili.go b/extractors/bilibili/bilibili.go
@@ -323,11 +323,7 @@ func bilibiliDownload(options bilibiliOptions) downloader.Data {
 	}
 	title := parser.Title(doc)
 	if options.subtitle != "" {
-		tempTitle := fmt.Sprintf("%s %s", title, options.subtitle)
-		if len([]rune(tempTitle)) > utils.MAXLENGTH {
-			tempTitle = fmt.Sprintf("%s P%d %s", title, options.page, options.subtitle)
-		}
-		title = tempTitle
+        title = fmt.Sprintf("%s P%d %s", title, options.page, options.subtitle)
 	}
 
 	downloader.Caption(

diff --git a/utils/utils.go b/utils/utils.go
@@ -88,14 +88,19 @@ func LimitLength(s string, length int) string {
 }
 
 // FileName Converts a string to a valid filename
-func FileName(name string) string {
+func FileName(name string, ext string) string {
 	rep := strings.NewReplacer("\n", " ", "/", " ", "|", "-", ": ", "：", ":", "：", "'", "’")
 	name = rep.Replace(name)
 	if runtime.GOOS == "windows" {
 		rep = strings.NewReplacer("\"", " ", "?", " ", "*", " ", "\\", " ", "<", " ", ">", " ")
 		name = rep.Replace(name)
 	}
-	return LimitLength(name, MAXLENGTH)
+    limitedName := LimitLength(name, MAXLENGTH)
+    if ext == "" {
+        return limitedName
+    } else {
+        return fmt.Sprintf("%s.%s", limitedName, ext)
+    }
 }
 
 // FilePath gen valid file path
@@ -106,10 +111,12 @@ func FilePath(name, ext string, escape bool) (string, error) {
 			return "", err
 		}
 	}
-	fileName := fmt.Sprintf("%s.%s", name, ext)
+	var fileName string
 	if escape {
-		fileName = FileName(fileName)
-	}
+		fileName = FileName(name, ext)
+	} else {
+        fileName = fmt.Sprintf("%s.%s", name, ext)
+    }
 	outputPath = filepath.Join(config.OutputPath, fileName)
 	return outputPath, nil
 }

diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -272,7 +272,7 @@ func TestFileName(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := FileName(tt.args.name); got != tt.want {
+			if got := FileName(tt.args.name, ""); got != tt.want {
 				t.Errorf("FileName() = %v, want %v", got, tt.want)
 			}
 		})