调整项目结构，便于外部使用 pkg 的模块

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

.gitignore

@@ -1,129 +1,29 @@
 /.idea
-/internal/pkg/logic/sub_supplier/subhd/result.png
-/common/result.png
-/result.png
-/Logs
 /debugThings
 /tmpthings
-/model/result.png
-/sub_supplier/xunlei/Logs/*.log
 /**/CSF-SubFixCache
 /**/CSF-DebugThings
 /**/CSF-TmpThings
 /**/config.yaml
-/ChineseSubFinder.exe
 /*.zip
 /*.rar
-/internal/pkg/logic/sub_supplier/subhd/Logs
-/internal/pkg/logic/sub_supplier/zimuku/Logs
 /dist
 /emby_helper/Logs/*.log
 /internal/Logs/*.log
 /internal/pkg/hot_fix/settings.db
 /settings.db
-/internal/pkg/Logs
 /*.exe
 /cmd/chinesesubfinder/*.exe
-/internal/tmpthings
-/internal/pkg/logic/sub_supplier/subhd/.rod
-/internal/pkg/rod_helper/Logs
-/internal/pkg/sub_formatter/Logs
-/internal/pkg/sub_formatter/settings.db
-/cmd/chinesesubfinder/Logs
-/cmd/chinesesubfinder/settings.db
-/internal/pkg/sub_timeline_fixer/bar.html
-/internal/pkg/sub_timeline_fixer/*.srt
-/internal/pkg/sub_timeline_fixer/*.ass
-
-/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/pkg/logic/sub_supplier/shooter/Logs
-/internal/pkg/logic/sub_supplier/xunlei/Logs
-
 TestData/*
 TestData/
-/internal/pkg/hot_fix/Logs/*.log
-/internal/pkg/sub_parser_hub/Logs/*.log
-/internal/logic/series_helper/Logs/*.log
-/internal/pkg/my_util/Logs/*.log
-/internal/pkg/notify_center/Logs/*.log
-/internal/pkg/pass_water_wall/result.png
-/internal/pkg/pass_water_wall/Logs/*.log
 /something.yaml
 /.rod
 /cmd/GetCAPTCHA
 /.idea
-/internal/backend/Logs
-/internal/pkg/task_control/Logs/*.log
-/internal/pkg/task_control/opendebuglog
-/internal/pkg/downloader/Logs/*.log
-/internal/dao/Logs/*.log
-/internal/dao/*.db
-/internal/pkg/strcut_json/*.json
-/internal/backend/settings.db
-/internal/pkg/settings/testfile.json
-/internal/types/backend/reply_check_proxy.json
-/internal/pkg/logic/emby_helper/Logs
-/internal/pkg/downloader/ChineseSubFinderSettings.json
-/ChineseSubFinderSettings.json
-
 /*.iml
-/ChineseSubFinder-Cache.db
-ChineseSubFinderSettings.json
-/cache
-/internal/pkg/hot_fix/ChineseSubFinder-Cache.db
-/internal/pkg/sub_formatter/ChineseSubFinder-Cache.db
-/opendebuglog
-/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/pkg/logic/sub_supplier/xunlei/task_queue
-/internal/pkg/download_file_cache/Logs
-/internal/pkg/download_file_cache/download_sub_cache
-/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/pkg/logic/sub_supplier/shooter/download_sub_cache
-/internal/pkg/logic/sub_supplier/shooter/task_queue
-/internal/pkg/imdb_helper/Logs
-/internal/pkg/logic/sub_parser/ass/Logs
-/internal/pkg/sub_formatter/opendebuglog
-/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/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/pkg/logic/sub_supplier/assrt/cache/
-/**/ChineseSubFinder-Cache.db
-/CustomAuth
-/internal/pkg/logic/sub_supplier/assrt/CustomAuth
-/internal/pkg/logic/sub_supplier/subhd/CustomAuth
-/internal/pkg/subtitle_best_api/CustomAuth
-/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
+/**/ChineseSubFinderSettings.json
+/**/*.db
+/**/Logs
+/**/cache
+/**/CustomAuth

