调整目录结构，为后续外部项目使用提供完整的接口支持

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

.gitignore

@@ -1,5 +1,5 @@
 /.idea
-/internal/logic/sub_supplier/subhd/result.png
+/internal/pkg/logic/sub_supplier/subhd/result.png
 /common/result.png
 /result.png
 /Logs
@@ -14,8 +14,8 @@
 /ChineseSubFinder.exe
 /*.zip
 /*.rar
-/internal/logic/sub_supplier/subhd/Logs
-/internal/logic/sub_supplier/zimuku/Logs
+/internal/pkg/logic/sub_supplier/subhd/Logs
+/internal/pkg/logic/sub_supplier/zimuku/Logs
 /dist
 /emby_helper/Logs/*.log
 /internal/Logs/*.log
@@ -25,7 +25,7 @@
 /*.exe
 /cmd/chinesesubfinder/*.exe
 /internal/tmpthings
-/internal/logic/sub_supplier/subhd/.rod
+/internal/pkg/logic/sub_supplier/subhd/.rod
 /internal/pkg/rod_helper/Logs
 /internal/pkg/sub_formatter/Logs
 /internal/pkg/sub_formatter/settings.db
@@ -35,17 +35,17 @@
 /internal/pkg/sub_timeline_fixer/*.srt
 /internal/pkg/sub_timeline_fixer/*.ass
 
-/internal/logic/sub_timeline_fixer/tmpSubFix
-/internal/logic/sub_timeline_fixer/SubFixCache
-/internal/logic/sub_timeline_fixer/Logs
+/internal/pkg/logic/sub_timeline_fixer/tmpSubFix
+/internal/pkg/logic/sub_timeline_fixer/SubFixCache
+/internal/pkg/logic/sub_timeline_fixer/Logs
 /internal/pkg/sub_timeline_fixer/Logs
 /SubFixCache
 
 /internal/pkg/ffmpeg_helper/Logs
 /internal/pkg/sub_timeline_fixer/*.html
 
-/internal/logic/sub_supplier/shooter/Logs
-/internal/logic/sub_supplier/xunlei/Logs
+/internal/pkg/logic/sub_supplier/shooter/Logs
+/internal/pkg/logic/sub_supplier/xunlei/Logs
 
 TestData/*
 TestData/
@@ -70,7 +70,7 @@ TestData/
 /internal/backend/settings.db
 /internal/pkg/settings/testfile.json
 /internal/types/backend/reply_check_proxy.json
-/internal/logic/emby_helper/Logs
+/internal/pkg/logic/emby_helper/Logs
 /internal/pkg/downloader/ChineseSubFinderSettings.json
 /ChineseSubFinderSettings.json
 
@@ -81,49 +81,49 @@ ChineseSubFinderSettings.json
 /internal/pkg/hot_fix/ChineseSubFinder-Cache.db
 /internal/pkg/sub_formatter/ChineseSubFinder-Cache.db
 /opendebuglog
-/internal/logic/sub_supplier/subhd/cache
-/internal/logic/sub_supplier/zimuku/cache
-/internal/logic/movie_helper/Logs
+/internal/pkg/logic/sub_supplier/subhd/cache
+/internal/pkg/logic/sub_supplier/zimuku/cache
+/internal/pkg/logic/movie_helper/Logs
 /TestCode/Logs
 /internal/pkg/task_queue/task_queue
 /internal/pkg/task_queue/Logs
 /task_queue
 /internal/pkg/sub_file_hash/Logs
-/internal/logic/sub_supplier/xunlei/task_queue
+/internal/pkg/logic/sub_supplier/xunlei/task_queue
 /internal/pkg/download_file_cache/Logs
 /internal/pkg/download_file_cache/download_sub_cache
-/internal/logic/sub_supplier/subhd/download_sub_cache
-/internal/logic/sub_supplier/subhd/task_queue
-/internal/logic/sub_supplier/xunlei/download_sub_cache
-/internal/logic/sub_supplier/zimuku/download_sub_cache
-/internal/logic/sub_supplier/zimuku/task_queue
+/internal/pkg/logic/sub_supplier/subhd/download_sub_cache
+/internal/pkg/logic/sub_supplier/subhd/task_queue
+/internal/pkg/logic/sub_supplier/xunlei/download_sub_cache
+/internal/pkg/logic/sub_supplier/zimuku/download_sub_cache
+/internal/pkg/logic/sub_supplier/zimuku/task_queue
 /internal/pkg/emby_api/Logs
-/internal/logic/sub_supplier/shooter/download_sub_cache
-/internal/logic/sub_supplier/shooter/task_queue
+/internal/pkg/logic/sub_supplier/shooter/download_sub_cache
+/internal/pkg/logic/sub_supplier/shooter/task_queue
 /internal/pkg/imdb_helper/Logs
-/internal/logic/sub_parser/ass/Logs
+/internal/pkg/logic/sub_parser/ass/Logs
 /internal/pkg/sub_formatter/opendebuglog
-/internal/logic/sub_supplier/zimuku/ChineseSubFinder-Cache.db
+/internal/pkg/logic/sub_supplier/zimuku/ChineseSubFinder-Cache.db
 /download_sub_cache
 /internal/pkg/task_queue/cache/CSF-CacheCenter/task_queue/testQueue
 /internal/pkg/task_queue/cache/CSF-CacheCenter
 /internal/pkg/cache_center/cache/CSF-CacheCenter/testFile_cache_center.db
 /internal/pkg/cache_center/cache/CSF-CacheCenter/download_files/testFile/2022-05-01
 
-/internal/logic/task_queue/Logs
-/internal/logic/task_queue/task_queue
+/internal/pkg/logic/task_queue/Logs
+/internal/pkg/logic/task_queue/task_queue
 /internal/logic/sub_supplier/subhd/*.db
 /internal/pkg/pass_water_wall/.rod
 /internal/pkg/pass_water_wall/cache
 /internal/pkg/rod_helper/cache/
-/internal/logic/sub_supplier/assrt/cache/
+/internal/pkg/logic/sub_supplier/assrt/cache/
 /**/ChineseSubFinder-Cache.db
 /CustomAuth
