Pārlūkot izejas kodu

调整 assrt 启用的细节

Signed-off-by: allan716 <[email protected]>
allan716 3 gadi atpakaļ
vecāks
revīzija
477c099ddd

+ 6 - 1
internal/backend/controllers/base/proxy.go

@@ -40,11 +40,16 @@ 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),
 	)
 
+	if cb.fileDownloader.Settings.SubtitleSources.AssrtSettings.Enabled == true &&
+		cb.fileDownloader.Settings.SubtitleSources.AssrtSettings.Token != "" {
+		// 如果开启了 ASSRt 字幕源,则需要测试 ASSRt 的代理
+		subSupplierHub.AddSubSupplier(assrt.NewSupplier(cb.fileDownloader))
+	}
+
 	outStatus := subSupplierHub.CheckSubSiteStatus()
 
 	defer func() {

+ 5 - 1
internal/logic/pre_download_process/pre_download_proces.go

@@ -93,10 +93,14 @@ 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),
 	)
+	if p.settings.SubtitleSources.AssrtSettings.Enabled == true &&
+		p.settings.SubtitleSources.AssrtSettings.Token != "" {
+		// 如果开启了 ASSRt 字幕源,则需要新增
+		p.SubSupplierHub.AddSubSupplier(assrt.NewSupplier(p.fileDownloader))
+	}
 	if common2.SubhdCode != "" {
 		// 如果找到 code 了,那么就可以继续用这个实例
 		p.SubSupplierHub.AddSubSupplier(subhd.NewSupplier(p.fileDownloader))

+ 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/assrt"
+	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/shooter"
 	"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(assrt.NewSupplier(d.fileDownloader))
+			subSupplierHub := subSupplier.NewSubSupplierHub(shooter.NewSupplier(d.fileDownloader))
 			d.subSupplierHub = subSupplierHub
 		} else {