TestCode/test_imdb_tmdb.go

@@ -3,8 +3,8 @@ package TestCode
 import (
 	"fmt"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	tmdb "github.com/cyruzin/golang-tmdb"
 )
 

cmd/GetCAPTCHA/backend/get_code.go

@@ -3,11 +3,12 @@ package backend
 import (
 	b64 "encoding/base64"
 	"errors"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/rod_helper"
-	"github.com/go-rod/rod/lib/proto"
-	"github.com/sirupsen/logrus"
 	"regexp"
 	"strings"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/rod_helper"
+	"github.com/go-rod/rod/lib/proto"
+	"github.com/sirupsen/logrus"
 )
 
 func GetCode(log *logrus.Logger, codeUrl string) (string, error) {

cmd/GetCAPTCHA/backend/git_helper.go

@@ -2,17 +2,18 @@ package backend
 
 import (
 	"fmt"
+	"os"
+	"time"
+
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend/config"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/something_static"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/something_static"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/sirupsen/logrus"
 	sshOrg "golang.org/x/crypto/ssh"
-	"os"
-	"time"
 )
 
 func GitProcess(log *logrus.Logger, config config.Config, enString string) error {

cmd/GetCAPTCHA/main.go

@@ -5,15 +5,15 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
+	"github.com/allanpk716/ChineseSubFinder/pkg/random_auth_key"
 
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend"
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend/config"
-	"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/notify_center"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/notify_center"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/robfig/cron/v3"
 	"github.com/sirupsen/logrus"
 )

cmd/chinesesubfinder/main.go

@@ -8,19 +8,19 @@ 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/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/pre_job"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/random_auth_key"
+	"github.com/allanpk716/ChineseSubFinder/pkg/random_auth_key"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/backend"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"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/settings"
+	"github.com/allanpk716/ChineseSubFinder/pkg/cache_center"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/sirupsen/logrus"
 )
 

cmd/subtimelinefixer/main.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/sub_timeline_fixer"
+	"github.com/allanpk716/ChineseSubFinder/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"
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/sirupsen/logrus"
 
 	"github.com/urfave/cli/v2"

internal/backend/backend.go

@@ -8,8 +8,8 @@ import (
 	"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/pkg/logic/cron_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/file_downloader"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )

internal/backend/controllers/base/backend_static_file_system.go

@@ -2,13 +2,14 @@ package base
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/net/context"
 )
 
 type StaticFileSystemBackEnd struct {

internal/backend/controllers/base/change_pwd.go

@@ -1,11 +1,12 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) ChangePwdHandler(c *gin.Context) {

internal/backend/controllers/base/controller_base.go

@@ -1,10 +1,11 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/file_downloader"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 type ControllerBase struct {

internal/backend/controllers/base/def_settings.go

@@ -1,9 +1,10 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
-	"github.com/gin-gonic/gin"
 	"net/http"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
+	"github.com/gin-gonic/gin"
 )
 
 func (cb ControllerBase) DefSettingsHandler(c *gin.Context) {

internal/backend/controllers/base/login.go

@@ -1,12 +1,13 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) LoginHandler(c *gin.Context) {

internal/backend/controllers/base/logout.go

@@ -1,10 +1,11 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) LogoutHandler(c *gin.Context) {

internal/backend/controllers/base/path_things.go

@@ -1,12 +1,13 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/emby_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) CheckPathHandler(c *gin.Context) {

internal/backend/controllers/base/proxy.go

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

internal/backend/controllers/base/setup.go

@@ -1,10 +1,11 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) SetupHandler(c *gin.Context) {

internal/backend/controllers/base/system_status.go

@@ -1,11 +1,12 @@
 package base
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 // SystemStatusHandler 获取系统状态

internal/backend/controllers/v1/api.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	TTaskqueue "github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 	"github.com/gin-gonic/gin"
 )
 