-/internal/logic/sub_supplier/assrt/CustomAuth
-/internal/logic/sub_supplier/subhd/CustomAuth
+/internal/pkg/logic/sub_supplier/assrt/CustomAuth
+/internal/pkg/logic/sub_supplier/subhd/CustomAuth
 /internal/pkg/subtitle_best_api/CustomAuth
-/internal/logic/sub_supplier/csf/CustomAuth
-/internal/logic/sub_supplier/csf/cache
-/internal/logic/sub_supplier/xunlei/cache
-/internal/logic/sub_supplier/a4k/CustomAuth
-/internal/logic/sub_supplier/a4k/cache
+/internal/pkg/logic/sub_supplier/csf/CustomAuth
+/internal/pkg/logic/sub_supplier/csf/cache
+/internal/pkg/logic/sub_supplier/xunlei/cache
+/internal/pkg/logic/sub_supplier/a4k/CustomAuth
+/internal/pkg/logic/sub_supplier/a4k/cache

cmd/chinesesubfinder/main.go

@@ -8,12 +8,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/pre_job"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/backend"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/cron_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/pre_job"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"

cmd/subtimelinefixer/main.go

@@ -6,7 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_timeline_fixer"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_timeline_fixer"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"

internal/backend/backend.go

@@ -2,15 +2,16 @@ package backend
 
 import (
 	"fmt"
+	"io/ioutil"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/frontend/dist"
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/routers"
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/ws_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/cron_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
-	"io/ioutil"
-	"net/http"
 )
 
 // StartBackEnd 开启后端的服务器

internal/backend/controllers/base/controller_base.go

@@ -1,7 +1,7 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/gin-gonic/gin"
 	"net/http"

internal/backend/controllers/base/path_things.go

@@ -1,7 +1,7 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/emby_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"

