Browse Source

基础低可信字幕上传逻辑

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

+ 1 - 1
cmd/chinesesubfinder/main.go

@@ -86,7 +86,7 @@ func main() {
 		common.SetApiToken("")
 	}
 	// 是否开启开发模式,跳过某些流程
-	settings.GetSettings().SpeedDevMode = true
+	//settings.GetSettings().SpeedDevMode = true
 	if settings.GetSettings().SpeedDevMode == true {
 		loggerBase.Infoln("Speed Dev Mode is On")
 	} else {

+ 1 - 2
internal/logic/cron_helper/cron_helper.go

@@ -105,8 +105,7 @@ func (ch *CronHelper) Start(runImmediately bool) {
 		// 测试部分定时器代码,提前运行
 		if ch.Settings.SpeedDevMode == true {
 
-			//ch.scanPlayedVideoSub()
-			ch.uploadVideoSub()
+			//ch.uploadVideoSub()
 			//ch.scanVideoProcessAdd2DownloadQueue()
 		}
 	}

+ 3 - 3
internal/logic/cron_helper/upload_played_video_sub.go

@@ -17,7 +17,7 @@ import (
 // uploadVideoSub  上传字幕的定时器
 func (ch *CronHelper) uploadVideoSub() {
 
-	//ch.uploadPlayedVideoSub()
+	ch.uploadPlayedVideoSub()
 
 	ch.uploadLowTrustVideoSub()
 }
@@ -94,7 +94,7 @@ func (ch *CronHelper) uploadPlayedVideoSub() {
 
 	ch.log.Infoln("AskFroUpload", notUploadedVideoSubInfos[0].SubName)
 	// 问询这个字幕是否上传过了,如果没有就需要进入上传的队列
-	askForUploadReply, err := ch.FileDownloader.SubtitleBestApi.AskFroUpload(notUploadedVideoSubInfos[0].SHA256)
+	askForUploadReply, err := ch.FileDownloader.SubtitleBestApi.AskFroUpload(notUploadedVideoSubInfos[0].SHA256, true)
 	if err != nil {
 		ch.log.Errorln(fmt.Errorf("AskFroUpload err: %v", err))
 		return
@@ -270,7 +270,7 @@ func (ch *CronHelper) uploadLowTrustVideoSub() {
 
 	ch.log.Infoln("AskFroUpload", notUploadedVideoSubInfos[0].SubName)
 	// 问询这个字幕是否上传过了,如果没有就需要进入上传的队列
-	askForUploadReply, err := ch.FileDownloader.SubtitleBestApi.AskFroUpload(notUploadedVideoSubInfos[0].SHA256)
+	askForUploadReply, err := ch.FileDownloader.SubtitleBestApi.AskFroUpload(notUploadedVideoSubInfos[0].SHA256, false)
 	if err != nil {
 		ch.log.Errorln(fmt.Errorf("AskFroUpload err: %v", err))
 		return

+ 2 - 1
internal/pkg/subtitle_best_api/subtitle_best_api.go

@@ -68,7 +68,7 @@ func (s *SubtitleBestApi) GetMediaInfo(id, source, videoType string, _proxySetti
 }
 
 // AskFroUpload 在使用这个接口前,需要从 IMDB ID 获取到 TMDB ID
-func (s *SubtitleBestApi) AskFroUpload(subSha256 string, _proxySettings ...*settings.ProxySettings) (*AskForUploadReply, error) {
+func (s *SubtitleBestApi) AskFroUpload(subSha256 string, trusted bool, _proxySettings ...*settings.ProxySettings) (*AskForUploadReply, error) {
 
 	postUrl := webUrlBase + "/v1/ask-for-upload"
 	httpClient, err := my_util.NewHttpClient(_proxySettings...)
@@ -86,6 +86,7 @@ func (s *SubtitleBestApi) AskFroUpload(subSha256 string, _proxySettings ...*sett
 		SetHeader("Authorization", "beer "+authKey).
 		SetBody(AskForUploadReq{
 			SubSha256: subSha256,
+			Trusted:   trusted,
 		}).
 		SetResult(&askForUploadReply).
 		Post(postUrl)

+ 1 - 0
internal/pkg/subtitle_best_api/upload_hub.go

@@ -2,6 +2,7 @@ package subtitle_best_api
 
 type AskForUploadReq struct {
 	SubSha256 string `json:"sub_sha256"`
+	Trusted   bool   `json:"trusted,optional"` // 是否是信任的字幕
 }
 
 type AskForUploadReply struct {