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

Signed-off-by: allan716 <525223688@qq.com>
ChineseSubFinder · Jul 1, 2022 · ca04431 · ca04431
1 parent 69059eb
commit ca04431
Show file tree

Hide file tree

Showing 290 changed files with 800 additions and 767 deletions.
diff --git a/.gitignore b/.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
diff --git a/TestCode/test_imdb_tmdb.go b/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"
 )
 

diff --git a/cmd/GetCAPTCHA/backend/get_code.go b/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) {

diff --git a/cmd/GetCAPTCHA/backend/git_helper.go b/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 {

diff --git a/cmd/GetCAPTCHA/main.go b/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"
 )

diff --git a/cmd/chinesesubfinder/main.go b/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"
 )
 

diff --git a/cmd/subtimelinefixer/main.go b/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"

diff --git a/internal/backend/backend.go b/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"
 )

diff --git a/internal/backend/controllers/base/backend_static_file_system.go b/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 {

diff --git a/internal/backend/controllers/base/change_pwd.go b/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) {

diff --git a/internal/backend/controllers/base/controller_base.go b/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 {

diff --git a/internal/backend/controllers/base/def_settings.go b/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) {

diff --git a/internal/backend/controllers/base/login.go b/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) {

diff --git a/internal/backend/controllers/base/logout.go b/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) {

diff --git a/internal/backend/controllers/base/path_things.go b/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) {

diff --git a/internal/backend/controllers/base/proxy.go b/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"
 )