internal/backend/controllers/base/proxy.go

@@ -1,14 +1,14 @@
 package base
 
 import (
+	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/assrt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/csf"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/shooter"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/subhd"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/xunlei"
 	"net/http"
 
-	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/csf"
-	"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"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/gin-gonic/gin"
 )

internal/backend/controllers/v1/controller_base.go

@@ -1,15 +1,16 @@
 package v1
 
 import (
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/controllers/base"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/cron_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/lock"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/cron_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/video_scan_and_refresh_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"net/http"
 )
 
 type ControllerBase struct {

internal/backend/routers/base_router.go

@@ -4,8 +4,8 @@ import (
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/controllers/base"
 	v1 "github.com/allanpk716/ChineseSubFinder/internal/backend/controllers/v1"
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/middle"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/cron_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/gin-gonic/gin"
 )
 

internal/pkg/downloader/download_processer.go

@@ -3,9 +3,9 @@ package downloader
 import (
 	"errors"
 	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"path/filepath"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/task_queue"

internal/pkg/downloader/downloader.go

@@ -3,21 +3,20 @@ package downloader
 import (
 	"errors"
 	"fmt"
+	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	markSystem "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/mark_system"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/pre_download_process"
+	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/csf"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_timeline_fixer"
 	"sync"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/csf"
-
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/emby_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	markSystem "github.com/allanpk716/ChineseSubFinder/internal/logic/mark_system"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/pre_download_process"
-	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_timeline_fixer"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"

internal/pkg/ffmpeg_helper/ffmpeg_helper.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"

internal/pkg/hot_fix/hot_fix_001.go

@@ -2,8 +2,8 @@ package hot_fix
 
 import (
 	"errors"
-	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/movie_helper"
-	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
+	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/movie_helper"
+	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/old"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"

internal/pkg/language/string_encoding.go

@@ -1,11 +1,12 @@
 package language
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/charset"
+	"strings"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/charset"
 	"github.com/axgle/mahonia"
 	nzlov "github.com/nzlov/chardet"
 	"github.com/sirupsen/logrus"
-	"strings"
 )
 
 // ConvertToString 将字符串从原始编码转换到目标编码，需要配合字符串检测编码库使用 chardet.NewTextDetector()

internal/logic/cron_helper/cron_helper.go → internal/pkg/logic/cron_helper/cron_helper.go

@@ -1,12 +1,13 @@
 package cron_helper
 
 import (
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/scan_played_video_subinfo"
+
 	//"github.com/allanpk716/ChineseSubFinder/internal/logic/pre_job"
 	"sync"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/scan_played_video_subinfo"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter"

internal/logic/file_downloader/downloader_hub.go → internal/pkg/logic/file_downloader/downloader_hub.go

@@ -3,11 +3,12 @@ package file_downloader
 import (
 	"crypto/sha256"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 	"path/filepath"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"

internal/logic/mark_system/markingsystem.go → internal/pkg/logic/mark_system/markingsystem.go

@@ -1,8 +1,8 @@
 package mark_system
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"

internal/logic/movie_helper/moviehelper.go → internal/pkg/logic/movie_helper/moviehelper.go

@@ -6,9 +6,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/imdb_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"

internal/logic/pre_download_process/pre_download_proces.go → internal/pkg/logic/pre_download_process/pre_download_proces.go

@@ -5,16 +5,17 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/a4k"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/a4k"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/assrt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/csf"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/shooter"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/subhd"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/xunlei"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 
-	"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/csf"
-	"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"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"

internal/logic/scan_played_video_subinfo/scan_played_video_subinfo.go → internal/pkg/logic/scan_played_video_subinfo/scan_played_video_subinfo.go

@@ -3,18 +3,17 @@ package scan_played_video_subinfo
 import (
 	"errors"
 	"fmt"
+	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/mix_media_info"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/emby_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/imdb_helper"

internal/logic/series_helper/seriesHelper.go → internal/pkg/logic/series_helper/seriesHelper.go

@@ -5,9 +5,10 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/imdb_helper"

internal/logic/sub_supplier/a4k/a4k.go → internal/pkg/logic/sub_supplier/a4k/a4k.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/Tnze/go.num/v2/zh"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/mix_media_info"
 	"github.com/go-resty/resty/v2"
 	"github.com/jinzhu/now"
@@ -15,7 +16,6 @@ import (
 
 	"github.com/PuerkitoBio/goquery"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	common2 "github.com/allanpk716/ChineseSubFinder/internal/types/common"

internal/logic/sub_supplier/a4k/a4k_test.go → internal/pkg/logic/sub_supplier/a4k/a4k_test.go

@@ -1,19 +1,20 @@
 package a4k
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"testing"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 )
 

internal/logic/sub_supplier/assrt/assrt.go → internal/pkg/logic/sub_supplier/assrt/assrt.go

@@ -10,11 +10,12 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/mix_media_info"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"

internal/logic/sub_supplier/assrt/assrt_test.go → internal/pkg/logic/sub_supplier/assrt/assrt_test.go

@@ -1,12 +1,12 @@
 package assrt
 
 import (
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"testing"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"

internal/logic/sub_supplier/csf/csf.go → internal/pkg/logic/sub_supplier/csf/csf.go

@@ -10,6 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"
 
@@ -21,7 +23,6 @@ import (
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/mix_media_info"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	common2 "github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/series"

internal/logic/sub_supplier/csf/csf_test.go → internal/pkg/logic/sub_supplier/csf/csf_test.go

@@ -1,15 +1,16 @@
 package csf
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
-	"testing"
 )
 
 func TestSupplier_GetSubListFromFile4Movie(t *testing.T) {

internal/logic/sub_supplier/shooter/shooter.go → internal/pkg/logic/sub_supplier/shooter/shooter.go

@@ -4,8 +4,13 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"math"
+	"os"
+	"path/filepath"
+	"time"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
@@ -13,10 +18,6 @@ import (
 	"github.com/allanpk716/ChineseSubFinder/internal/types/series"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
 	"github.com/sirupsen/logrus"
-	"math"
-	"os"
-	"path/filepath"
-	"time"
 )
 
 type Supplier struct {

internal/logic/sub_supplier/shooter/shooter_test.go → internal/pkg/logic/sub_supplier/shooter/shooter_test.go

@@ -1,16 +1,17 @@
 package shooter
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"path/filepath"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
-	"path/filepath"
-	"testing"
 )
 
 func TestNewSupplier(t *testing.T) {

internal/logic/sub_supplier/subSupplierHub.go → internal/pkg/logic/sub_supplier/subSupplierHub.go

@@ -2,8 +2,8 @@ package sub_supplier
 
 import (
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/movie_helper"
-	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
+	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/movie_helper"
+	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"

internal/logic/sub_supplier/subhd/subhd.go → internal/pkg/logic/sub_supplier/subhd/subhd.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"image/jpeg"
 	"math"
 	"net/url"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/Tnze/go.num/v2/zh"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"

internal/logic/sub_supplier/subhd/subhd_test.go → internal/pkg/logic/sub_supplier/subhd/subhd_test.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"

internal/logic/sub_supplier/xunlei/xunlei.go → internal/pkg/logic/sub_supplier/xunlei/xunlei.go

@@ -4,9 +4,14 @@ import (
 	"crypto/sha1"
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"math"
+	"os"
+	"path/filepath"
+	"time"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
@@ -15,10 +20,6 @@ import (
 	"github.com/allanpk716/ChineseSubFinder/internal/types/series"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
 	"github.com/sirupsen/logrus"
-	"math"
-	"os"
-	"path/filepath"
-	"time"
 )
 
 type Supplier struct {

internal/logic/sub_supplier/xunlei/xunlei_test.go → internal/pkg/logic/sub_supplier/xunlei/xunlei_test.go

@@ -4,7 +4,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"

internal/logic/sub_supplier/zimuku/zimuku.go → internal/pkg/logic/sub_supplier/zimuku/zimuku.go

@@ -11,9 +11,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+
 	"github.com/PuerkitoBio/goquery"
 	"github.com/Tnze/go.num/v2/zh"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"

internal/logic/sub_supplier/zimuku/zimuku_test.go → internal/pkg/logic/sub_supplier/zimuku/zimuku_test.go

@@ -1,19 +1,20 @@
 package zimuku
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
+	"path/filepath"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/rod_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
-	"path/filepath"
-	"testing"
 )
 
 func TestSupplier_GetSubListFromKeyword(t *testing.T) {

internal/logic/sub_timeline_fixer/SubTimelineFixerHelperEx.go → internal/pkg/logic/sub_timeline_fixer/SubTimelineFixerHelperEx.go

@@ -2,9 +2,9 @@ package sub_timeline_fixer
 
 import (
 	"errors"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/ffmpeg_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"

internal/pkg/something_static/something_static.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"

internal/pkg/sub_formatter/normal/normal.go

@@ -1,18 +1,19 @@
 package normal
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
+	"path/filepath"
+	"regexp"
+	"strings"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 	languageConst "github.com/allanpk716/ChineseSubFinder/internal/types/language"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"
 	"github.com/sirupsen/logrus"
-	"path/filepath"
-	"regexp"
-	"strings"
 )
 
 type Formatter struct {

internal/pkg/sub_formatter/sub_format_changer.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/movie_helper"
-	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
+	movieHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/movie_helper"
+	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/emby"

internal/pkg/sub_helper/dialogue_merger_test.go

@@ -1,14 +1,15 @@
 package sub_helper
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 
 	// "github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 	"path/filepath"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 )
 
 func Test_isFirstLetterIsEngUpper(t *testing.T) {

internal/pkg/sub_helper/sub_helper_test.go

@@ -2,9 +2,9 @@ package sub_helper
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"

internal/pkg/sub_parser_hub/subParserHub_test.go

@@ -1,9 +1,9 @@
 package sub_parser_hub
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"testing"

internal/pkg/sub_timeline_fixer/pipeline_test.go

@@ -2,14 +2,15 @@ package sub_timeline_fixer
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
+	"path/filepath"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/vad"
-	"path/filepath"
-	"testing"
 )
 
 func TestPipeline_getFramerateRatios2Try(t *testing.T) {

internal/pkg/video_scan_and_refresh_helper/video_scan_and_refresh_helper.go

@@ -6,18 +6,19 @@ import (
 	"sync"
 	"time"
 
+	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/forced_scan_and_down_sub"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/movie_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/restore_fix_timeline_bk"
+	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_parser/srt"
+	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_supplier/xunlei"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/emby_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/file_downloader"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/forced_scan_and_down_sub"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/movie_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/restore_fix_timeline_bk"
-	seriesHelper "github.com/allanpk716/ChineseSubFinder/internal/logic/series_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
-	subSupplier "github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_supplier/xunlei"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/imdb_helper"

pkg/language/string_encoding.go

@@ -1,8 +0,0 @@
-package language
-
-import iLanguage "github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
-
-// ChangeFileCoding2UTF8 自动检测文件的编码，然后转换到 UTF-8，但是导出 bytes 的时候会把头部的 BOM 信息去除
-func ChangeFileCoding2UTF8(inBytes []byte) ([]byte, error) {
-	return iLanguage.ChangeFileCoding2UTF8(inBytes)
-}

pkg/sub_parser_hub/sub_parser_hub.go

@@ -1,16 +0,0 @@
-package sub_parser_hub
-
-import (
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/ass"
-	"github.com/allanpk716/ChineseSubFinder/internal/logic/sub_parser/srt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
-)
-
-type SubParserHub struct {
-	*sub_parser_hub.SubParserHub
-}
-
-func NewSubParserHub() *SubParserHub {
-
-	return &SubParserHub{sub_parser_hub.NewSubParserHub(nil, ass.NewParser(nil), srt.NewParser(nil))}
-}