v0.11.1

- 使用统一的models包 - 常量移动到constant包 - 写文件默认0664权限 - 修正import顺序
wetor · Jan 30, 2024 · f2f5123 · f2f5123
1 parent 856f43f
commit f2f5123
Show file tree

Hide file tree

Showing 72 changed files with 521 additions and 518 deletions.
diff --git a/cmd/animego/main.go b/cmd/animego/main.go
@@ -25,13 +25,7 @@ import (
 	"github.com/wetor/AnimeGo/internal/animego/anisource/bangumi"
 	"github.com/wetor/AnimeGo/internal/animego/anisource/mikan"
 	"github.com/wetor/AnimeGo/internal/animego/anisource/themoviedb"
-	"github.com/wetor/AnimeGo/internal/animego/clientnotifier"
-	"github.com/wetor/AnimeGo/internal/animego/database"
-	"github.com/wetor/AnimeGo/internal/animego/downloader"
 	"github.com/wetor/AnimeGo/internal/animego/feed"
-	"github.com/wetor/AnimeGo/internal/animego/filter"
-	"github.com/wetor/AnimeGo/internal/animego/parser"
-	"github.com/wetor/AnimeGo/internal/animego/renamer"
 	"github.com/wetor/AnimeGo/internal/constant"
 	"github.com/wetor/AnimeGo/internal/logger"
 	"github.com/wetor/AnimeGo/internal/models"
@@ -210,7 +204,7 @@ func Main() {
 		}
 	}
 	// 初始化rename