internal/backend/controllers/v1/controller_base.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/backend/controllers/base"
-	"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/allanpk716/ChineseSubFinder/pkg/lock"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_formatter"
+	"github.com/allanpk716/ChineseSubFinder/pkg/video_scan_and_refresh_helper"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )

internal/backend/controllers/v1/daemon_things.go

@@ -1,10 +1,11 @@
 package v1
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) DaemonStartHandler(c *gin.Context) {

internal/backend/controllers/v1/jobs_things.go

@@ -3,17 +3,18 @@ package v1
 import (
 	"bufio"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	task_queue2 "github.com/allanpk716/ChineseSubFinder/internal/pkg/task_queue"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
-	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	task_queue2 "github.com/allanpk716/ChineseSubFinder/pkg/task_queue"
+	"github.com/gin-gonic/gin"
 )
 
 func (cb ControllerBase) JobsListHandler(c *gin.Context) {

internal/backend/controllers/v1/settings.go

@@ -1,11 +1,12 @@
 package v1
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func (cb ControllerBase) SettingsHandler(c *gin.Context) {

internal/backend/controllers/v1/video_list.go

@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/video_scan_and_refresh_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	TTaskqueue "github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/video_scan_and_refresh_helper"
 	"github.com/gin-gonic/gin"
 )
 

internal/backend/middle/auth.go

@@ -1,11 +1,12 @@
 package middle
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/gin-gonic/gin"
 )
 
 func CheckAuth() gin.HandlerFunc {

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/pkg/logic/cron_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/file_downloader"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/cron_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/file_downloader"
 	"github.com/gin-gonic/gin"
 )
 

internal/backend/ws_helper/client.go

@@ -3,13 +3,14 @@ package ws_helper
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/backend/ws"
-	"github.com/gorilla/websocket"
-	"github.com/sirupsen/logrus"
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/types/backend/ws"
+	"github.com/allanpk716/ChineseSubFinder/pkg/common"
+	"github.com/gorilla/websocket"
+	"github.com/sirupsen/logrus"
 )
 
 const (

internal/dao/init.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 )

internal/ifaces/iSupplier.go

@@ -1,9 +1,9 @@
 package ifaces
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/series"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/sirupsen/logrus"
 )
 

internal/models/imdb_info.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+	"github.com/allanpk716/ChineseSubFinder/pkg/language"
 	"github.com/longbridgeapp/opencc"
 )
 

internal/types/backend/reply_login.go

@@ -1,6 +1,6 @@
 package backend
 
