调整细节

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

downloader.go

@@ -98,7 +98,7 @@ func (d Downloader) DownloadSub(dir string) error {
 		// 字幕都下载缓存好了，需要抉择存哪一个，优先选择中文双语的，然后到中文
 		organizeSubFiles, err := subSupplierHub.DownloadSub(oneVideoFullPath, i)
 		if err != nil {
-			d.log.Error("oneVideoFullPath", "Download Sub Error",err)
+			d.log.Errorln("oneVideoFullPath", "Download Sub Error",err)
 			continue
 		}
 		// 得到目标视频文件的根目录
@@ -108,20 +108,20 @@ func (d Downloader) DownloadSub(dir string) error {
 		if d.reqParam.DebugMode == true {
 			err = d.copySubFile2DesFolder(videoRootPath, organizeSubFiles)
 			if err != nil {
-				d.log.Error(err)
+				d.log.Errorln(err)
 			}
 		}
 		// -------------------------------------------------
 		var finalSubFile *common.SubParserFileInfo
 		finalSubFile = d.mk.SelectOneSubFile(organizeSubFiles)
 		if finalSubFile == nil {
-			d.log.Warn("Found", len(organizeSubFiles), " subtitles but not one fit:", oneVideoFullPath)
+			d.log.Warnln("Found", len(organizeSubFiles), " subtitles but not one fit:", oneVideoFullPath)
 			continue
 		}
 		// 找到了，写入文件
 		err = d.writeSubFile2VideoPath(oneVideoFullPath, *finalSubFile)
 		if err != nil {
-			d.log.Error("writeSubFile2VideoPath",err)
+			d.log.Errorln("writeSubFile2VideoPath", err)
 			continue
 		}
 		// -----------------------------------------------------

downloader_test.go

@@ -28,7 +28,8 @@ func TestDownloader_searchFile(t *testing.T) {
 
 func TestDownloader_DownloadSub(t *testing.T) {
 	var err error
-	dirRoot := "X:\\电影\\Spiral From the Book of Saw (2021)"
+	//dirRoot := "X:\\电影\\Spiral From the Book of Saw (2021)"
+	dirRoot := "X:\\电影\\Oslo (2021)"
 
 	dl := NewDownloader(common.ReqParam{DebugMode: true})
 	err = dl.DownloadSub(dirRoot)

mark_system/marking_system.go

@@ -36,7 +36,7 @@ func (m MarkingSystem) SelectOneSubFile(organizeSubFiles []string) *common.SubPa
 		}
 		if subFileInfo == nil {
 			// 说明这个字幕无法解析
-			m.log.Warning(oneSubFileFullPath, "DetermineFileTypeFromFile is nill")
+			m.log.Warnln(oneSubFileFullPath, "DetermineFileTypeFromFile is nill")
 			continue
 		}
 

sub_supplier/subSupplierHub.go

@@ -109,7 +109,7 @@ func (d SubSupplierHub) organizeDlSubFiles(subInfos []common.SupplierSubInfo) ([
 		nowFileSaveFullPath := path.Join(tmpFolderFullPath, d.getFrontNameAndOrgName(subInfo))
 		err = utils.OutputFile(nowFileSaveFullPath, subInfo.Data)
 		if err != nil {
-			d.log.Error(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
+			d.log.Errorln(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
 			continue
 		}
 		nowExt := strings.ToLower(subInfo.Ext)
@@ -127,13 +127,13 @@ func (d SubSupplierHub) organizeDlSubFiles(subInfos []common.SupplierSubInfo) ([
 			err = archiver.Unarchive(nowFileSaveFullPath, unzipTmpFolder)
 			// 解压完成后，遍历受支持的字幕列表，加入缓存列表
 			if err != nil {
-				d.log.Error(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
+				d.log.Errorln(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
 				continue
 			}
 			// 搜索这个目录下的所有符合字幕格式的文件
 			subFileFullPaths, err := d.searchMatchedSubFile(unzipTmpFolder)
 			if err != nil {
-				d.log.Error(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
+				d.log.Errorln(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
 				continue
 			}
 			// 这里需要给这些下载到的文件进行改名，加是从那个网站来的前缀，后续好查找
@@ -143,7 +143,7 @@ func (d SubSupplierHub) organizeDlSubFiles(subInfos []common.SupplierSubInfo) ([
 				// 改名
 				err = os.Rename(fileFullPath, newSubNameFullPath)
 				if err != nil {
-					d.log.Error(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
+					d.log.Errorln(subInfo.FromWhere, subInfo.Name, subInfo.TopN, err)
 					continue
 				}
 				// 加入缓存列表

sub_supplier/subhd/subhd.go

@@ -65,7 +65,7 @@ func (s Supplier) GetSubListFromFile(filePath string) ([]common.SupplierSubInfo,
 	if err != nil {
 		// 允许的错误，跳过，继续进行文件名的搜索
 		if err == common.CanNotFindIMDBID {
-			s.log.Error(err.Error())
+			s.log.Error(err)
 		} else {
 			return nil, err
 		}

sub_supplier/zimuku/zimuku.go

@@ -55,7 +55,7 @@ func (s Supplier) GetSubListFromFile(filePath string) ([]common.SupplierSubInfo,
 	if err != nil {
 		// 允许的错误，跳过，继续进行文件名的搜索
 		if err == common.CanNotFindIMDBID {
-			s.log.Error(err.Error())
+			s.log.Error(err)
 		} else {
 			return nil, err
 		}
@@ -104,7 +104,7 @@ func (s Supplier) GetSubListFromKeyword(keyword string) ([]common.SupplierSubInf
 	for i := range subResult.SubInfos {
 		err = s.Step2(&subResult.SubInfos[i])
 		if err != nil {
-			s.log.Error(err.Error())
+			s.log.Error(err)
 			continue
 		}
 	}
@@ -135,7 +135,7 @@ func (s Supplier) GetSubListFromKeyword(keyword string) ([]common.SupplierSubInf
 	for i, subInfo := range tmpSubInfo {
 		fileName, data, err := s.Step3(subInfo.SubDownloadPageUrl)
 		if err != nil {
-			s.log.Error(err.Error())
+			s.log.Error(err)
 			continue
 		}
 		// 默认都是包含中文字幕的，然后具体使用的时候再进行区分
@@ -302,7 +302,7 @@ func (s Supplier) Step3(subDownloadPageUrl string) (string, []byte, error) {
 	for i := 0; i < len(matched); i++ {
 		data, filename, err = model.DownFile(model.AddBaseUrl(common.SubZiMuKuRootUrl, matched[i][1]), s.reqParam)
 		if err != nil {
-			s.log.Error("ZiMuKu Step3 DownloadFile", err)
+			s.log.Errorln("ZiMuKu Step3 DownloadFile", err)
 			continue
 		}
 		return filename, data, nil