-	renameSrv := wire.GetRenamer(&renamer.Options{
+	renameSrv := wire.GetRenamer(&models.RenamerOptions{
 		WG:            &wg,
 		RefreshSecond: config.RefreshSecond,
 	}, renamePlugin)
@@ -219,7 +213,7 @@ func Main() {
 
 	// ===============================================================================================================
 	// 初始化database配置
-	databaseInst, err := wire.GetDatabase(&database.Options{
+	databaseInst, err := wire.GetDatabase(&models.DatabaseOptions{
 		SavePath: xpath.P(config.SavePath),
 	}, bolt)
 	if err != nil {
@@ -229,21 +223,21 @@ func Main() {
 	// ===============================================================================================================
 	// 初始化downloader
 
-	downloadCallback := &clientnotifier.Callback{}
-	downloaderSrv := wire.GetDownloader(&downloader.Options{
+	downloadCallback := &models.Callback{}
+	downloaderSrv := wire.GetDownloader(&models.DownloaderOptions{
 		RefreshSecond:          config.RefreshSecond,
 		Category:               config.Category,
 		Tag:                    config.Tag,
 		AllowDuplicateDownload: config.Download.AllowDuplicateDownload,
 		WG:                     &wg,
-	}, clientSrv, &clientnotifier.Options{
+	}, clientSrv, &models.NotifierOptions{
 		DownloadPath: xpath.P(config.DownloadPath),
 		SavePath:     xpath.P(config.SavePath),
 		Rename:       config.Advanced.Download.Rename,
 		Callback:     downloadCallback,
 	}, databaseInst, renameSrv)
 
-	downloadCallback.Renamed = func(data any) error {
+	downloadCallback.Func = func(data any) error {
 		return downloaderSrv.Delete(data.(string))
 	}
 	// 启动downloader
@@ -260,9 +254,9 @@ func Main() {
 	}
 	// 初始化filter
 
-	filterSrv := wire.GetFilter(&filter.Options{
+	filterSrv := wire.GetFilter(&models.FilterOptions{
 		DelaySecond: config.Advanced.Feed.DelaySecond,
-	}, downloaderSrv, &parser.Options{
+	}, downloaderSrv, &models.ParserOptions{
 		TMDBFailSkip:           config.Default.TMDBFailSkip,
 		TMDBFailUseTitleSeason: config.Default.TMDBFailUseTitleSeason,
 		TMDBFailUseFirstSeason: config.Default.TMDBFailUseFirstSeason,
@@ -272,7 +266,7 @@ func Main() {
 	}
 	// ===============================================================================================================
 	// 初始化定时任务
-	scheduleSrv := schedule.NewSchedule(&schedule.Options{
+	scheduleSrv := schedule.NewSchedule(&models.ScheduleOptions{
 		WG: &wg,
 	})
 	// 添加定时任务

diff --git a/cmd/plugin/main.go b/cmd/plugin/main.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/wetor/AnimeGo/cmd/common"
-	feedPlugin "github.com/wetor/AnimeGo/internal/animego/feed"
-	filterPlugin "github.com/wetor/AnimeGo/internal/animego/filter"
-	renamerPlugin "github.com/wetor/AnimeGo/internal/animego/renamer"
+	"github.com/wetor/AnimeGo/internal/animego/feed"
+	"github.com/wetor/AnimeGo/internal/animego/filter"
+	"github.com/wetor/AnimeGo/internal/animego/renamer"
 	"github.com/wetor/AnimeGo/internal/constant"
 	"github.com/wetor/AnimeGo/internal/models"
 	"github.com/wetor/AnimeGo/internal/plugin"
@@ -78,14 +78,14 @@ func pluginPython(entryFunc string, info *models.Plugin) map[string]any {
 }
 
 func pluginFilter(items []*models.FeedItem, info *models.Plugin) []*models.FeedItem {
-	f := filterPlugin.NewFilterPlugin(info)
+	f := filter.NewFilterPlugin(info)
 	res, _ := f.FilterAll(items)
 	return res
 }
 
 func pluginRename(anime *models.AnimeEntity, info *models.Plugin) []*models.RenameResult {
 	result := make([]*models.RenameResult, len(anime.Ep))
-	r := renamerPlugin.NewRenamePlugin(info)
+	r := renamer.NewRenamePlugin(info)
 	var err error
 	for i, ep := range anime.Ep {
 		result[i], err = r.Rename(anime, i, ep.Src)
@@ -134,7 +134,7 @@ func Main() {
 	plugin.Init(&plugin.Options{
 		Path:  dir,
 		Debug: pDebug,
-		Feed:  feedPlugin.NewRss(),
+		Feed:  feed.NewRss(),
 	})
 
 	pluginInfo := &models.Plugin{
@@ -193,7 +193,7 @@ func Main() {
 			log.Infof("[%d] filter结果: %v", i, string(jsonData))
 		}
 	case constant.PluginTemplateSchedule, constant.PluginTemplateFeed:
-		s := schedule.NewSchedule(&schedule.Options{
+		s := schedule.NewSchedule(&models.ScheduleOptions{
 			WG: &wg,
 		})
 		if pPlugin == constant.PluginTemplateSchedule {

diff --git a/configs/config_test.go b/configs/config_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/wetor/AnimeGo/configs"
+	"github.com/wetor/AnimeGo/internal/constant"
 	"github.com/wetor/AnimeGo/pkg/log"
 	"github.com/wetor/AnimeGo/pkg/utils"
 	"github.com/wetor/AnimeGo/test"
@@ -40,7 +41,7 @@ func TestUpdateConfig_120(t *testing.T) {
 	configs.ConfigVersion = "1.2.0"
 
 	file, _ := test.GetData(testdata, "animego_110.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_120.yaml"))
@@ -49,7 +50,7 @@ func TestUpdateConfig_120(t *testing.T) {
 func TestUpdateConfig_130(t *testing.T) {
 	configs.ConfigVersion = "1.3.0"
 	file, _ := test.GetData(testdata, "animego_120.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_130.yaml"))
@@ -58,7 +59,7 @@ func TestUpdateConfig_130(t *testing.T) {
 func TestUpdateConfig_140(t *testing.T) {
 	configs.ConfigVersion = "1.4.0"
 	file, _ := test.GetData(testdata, "animego_130.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_140.yaml"))
@@ -67,7 +68,7 @@ func TestUpdateConfig_140(t *testing.T) {
 func TestUpdateConfig_141(t *testing.T) {
 	configs.ConfigVersion = "1.4.1"
 	file, _ := test.GetData(testdata, "animego_140.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_141.yaml"))
@@ -76,7 +77,7 @@ func TestUpdateConfig_141(t *testing.T) {
 func TestUpdateConfig_150(t *testing.T) {
 	configs.ConfigVersion = "1.5.0"
 	file, _ := test.GetData(testdata, "animego_141.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_150.yaml"))
@@ -85,7 +86,7 @@ func TestUpdateConfig_150(t *testing.T) {
 func TestUpdateConfig_151(t *testing.T) {
 	configs.ConfigVersion = "1.5.1"
 	file, _ := test.GetData(testdata, "animego_150.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_151.yaml"))
@@ -94,7 +95,7 @@ func TestUpdateConfig_151(t *testing.T) {
 func TestUpdateConfig_152(t *testing.T) {
 	configs.ConfigVersion = "1.5.2"
 	file, _ := test.GetData(testdata, "animego_151.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_152.yaml"))
@@ -103,7 +104,7 @@ func TestUpdateConfig_152(t *testing.T) {
 func TestUpdateConfig_160(t *testing.T) {
 	configs.ConfigVersion = "1.6.0"
 	file, _ := test.GetData(testdata, "animego_152.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_160.yaml"))
@@ -112,7 +113,7 @@ func TestUpdateConfig_160(t *testing.T) {
 func TestUpdateConfig_161(t *testing.T) {
 	configs.ConfigVersion = "1.6.1"
 	file, _ := test.GetData(testdata, "animego_160.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_161.yaml"))
@@ -121,7 +122,7 @@ func TestUpdateConfig_161(t *testing.T) {
 func TestUpdateConfig_162(t *testing.T) {
 	configs.ConfigVersion = "1.6.2"
 	file, _ := test.GetData(testdata, "animego_161.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_162.yaml"))
@@ -130,7 +131,7 @@ func TestUpdateConfig_162(t *testing.T) {
 func TestUpdateConfig_170(t *testing.T) {
 	configs.ConfigVersion = "1.7.0"
 	file, _ := test.GetData(testdata, "animego_162.yaml")
-	_ = os.WriteFile("data/animego.yaml", file, 0666)
+	_ = os.WriteFile("data/animego.yaml", file, constant.WriteFilePerm)
 	configs.UpdateConfig("data/animego.yaml", false)
 
 	EqualFile(t, "data/animego.yaml", test.GetDataPath(testdata, "animego_170.yaml"))

diff --git a/configs/default.go b/configs/default.go
@@ -3,6 +3,7 @@ package configs
 import (
 	"os"
 
+	"github.com/wetor/AnimeGo/internal/constant"
 	encoder "github.com/wetor/AnimeGo/third_party/yaml-encoder"
 )
 
@@ -190,7 +191,7 @@ func DefaultFile(filename string) error {
 		return err
 	}
 	// 所有者可读可写，其他用户只读
-	err = os.WriteFile(filename, data, 0644)
+	err = os.WriteFile(filename, data, constant.WriteFilePerm)
 	if err != nil {
 		return err
 	}

diff --git a/configs/init.go b/configs/init.go
@@ -6,6 +6,7 @@ import (
 	"path"
 
 	"github.com/caarlos0/env/v9"
+	"github.com/wetor/AnimeGo/internal/constant"
 	"github.com/wetor/AnimeGo/pkg/utils"
 )
 
@@ -63,7 +64,7 @@ func InitEnvConfig(configFile, saveFile string) {
 		panic(err)
 	}
 
-	err = os.WriteFile(saveFile, data, 0644)
+	err = os.WriteFile(saveFile, data, constant.WriteFilePerm)
 	if err != nil {
 		panic(err)
 	}