Browse Source

fix: IsEmbySubChineseLangStringWanted

* old func return false for all the true cases
* add more test case for false
sdsadfaf 3 years ago
parent
commit
d00347510f

+ 10 - 6
internal/pkg/sub_parser_hub/subParserHub.go

@@ -141,6 +141,8 @@ func IsEmbySubCodecWanted(inSubCodec string) bool {
 // IsEmbySubChineseLangStringWanted 是否是 Emby 自己解析出来的中文语言类型
 func IsEmbySubChineseLangStringWanted(inLangString string) bool {
 
+	isWanted := false
+
 	tmpString := strings.ToLower(inLangString)
 	nextString := tmpString
 	spStrings := strings.Split(tmpString, "[")
@@ -156,22 +158,24 @@ func IsEmbySubChineseLangStringWanted(inLangString string) bool {
 	}
 
 	// 先判断 ISO 标准的和变种的支持列表
-	if language.IsSupportISOString(nextString) == false {
-		return false
+	if language.IsSupportISOString(nextString) {
+		// fmt.Println("###: ERROR")
+		isWanted = true
 	}
+
 	// 再判断之前支持的列表
 	switch nextString {
 	case languageConst.Emby_chinese_chs,
 		languageConst.Emby_chinese_cht,
 		languageConst.Emby_chinese_chi:
 		// chi chs cht
-		return true
+		isWanted = true
 	case replaceLangString(languageConst.Emby_chinese):
 		// chinese,这个比较特殊,是本程序定义的 chinese 的字段,再 Emby API 下特殊的字幕命名字段
-		return true
-	default:
-		return false
+		isWanted = true
 	}
+
+	return isWanted
 }
 
 func replaceLangString(inString string) string {

+ 2 - 7
internal/pkg/sub_parser_hub/subParserHub_test.go

@@ -3,18 +3,13 @@ package sub_parser_hub
 import (
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"path/filepath"
 	"testing"
 )
 
-func TestSubParserHub_IsSubHasChinese(t *testing.T) {
+func TestSubParserHubIsSubHasChinese(t *testing.T) {
 
-	testDataPath := "../../../TestData/sub_parser"
-	testRootDir, err := my_util.CopyTestData(testDataPath)
-	if err != nil {
-		t.Fatal(err)
-	}
+	testRootDir := filepath.FromSlash("../../../TestData/sub_parser")
 
 	type args struct {
 		filePath string