Browse Source

调整 assrt 细节

Signed-off-by: allan716 <[email protected]>
allan716 3 years ago
parent
commit
37e6fefaa6

+ 2 - 0
internal/backend/controllers/base/proxy.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/assrt"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/shooter"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/subhd"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/xunlei"
@@ -39,6 +40,7 @@ func (cb *ControllerBase) CheckProxyHandler(c *gin.Context) {
 		// 这里无需传递下载字幕的缓存实例
 		//zimuku.NewSupplier(cb.fileDownloader),
 		xunlei.NewSupplier(cb.fileDownloader),
+		assrt.NewSupplier(cb.fileDownloader),
 		shooter.NewSupplier(cb.fileDownloader),
 		subhd.NewSupplier(cb.fileDownloader),
 	)

+ 2 - 0
internal/logic/pre_download_process/pre_download_proces.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/assrt"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/shooter"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/subhd"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/xunlei"
@@ -92,6 +93,7 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
 	// 构建每个字幕站点下载者的实例
 	p.SubSupplierHub = subSupplier.NewSubSupplierHub(
 		//zimuku.NewSupplier(p.fileDownloader),
+		assrt.NewSupplier(p.fileDownloader),
 		xunlei.NewSupplier(p.fileDownloader),
 		shooter.NewSupplier(p.fileDownloader),
 	)

+ 30 - 0
internal/logic/sub_supplier/assrt/assrt.go

@@ -90,14 +90,44 @@ func (s *Supplier) GetSupplierName() string {
 }
 
 func (s *Supplier) GetSubListFromFile4Movie(filePath string) ([]supplier.SubInfo, error) {
+
+	outSubInfos := make([]supplier.SubInfo, 0)
+	if s.settings.SubtitleSources.AssrtSettings.Enabled == false {
+		return outSubInfos, nil
+	}
+
+	if s.settings.SubtitleSources.AssrtSettings.Token == "" {
+		return nil, errors.New("Token is empty")
+	}
+
 	return s.getSubListFromFile(filePath, true)
 }
 
 func (s *Supplier) GetSubListFromFile4Series(seriesInfo *series.SeriesInfo) ([]supplier.SubInfo, error) {
+
+	outSubInfos := make([]supplier.SubInfo, 0)
+	if s.settings.SubtitleSources.AssrtSettings.Enabled == false {
+		return outSubInfos, nil
+	}
+
+	if s.settings.SubtitleSources.AssrtSettings.Token == "" {
+		return nil, errors.New("Token is empty")
+	}
+
 	return s.downloadSub4Series(seriesInfo)
 }
 
 func (s *Supplier) GetSubListFromFile4Anime(seriesInfo *series.SeriesInfo) ([]supplier.SubInfo, error) {
+
+	outSubInfos := make([]supplier.SubInfo, 0)
+	if s.settings.SubtitleSources.AssrtSettings.Enabled == false {
+		return outSubInfos, nil
+	}
+
+	if s.settings.SubtitleSources.AssrtSettings.Token == "" {
+		return nil, errors.New("Token is empty")
+	}
+
 	return s.downloadSub4Series(seriesInfo)
 }
 

+ 2 - 2
internal/pkg/downloader/downloader.go

@@ -11,7 +11,7 @@ import (
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/pre_download_process"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
 	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/shooter"
+	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/assrt"
 	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_timeline_fixer"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
@@ -134,7 +134,7 @@ func (d *Downloader) SupplierCheck() {
 
 		if d.settings.SpeedDevMode == true {
 			// 这里是调试使用的,指定了只用一个字幕源
-			subSupplierHub := subSupplier.NewSubSupplierHub(shooter.NewSupplier(d.fileDownloader))
+			subSupplierHub := subSupplier.NewSubSupplierHub(assrt.NewSupplier(d.fileDownloader))
 			d.subSupplierHub = subSupplierHub
 		} else {