|
|
@@ -10,7 +10,6 @@ import (
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/xunlei"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/zimuku"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/hot_fix"
|
|
|
- "github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"
|
|
|
@@ -21,6 +20,7 @@ import (
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/common"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/pkg/url_connectedness_helper"
|
|
|
"github.com/allanpk716/ChineseSubFinder/internal/types"
|
|
|
+ "github.com/sirupsen/logrus"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
@@ -28,39 +28,44 @@ type PreDownloadProcess struct {
|
|
|
stageName string
|
|
|
gError error
|
|
|
|
|
|
+ sets *settings.Settings
|
|
|
+ log *logrus.Logger
|
|
|
SubSupplierHub *subSupplier.SubSupplierHub
|
|
|
}
|
|
|
|
|
|
-func NewPreDownloadProcess() *PreDownloadProcess {
|
|
|
- return &PreDownloadProcess{}
|
|
|
+func NewPreDownloadProcess(_log *logrus.Logger, _sets *settings.Settings) *PreDownloadProcess {
|
|
|
+ return &PreDownloadProcess{
|
|
|
+ log: _log,
|
|
|
+ sets: _sets,
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
|
|
|
if p.gError != nil {
|
|
|
- log_helper.GetLogger().Infoln("Skip PreDownloadProcess.Init()")
|
|
|
+ p.log.Infoln("Skip PreDownloadProcess.Init()")
|
|
|
return p
|
|
|
}
|
|
|
p.stageName = stageNameInit
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.Init() End")
|
|
|
+ p.log.Infoln("PreDownloadProcess.Init() End")
|
|
|
}()
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.Init() Start...")
|
|
|
+ p.log.Infoln("PreDownloadProcess.Init() Start...")
|
|
|
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 初始化通知缓存模块
|
|
|
- notify_center.Notify = notify_center.NewNotifyCenter(settings.GetSettings().DeveloperSettings.BarkServerAddress)
|
|
|
+ notify_center.Notify = notify_center.NewNotifyCenter(p.sets.DeveloperSettings.BarkServerAddress)
|
|
|
// 清理通知中心
|
|
|
notify_center.Notify.Clear()
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 获取验证码
|
|
|
nowTT := time.Now()
|
|
|
nowTimeFileNamePrix := fmt.Sprintf("%d%d%d", nowTT.Year(), nowTT.Month(), nowTT.Day())
|
|
|
- updateTimeString, code, err := something_static.GetCodeFromWeb(log_helper.GetLogger(), nowTimeFileNamePrix)
|
|
|
+ updateTimeString, code, err := something_static.GetCodeFromWeb(p.log, nowTimeFileNamePrix)
|
|
|
if err != nil {
|
|
|
notify_center.Notify.Add("GetSubhdCode", "GetCodeFromWeb,"+err.Error())
|
|
|
- log_helper.GetLogger().Errorln("something_static.GetCodeFromWeb", err)
|
|
|
- log_helper.GetLogger().Errorln("Skip Subhd download")
|
|
|
+ p.log.Errorln("something_static.GetCodeFromWeb", err)
|
|
|
+ p.log.Errorln("Skip Subhd download")
|
|
|
// 没有则需要清空
|
|
|
commonValue.SubhdCode = ""
|
|
|
} else {
|
|
|
@@ -68,7 +73,7 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
// 获取到的更新时间不是当前的日期,那么本次也跳过本次
|
|
|
codeTime, err := time.Parse("2006-01-02", updateTimeString)
|
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln("something_static.GetCodeFromWeb.time.Parse", err)
|
|
|
+ p.log.Errorln("something_static.GetCodeFromWeb.time.Parse", err)
|
|
|
// 没有则需要清空
|
|
|
commonValue.SubhdCode = ""
|
|
|
} else {
|
|
|
@@ -77,9 +82,9 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
if codeTime.YearDay() != nowTime.YearDay() {
|
|
|
// 没有则需要清空
|
|
|
commonValue.SubhdCode = ""
|
|
|
- log_helper.GetLogger().Warningln("something_static.GetCodeFromWeb, GetCodeTime:", updateTimeString, "NowTime:", time.Now().String(), "Skip")
|
|
|
+ p.log.Warningln("something_static.GetCodeFromWeb, GetCodeTime:", updateTimeString, "NowTime:", time.Now().String(), "Skip")
|
|
|
} else {
|
|
|
- log_helper.GetLogger().Infoln("GetCode", updateTimeString, code)
|
|
|
+ p.log.Infoln("GetCode", updateTimeString, code)
|
|
|
commonValue.SubhdCode = code
|
|
|
}
|
|
|
}
|
|
|
@@ -87,14 +92,15 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 构建每个字幕站点下载者的实例
|
|
|
p.SubSupplierHub = subSupplier.NewSubSupplierHub(
|
|
|
- *settings.GetSettings(),
|
|
|
- zimuku.NewSupplier(*settings.GetSettings()),
|
|
|
- xunlei.NewSupplier(*settings.GetSettings()),
|
|
|
- shooter.NewSupplier(*settings.GetSettings()),
|
|
|
+ p.sets,
|
|
|
+ p.log,
|
|
|
+ zimuku.NewSupplier(p.sets, p.log),
|
|
|
+ xunlei.NewSupplier(p.sets, p.log),
|
|
|
+ shooter.NewSupplier(p.sets, p.log),
|
|
|
)
|
|
|
if commonValue.SubhdCode != "" {
|
|
|
// 如果找到 code 了,那么就可以继续用这个实例
|
|
|
- p.SubSupplierHub.AddSubSupplier(subhd.NewSupplier(*settings.GetSettings()))
|
|
|
+ p.SubSupplierHub.AddSubSupplier(subhd.NewSupplier(p.sets, p.log))
|
|
|
}
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 清理自定义的 rod 缓存目录
|
|
|
@@ -104,7 +110,7 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
return p
|
|
|
}
|
|
|
|
|
|
- log_helper.GetLogger().Infoln("ClearRodTmpRootFolder Done")
|
|
|
+ p.log.Infoln("ClearRodTmpRootFolder Done")
|
|
|
|
|
|
return p
|
|
|
}
|
|
|
@@ -112,60 +118,60 @@ func (p *PreDownloadProcess) Init() *PreDownloadProcess {
|
|
|
func (p *PreDownloadProcess) Check() *PreDownloadProcess {
|
|
|
|
|
|
if p.gError != nil {
|
|
|
- log_helper.GetLogger().Infoln("Skip PreDownloadProcess.Check()")
|
|
|
+ p.log.Infoln("Skip PreDownloadProcess.Check()")
|
|
|
return p
|
|
|
}
|
|
|
p.stageName = stageNameCheck
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.Check() End")
|
|
|
+ p.log.Infoln("PreDownloadProcess.Check() End")
|
|
|
}()
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.Check() Start...")
|
|
|
+ p.log.Infoln("PreDownloadProcess.Check() Start...")
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 是否启用代理
|
|
|
- if settings.GetSettings().AdvancedSettings.ProxySettings.UseHttpProxy == false {
|
|
|
+ if p.sets.AdvancedSettings.ProxySettings.UseHttpProxy == false {
|
|
|
|
|
|
- log_helper.GetLogger().Infoln("UseHttpProxy = false")
|
|
|
+ p.log.Infoln("UseHttpProxy = false")
|
|
|
// 如果不使用代理,那么默认需要检测 baidu 的连通性,不通过也继续
|
|
|
proxyStatus, proxySpeed, err := url_connectedness_helper.UrlConnectednessTest(url_connectedness_helper.BaiduUrl, "")
|
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln(errors.New("UrlConnectednessTest Target Site " + url_connectedness_helper.BaiduUrl + ", " + err.Error()))
|
|
|
+ p.log.Errorln(errors.New("UrlConnectednessTest Target Site " + url_connectedness_helper.BaiduUrl + ", " + err.Error()))
|
|
|
} else {
|
|
|
- log_helper.GetLogger().Infoln("UrlConnectednessTest Target Site", url_connectedness_helper.BaiduUrl, "Speed:", proxySpeed, "ms,", "Status:", proxyStatus)
|
|
|
+ p.log.Infoln("UrlConnectednessTest Target Site", url_connectedness_helper.BaiduUrl, "Speed:", proxySpeed, "ms,", "Status:", proxyStatus)
|
|
|
}
|
|
|
} else {
|
|
|
|
|
|
- log_helper.GetLogger().Infoln("UseHttpProxy:", settings.GetSettings().AdvancedSettings.ProxySettings.HttpProxyAddress)
|
|
|
+ p.log.Infoln("UseHttpProxy:", p.sets.AdvancedSettings.ProxySettings.HttpProxyAddress)
|
|
|
// 如果使用了代理,那么默认需要检测 google 的连通性,不通过也继续
|
|
|
- proxyStatus, proxySpeed, err := url_connectedness_helper.UrlConnectednessTest(url_connectedness_helper.GoogleUrl, settings.GetSettings().AdvancedSettings.ProxySettings.HttpProxyAddress)
|
|
|
+ proxyStatus, proxySpeed, err := url_connectedness_helper.UrlConnectednessTest(url_connectedness_helper.GoogleUrl, p.sets.AdvancedSettings.ProxySettings.HttpProxyAddress)
|
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln(errors.New("UrlConnectednessTest Target Site " + url_connectedness_helper.GoogleUrl + ", " + err.Error()))
|
|
|
+ p.log.Errorln(errors.New("UrlConnectednessTest Target Site " + url_connectedness_helper.GoogleUrl + ", " + err.Error()))
|
|
|
} else {
|
|
|
- log_helper.GetLogger().Infoln("UrlConnectednessTest Target Site", url_connectedness_helper.GoogleUrl, "Speed:", proxySpeed, "ms,", "Status:", proxyStatus)
|
|
|
+ p.log.Infoln("UrlConnectednessTest Target Site", url_connectedness_helper.GoogleUrl, "Speed:", proxySpeed, "ms,", "Status:", proxyStatus)
|
|
|
}
|
|
|
}
|
|
|
// ------------------------------------------------------------------------
|
|
|
- // 测试提供字幕的网站是有效的
|
|
|
+ // 测试提供字幕的网站是有效的,是否下载次数超限
|
|
|
p.SubSupplierHub.CheckSubSiteStatus()
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 判断文件夹是否存在
|
|
|
- if len(settings.GetSettings().CommonSettings.MoviePaths) < 1 {
|
|
|
- log_helper.GetLogger().Warningln("MoviePaths not set, len == 0")
|
|
|
+ if len(p.sets.CommonSettings.MoviePaths) < 1 {
|
|
|
+ p.log.Warningln("MoviePaths not set, len == 0")
|
|
|
}
|
|
|
- if len(settings.GetSettings().CommonSettings.SeriesPaths) < 1 {
|
|
|
- log_helper.GetLogger().Warningln("SeriesPaths not set, len == 0")
|
|
|
+ if len(p.sets.CommonSettings.SeriesPaths) < 1 {
|
|
|
+ p.log.Warningln("SeriesPaths not set, len == 0")
|
|
|
}
|
|
|
- for i, path := range settings.GetSettings().CommonSettings.MoviePaths {
|
|
|
+ for i, path := range p.sets.CommonSettings.MoviePaths {
|
|
|
if my_util.IsDir(path) == false {
|
|
|
- log_helper.GetLogger().Errorln("MovieFolder not found Index", i, "--", path)
|
|
|
+ p.log.Errorln("MovieFolder not found Index", i, "--", path)
|
|
|
} else {
|
|
|
- log_helper.GetLogger().Infoln("MovieFolder Index", i, "--", path)
|
|
|
+ p.log.Infoln("MovieFolder Index", i, "--", path)
|
|
|
}
|
|
|
}
|
|
|
- for i, path := range settings.GetSettings().CommonSettings.SeriesPaths {
|
|
|
+ for i, path := range p.sets.CommonSettings.SeriesPaths {
|
|
|
if my_util.IsDir(path) == false {
|
|
|
- log_helper.GetLogger().Errorln("SeriesPaths not found Index", i, "--", path)
|
|
|
+ p.log.Errorln("SeriesPaths not found Index", i, "--", path)
|
|
|
} else {
|
|
|
- log_helper.GetLogger().Infoln("SeriesPaths Index", i, "--", path)
|
|
|
+ p.log.Infoln("SeriesPaths Index", i, "--", path)
|
|
|
}
|
|
|
}
|
|
|
// ------------------------------------------------------------------------
|
|
|
@@ -177,24 +183,24 @@ func (p *PreDownloadProcess) Check() *PreDownloadProcess {
|
|
|
func (p *PreDownloadProcess) HotFix() *PreDownloadProcess {
|
|
|
|
|
|
if p.gError != nil {
|
|
|
- log_helper.GetLogger().Infoln("Skip PreDownloadProcess.Check()")
|
|
|
+ p.log.Infoln("Skip PreDownloadProcess.Check()")
|
|
|
return p
|
|
|
}
|
|
|
p.stageName = stageNameCHotFix
|
|
|
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.HotFix() End")
|
|
|
+ p.log.Infoln("PreDownloadProcess.HotFix() End")
|
|
|
}()
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.HotFix() Start...")
|
|
|
+ p.log.Infoln("PreDownloadProcess.HotFix() Start...")
|
|
|
// ------------------------------------------------------------------------
|
|
|
// 开始修复
|
|
|
- log_helper.GetLogger().Infoln(commonValue.NotifyStringTellUserWait)
|
|
|
+ p.log.Infoln(commonValue.NotifyStringTellUserWait)
|
|
|
err := hot_fix.HotFixProcess(types.HotFixParam{
|
|
|
- MovieRootDirs: settings.GetSettings().CommonSettings.MoviePaths,
|
|
|
- SeriesRootDirs: settings.GetSettings().CommonSettings.SeriesPaths,
|
|
|
+ MovieRootDirs: p.sets.CommonSettings.MoviePaths,
|
|
|
+ SeriesRootDirs: p.sets.CommonSettings.SeriesPaths,
|
|
|
})
|
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln("hot_fix.HotFixProcess()", err)
|
|
|
+ p.log.Errorln("hot_fix.HotFixProcess()", err)
|
|
|
p.gError = err
|
|
|
return p
|
|
|
}
|
|
|
@@ -205,31 +211,31 @@ func (p *PreDownloadProcess) HotFix() *PreDownloadProcess {
|
|
|
func (p *PreDownloadProcess) ChangeSubNameFormat() *PreDownloadProcess {
|
|
|
|
|
|
if p.gError != nil {
|
|
|
- log_helper.GetLogger().Infoln("Skip PreDownloadProcess.ChangeSubNameFormat()")
|
|
|
+ p.log.Infoln("Skip PreDownloadProcess.ChangeSubNameFormat()")
|
|
|
return p
|
|
|
}
|
|
|
p.stageName = stageNameChangeSubNameFormat
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.ChangeSubNameFormat() End")
|
|
|
+ p.log.Infoln("PreDownloadProcess.ChangeSubNameFormat() End")
|
|
|
}()
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.ChangeSubNameFormat() Start...")
|
|
|
+ p.log.Infoln("PreDownloadProcess.ChangeSubNameFormat() Start...")
|
|
|
// ------------------------------------------------------------------------
|
|
|
/*
|
|
|
字幕命名格式转换,需要数据库支持
|
|
|
如果数据库没有记录经过转换,那么默认从 Emby 的格式作为检测的起点,转换到目标的格式
|
|
|
然后需要在数据库中记录本次的转换结果
|
|
|
*/
|
|
|
- log_helper.GetLogger().Infoln(commonValue.NotifyStringTellUserWait)
|
|
|
+ p.log.Infoln(commonValue.NotifyStringTellUserWait)
|
|
|
renameResults, err := sub_formatter.SubFormatChangerProcess(
|
|
|
- settings.GetSettings().CommonSettings.MoviePaths,
|
|
|
- settings.GetSettings().CommonSettings.SeriesPaths,
|
|
|
- common.FormatterName(settings.GetSettings().AdvancedSettings.SubNameFormatter))
|
|
|
+ p.sets.CommonSettings.MoviePaths,
|
|
|
+ p.sets.CommonSettings.SeriesPaths,
|
|
|
+ common.FormatterName(p.sets.AdvancedSettings.SubNameFormatter))
|
|
|
// 出错的文件有哪一些
|
|
|
for s, i := range renameResults.ErrFiles {
|
|
|
- log_helper.GetLogger().Errorln("reformat ErrFile:"+s, i)
|
|
|
+ p.log.Errorln("reformat ErrFile:"+s, i)
|
|
|
}
|
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln("SubFormatChangerProcess() Error", err)
|
|
|
+ p.log.Errorln("SubFormatChangerProcess() Error", err)
|
|
|
p.gError = err
|
|
|
return p
|
|
|
}
|
|
|
@@ -240,14 +246,14 @@ func (p *PreDownloadProcess) ChangeSubNameFormat() *PreDownloadProcess {
|
|
|
func (p *PreDownloadProcess) ReloadBrowser() *PreDownloadProcess {
|
|
|
|
|
|
if p.gError != nil {
|
|
|
- log_helper.GetLogger().Infoln("Skip PreDownloadProcess.ReloadBrowser()")
|
|
|
+ p.log.Infoln("Skip PreDownloadProcess.ReloadBrowser()")
|
|
|
return p
|
|
|
}
|
|
|
p.stageName = stageNameReloadBrowser
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.ReloadBrowser() End")
|
|
|
+ p.log.Infoln("PreDownloadProcess.ReloadBrowser() End")
|
|
|
}()
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.ReloadBrowser() Start...")
|
|
|
+ p.log.Infoln("PreDownloadProcess.ReloadBrowser() Start...")
|
|
|
// ------------------------------------------------------------------------
|
|
|
// ReloadBrowser 提前把浏览器下载好
|
|
|
rod_helper.ReloadBrowser()
|
|
|
@@ -256,11 +262,11 @@ func (p *PreDownloadProcess) ReloadBrowser() *PreDownloadProcess {
|
|
|
|
|
|
func (p *PreDownloadProcess) Wait() error {
|
|
|
defer func() {
|
|
|
- log_helper.GetLogger().Infoln("PreDownloadProcess.Wait() Done.")
|
|
|
+ p.log.Infoln("PreDownloadProcess.Wait() Done.")
|
|
|
}()
|
|
|
if p.gError != nil {
|
|
|
outErrString := "PreDownloadProcess.Wait() Get Error, " + "stageName:" + p.stageName + " -- " + p.gError.Error()
|
|
|
- log_helper.GetLogger().Errorln(outErrString)
|
|
|
+ p.log.Errorln(outErrString)
|
|
|
return errors.New(outErrString)
|
|
|
} else {
|
|
|
return nil
|