重构

Signed-off-by: 716 <[email protected]>

README.md

@@ -7,7 +7,6 @@
 > 开发中的效果，可以尝试运行以下几个测试用例
 >
 > * [downloader_test.go](https://github.com/allanpk716/ChineseSubFinder/blob/master/downloader_test.go)
-> * [subParserHub_test.go](https://github.com/allanpk716/ChineseSubFinder/blob/master/subParserHub_test.go)
 
 ## Why？
 

common/common.go

@@ -3,8 +3,16 @@ package common
 import "time"
 
 const HTMLTimeOut = 60 * time.Second	// HttpClient 超时时间
-
 const DownloadSubsPerSite = 1 // 默认，每个网站下载一个字幕，允许额外传参调整
 
-const DebugFolder = "debugthings"
-const TmpFolder = "tmpthings"
+const (
+	DebugFolder = "debugthings"
+	TmpFolder = "tmpthings"
+)
+
+const (
+	SubSiteZiMuKu  = "zimuku"
+	SubSiteSubHd   = "subhd"
+	SubSiteShooter = "shooter"
+	SubSiteXunLei  = "xunlei"
+)

downloader.go

@@ -124,14 +124,12 @@ func (d Downloader) DownloadSub(dir string) error {
 			}
 
 			_, ok := subInfoDict[subFileInfo.FromWhereSite]
-			if ok == true {
-				// 添加
-				subInfoDict[subFileInfo.FromWhereSite] = append(subInfoDict[subFileInfo.FromWhereSite], *subFileInfo)
-			} else {
+			if ok == false {
 				// 新建
 				subInfoDict[subFileInfo.FromWhereSite] = make([]sub_parser.SubFileInfo, 0)
-				subInfoDict[subFileInfo.FromWhereSite] = append(subInfoDict[subFileInfo.FromWhereSite], *subFileInfo)
 			}
+			// 添加
+			subInfoDict[subFileInfo.FromWhereSite] = append(subInfoDict[subFileInfo.FromWhereSite], *subFileInfo)
 		}
 		// 优先级别暂定 zimuku -> subhd -> xunlei -> shooter
 		foundOne := false

go.mod

@@ -8,9 +8,10 @@ require (
 	github.com/beevik/etree v1.1.0
 	github.com/go-resty/resty/v2 v2.6.0
 	github.com/go-rod/rod v0.97.2
+	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
-	github.com/mholt/archiver/v3 v3.5.0 // indirect
+	github.com/mholt/archiver/v3 v3.5.0
 	github.com/middelink/go-parse-torrent-name v0.0.0-20190301154245-3ff4efacd4c4
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -14,8 +14,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
 github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
-github.com/gen2brain/go-unarr v0.1.1 h1:wZl53oYzEN1PEIA/dPa/FjBq9rRqPmS/Gzul8BdKYK4=
-github.com/gen2brain/go-unarr v0.1.1/go.mod h1:P05CsEe8jVEXhxqXqp9mFKUKFV0BKpFmtgNWf8Mcoos=
 github.com/go-resty/resty/v2 v2.6.0 h1:joIR5PNLM2EFqqESUjCMGXrWmXNHEU9CEiK813oKYS4=
 github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
 github.com/go-rod/rod v0.97.2 h1:4AWtucf0fXKbdaEjNNhjIcdYXQyc4+yx8YYI73jyP5A=

subParserHub.go

@@ -11,12 +11,13 @@ type SubParserHub struct {
 	Parser []sub_parser.ISubParser
 }
 
-func NewSubParserHub(parser sub_parser.ISubParser, _inparser ...sub_parser.ISubParser) *SubParserHub {
+// NewSubParserHub 处理的字幕文件需要符合 [siteName]_ 的前缀描述，是本程序专用的
+func NewSubParserHub(parser sub_parser.ISubParser, _parser ...sub_parser.ISubParser) *SubParserHub {
 	s := SubParserHub{}
 	s.Parser = make([]sub_parser.ISubParser, 0)
 	s.Parser = append(s.Parser, parser)
-	if len(_inparser) > 0 {
-		for _, one := range _inparser {
+	if len(_parser) > 0 {
+		for _, one := range _parser {
 			s.Parser = append(s.Parser, one)
 		}
 	}

sub_supplier/shooter/shooter.go

@@ -33,7 +33,7 @@ func NewSupplier(_reqParam ... common.ReqParam) *Supplier {
 }
 
 func (s Supplier) GetSupplierName() string {
-	return "shooter"
+	return common.SubSiteShooter
 }
 
 func (s Supplier) GetSubListFromFile(filePath string) ([]sub_supplier.SubInfo, error) {

sub_supplier/subhd/subhd.go

@@ -44,7 +44,7 @@ func NewSupplier(_reqParam ... common.ReqParam) *Supplier {
 }
 
 func (s Supplier) GetSupplierName() string {
-	return "subhd"
+	return common.SubSiteSubHd
 }
 
 func (s Supplier) GetSubListFromFile(filePath string) ([]sub_supplier.SubInfo, error) {

sub_supplier/xunlei/xunlei.go

@@ -32,7 +32,7 @@ func NewSupplier(_reqParam ... common.ReqParam) *Supplier {
 }
 
 func (s Supplier) GetSupplierName() string {
-	return "xunlei"
+	return common.SubSiteXunLei
 }
 
 func (s Supplier) GetSubListFromFile(filePath string) ([]sub_supplier.SubInfo, error) {

sub_supplier/zimuku/zimuku.go

@@ -33,7 +33,7 @@ func NewSupplier(_reqParam ... common.ReqParam) *Supplier {
 }
 
 func (s Supplier) GetSupplierName() string {
-	return "zimuku"
+	return common.SubSiteZiMuKu
 }
 
 func (s Supplier) GetSubListFromFile(filePath string) ([]sub_supplier.SubInfo, error) {