-import "github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+import "github.com/allanpk716/ChineseSubFinder/pkg/settings"
 
 type ReplyLogin struct {
 	AccessToken string            `json:"access_token,omitempty"` // 登录成功后返回令牌

internal/types/backend/req_check_proxy.go

@@ -1,6 +1,6 @@
 package backend
 
-import "github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+import "github.com/allanpk716/ChineseSubFinder/pkg/settings"
 
 type ReqCheckProxy struct {
 	ProxySettings settings.ProxySettings `json:"proxy_settings"  binding:"required"`

internal/types/backend/req_setup_info.go

@@ -1,7 +1,7 @@
 package backend
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 )
 
 type ReqSetupInfo struct {

internal/types/subparser/fileinfo.go

@@ -2,13 +2,14 @@ package subparser
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	common2 "github.com/allanpk716/ChineseSubFinder/internal/types/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/language"
 	"math"
 	"sort"
 	"strings"
 	"time"
+
+	common2 "github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/language"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 )
 
 type FileInfo struct {

internal/types/task_queue/task_queue.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_file_hash"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/emby"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_file_hash"
 	"github.com/araddon/dateparse"
 )
 

internal/pkg/archive_helper/unarchiveFile.go → pkg/archive_helper/unarchiveFile.go

@@ -5,16 +5,17 @@ import (
 	"bytes"
 	"compress/flate"
 	"errors"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/bodgit/sevenzip"
-	"github.com/mholt/archiver/v3"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/transform"
 	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/bodgit/sevenzip"
+	"github.com/mholt/archiver/v3"
+	"golang.org/x/text/encoding/simplifiedchinese"
+	"golang.org/x/text/transform"
 )
 
 // UnArchiveFileEx 发现打包的字幕内部还有一层压缩包···所以···

internal/pkg/archive_helper/unarchiveFile_test.go → pkg/archive_helper/unarchiveFile_test.go

@@ -1,11 +1,12 @@
 package archive_helper
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestUnArchiveFile(t *testing.T) {

internal/pkg/cache_center/cache_center.go → pkg/cache_center/cache_center.go

@@ -2,16 +2,17 @@ package cache_center
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
-	"github.com/sirupsen/logrus"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
 	"os"
 	"path/filepath"
 	"sync"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/cache_center/models"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
+	"github.com/sirupsen/logrus"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
 )
 
 type CacheCenter struct {

internal/pkg/cache_center/daily_download_info.go → pkg/cache_center/daily_download_info.go

@@ -1,8 +1,9 @@
 package cache_center
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center/models"
 	"time"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/cache_center/models"
 )
 
 // DailyDownloadCountGet 根据字幕提供者的名称，获取今日下载计数的次数，仅仅统计次数，并不确认是那个视频的字幕下载

internal/pkg/cache_center/download_file_info.go → pkg/cache_center/download_file_info.go

@@ -3,12 +3,13 @@ package cache_center
 import (
 	"encoding/json"
 	"errors"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
+	"github.com/allanpk716/ChineseSubFinder/pkg/cache_center/models"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 )
 
 func (c *CacheCenter) DownloadFileAdd(subInfo *supplier.SubInfo) error {

internal/pkg/cache_center/download_file_info_test.go → pkg/cache_center/download_file_info_test.go

@@ -1,11 +1,12 @@
 package cache_center
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/language"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/supplier"
-	"testing"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 )
 
 func TestCacheCenter_DownloadFileAdd(t *testing.T) {

internal/pkg/cache_center/task_queue_info.go → pkg/cache_center/task_queue_info.go

@@ -2,11 +2,12 @@ package cache_center
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/cache_center/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"os"
 	"path/filepath"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/cache_center/models"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 )
 
 func (c *CacheCenter) TaskQueueClear() error {

internal/pkg/change_file_encode/change_file_encode.go → pkg/change_file_encode/change_file_encode.go

@@ -3,8 +3,9 @@ package change_file_encode
 import (
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
 	"os"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/language"
 )
 
 func Process(srcSubFileFPath string, desCode int) error {

internal/pkg/chs_cht_changer/chs_cht_changer_test.go → pkg/chs_cht_changer/chs_cht_changer_test.go

@@ -1,10 +1,11 @@
 package chs_cht_changer
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/change_file_encode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/change_file_encode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestProcess(t *testing.T) {

internal/pkg/debug_view/debug_view.go → pkg/debug_view/debug_view.go

@@ -2,13 +2,14 @@ package debug_view
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/vad"
-	"github.com/go-echarts/go-echarts/v2/charts"
-	"github.com/go-echarts/go-echarts/v2/opts"
 	"os"
 	"path/filepath"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/vad"
+	"github.com/go-echarts/go-echarts/v2/charts"
+	"github.com/go-echarts/go-echarts/v2/opts"
 )
 
 func SaveDebugChart(subUnit sub_helper.SubUnit, title, subTitle string) error {

internal/pkg/decode/decode_test.go → pkg/decode/decode_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types"
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestGetImdbAndYearMovieXml(t *testing.T) {

pkg/download_file_cache/download_sub_cache/KEYREGISTRY

@@ -0,0 +1,2 @@
+.
++$!XÀã#¯9ÉéuHello Badger

internal/pkg/downloader/cache_info.go → pkg/downloader/cache_info.go

@@ -1,14 +1,15 @@
 package downloader
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/strcut_json"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
+	"path/filepath"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/backend"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
-	"path/filepath"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/strcut_json"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
 )
 
 func (d *Downloader) SetMovieAndSeasonInfo(movieInfos []backend.MovieInfo, seasonInfos []backend.SeasonInfo) {

internal/pkg/downloader/download_processer.go → pkg/downloader/download_processer.go

@@ -3,13 +3,14 @@ package downloader
 import (
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/logic/series_helper"
 	"path/filepath"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/series_helper"
+
 	taskQueue2 "github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/task_queue"
 	"golang.org/x/net/context"
 )
 

internal/pkg/downloader/downloader.go → pkg/downloader/downloader.go

@@ -3,28 +3,29 @@ 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"
+	embyHelper "github.com/allanpk716/ChineseSubFinder/pkg/logic/emby_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/file_downloader"
+	markSystem "github.com/allanpk716/ChineseSubFinder/pkg/logic/mark_system"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/pre_download_process"
+	subSupplier "github.com/allanpk716/ChineseSubFinder/pkg/logic/sub_supplier"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/sub_supplier/csf"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/sub_timeline_fixer"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/global_value"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
 
 	"github.com/allanpk716/ChineseSubFinder/internal/ifaces"
-	"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/settings"
-	subCommon "github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/task_queue"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	taskQueue2 "github.com/allanpk716/ChineseSubFinder/internal/types/task_queue"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
+	subCommon "github.com/allanpk716/ChineseSubFinder/pkg/sub_formatter/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/task_queue"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )

internal/pkg/downloader/downloader_things.go → pkg/downloader/downloader_things.go

@@ -3,18 +3,19 @@ package downloader
 import (
 	"errors"
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/change_file_encode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/chs_cht_changer"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	subcommon "github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_formatter/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
+	"os"
+	"path/filepath"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/series"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"
-	"os"
-	"path/filepath"
+	"github.com/allanpk716/ChineseSubFinder/pkg/change_file_encode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/chs_cht_changer"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	subcommon "github.com/allanpk716/ChineseSubFinder/pkg/sub_formatter/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
 )
 
 // oneVideoSelectBestSub 一个视频，选择最佳的一个字幕（也可以保存所有网站第一个最佳字幕）

internal/pkg/emby_api/emby_api.go → pkg/emby_api/emby_api.go

@@ -2,15 +2,16 @@ package emby_api
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
+	"net/http"
+	"sync"
+	"time"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/types/emby"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/go-resty/resty/v2"
 	"github.com/panjf2000/ants/v2"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
-	"net/http"
-	"sync"
-	"time"
 )
 
 type EmbyApi struct {

internal/pkg/emby_api/emby_api_test.go → pkg/emby_api/emby_api_test.go

@@ -1,8 +1,9 @@
 package emby_api
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 )
 
 var ec = settings.EmbySettings{

internal/pkg/ffmpeg_helper/audio_info.go → pkg/ffmpeg_helper/audio_info.go

@@ -2,8 +2,9 @@ package ffmpeg_helper
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+
 	language2 "github.com/allanpk716/ChineseSubFinder/internal/types/language"
+	"github.com/allanpk716/ChineseSubFinder/pkg/language"
 )
 
 type AudioInfo struct {

internal/pkg/ffmpeg_helper/ffmpeg_helper.go → pkg/ffmpeg_helper/ffmpeg_helper.go

@@ -4,19 +4,20 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"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"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
-	"github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 	"os"
 	"os/exec"
 	"path/filepath"
 
+	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/language"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/sub_parser/ass"
+	"github.com/allanpk716/ChineseSubFinder/pkg/logic/sub_parser/srt"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_parser_hub"
+	"github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+
 	"strings"
 )
 

internal/pkg/ffmpeg_helper/ffmpeg_helper_test.go → pkg/ffmpeg_helper/ffmpeg_helper_test.go

@@ -1,10 +1,11 @@
 package ffmpeg_helper
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestGetFFMPEGInfo(t *testing.T) {

internal/pkg/ffmpeg_helper/ffmpeg_info.go → pkg/ffmpeg_helper/ffmpeg_info.go

@@ -1,16 +1,17 @@
 package ffmpeg_helper
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/sub_parser_hub"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
-	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"
-	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/types/subparser"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_parser_hub"
+	"github.com/sirupsen/logrus"
 )
 
 type FFMPEGInfo struct {

internal/pkg/ffmpeg_helper/subtitile_info.go → pkg/ffmpeg_helper/subtitile_info.go

@@ -2,8 +2,9 @@ package ffmpeg_helper
 
 import (
 	"fmt"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/language"
+
 	language2 "github.com/allanpk716/ChineseSubFinder/internal/types/language"
+	"github.com/allanpk716/ChineseSubFinder/pkg/language"
 )
 
 type SubtitleInfo struct {

internal/pkg/get_access_time/get_access_time_test.go → pkg/get_access_time/get_access_time_test.go

@@ -1,9 +1,10 @@
 package get_access_time
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestGetAccessTime_GetAccessTime(t *testing.T) {

internal/pkg/global_value/global_value.go → pkg/global_value/global_value.go

@@ -1,7 +1,7 @@
 package global_value
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
 )
 
 // SetAppVersion ---------------------------------------------

internal/pkg/hot_fix/hot_fix_001.go → pkg/hot_fix/hot_fix_001.go

@@ -2,13 +2,14 @@ package hot_fix
 
 import (
 	"errors"
-	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"
-	"github.com/sirupsen/logrus"
 	"os"
+
+	movieHelper "github.com/allanpk716/ChineseSubFinder/pkg/logic/movie_helper"
+	seriesHelper "github.com/allanpk716/ChineseSubFinder/pkg/logic/series_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_formatter/old"
+	"github.com/allanpk716/ChineseSubFinder/pkg/sub_helper"
+	"github.com/sirupsen/logrus"
 )
 
 /*

internal/pkg/hot_fix/hot_fix_001_test.go → pkg/hot_fix/hot_fix_001_test.go

@@ -1,11 +1,12 @@
 package hot_fix
 
 import (
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"path/filepath"
 	"testing"
+
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestHotFix001_GetKey(t *testing.T) {

internal/pkg/hot_fix/hot_fix_005.go → pkg/hot_fix/hot_fix_005.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_folder"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_folder"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
 	"github.com/sirupsen/logrus"
 )
 

internal/pkg/hot_fix/hot_fix_hub_test.go → pkg/hot_fix/hot_fix_hub_test.go

@@ -1,13 +1,14 @@
 package hot_fix
 
 import (
+	"path/filepath"
+	"testing"
+
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/unit_test_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types"
-	"path/filepath"
-	"testing"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/pkg/unit_test_helper"
 )
 
 func TestHotFixProcess(t *testing.T) {

internal/pkg/imdb_helper/imdb.go → pkg/imdb_helper/imdb.go

@@ -8,12 +8,12 @@ import (
 	"github.com/StalkR/imdb"
 	"github.com/allanpk716/ChineseSubFinder/internal/dao"
 	"github.com/allanpk716/ChineseSubFinder/internal/models"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/decode"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
 	"github.com/allanpk716/ChineseSubFinder/internal/types"
 	"github.com/allanpk716/ChineseSubFinder/internal/types/common"
+	"github.com/allanpk716/ChineseSubFinder/pkg/decode"
+	"github.com/allanpk716/ChineseSubFinder/pkg/my_util"
+	"github.com/allanpk716/ChineseSubFinder/pkg/notify_center"
+	"github.com/allanpk716/ChineseSubFinder/pkg/settings"
 	"github.com/sirupsen/logrus"
 )
 

internal/pkg/imdb_helper/imdb_test.go → pkg/imdb_helper/imdb_test.go

@@ -3,8 +3,8 @@ package imdb_helper
 import (
 	"testing"
 
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/types"
+	"github.com/allanpk716/ChineseSubFinder/pkg/log_helper"
 )
 
 func TestGetVideoInfoFromIMDB(t *testing.T) {