From 76f50930defbf8158ccfd4bd1454fd9c1d90b35a Mon Sep 17 00:00:00 2001 From: Chuan Ding Date: Wed, 4 Jun 2025 17:21:48 +0800 Subject: [PATCH] refactor --- cmd/binding/main.go | 4 ++-- cmd/polaris/polaris.go | 4 ++-- {engine => internal/biz/engine}/client.go | 2 +- {engine => internal/biz/engine}/fliters.go | 0 {engine => internal/biz/engine}/importlist.go | 2 +- {engine => internal/biz/engine}/indexer.go | 0 {engine => internal/biz/engine}/integration.go | 2 +- {engine => internal/biz/engine}/nfo.go | 0 {engine => internal/biz/engine}/resources.go | 0 {engine => internal/biz/engine}/scheduler.go | 2 +- {engine => internal/biz/engine}/stun.go | 0 {engine => internal/biz/engine}/torrent.go | 2 +- {server => internal/biz/server}/activity.go | 2 +- {server => internal/biz/server}/auth.go | 2 +- {server => internal/biz/server}/common.go | 0 {server => internal/biz/server}/importlist.go | 0 {server => internal/biz/server}/notify_client.go | 0 {server => internal/biz/server}/resources.go | 4 ++-- {server => internal/biz/server}/server.go | 4 ++-- {server => internal/biz/server}/setting.go | 2 +- {server => internal/biz/server}/storage.go | 2 +- {server => internal/biz/server}/systems.go | 2 +- {server => internal/biz/server}/watchlist.go | 4 ++-- {db => internal/db}/const.go | 0 {db => internal/db}/db.go | 0 {db => internal/db}/interface.go | 0 {db => internal/db}/migrate.go | 0 {db => internal/db}/notification.go | 0 pkg/prowlarr/prowlarr.go | 2 +- 29 files changed, 21 insertions(+), 21 deletions(-) rename {engine => internal/biz/engine}/client.go (99%) rename {engine => internal/biz/engine}/fliters.go (100%) rename {engine => internal/biz/engine}/importlist.go (99%) rename {engine => internal/biz/engine}/indexer.go (100%) rename {engine => internal/biz/engine}/integration.go (99%) rename {engine => internal/biz/engine}/nfo.go (100%) rename {engine => internal/biz/engine}/resources.go (100%) rename {engine => internal/biz/engine}/scheduler.go (99%) rename {engine => internal/biz/engine}/stun.go (100%) rename {engine => internal/biz/engine}/torrent.go (99%) rename {server => internal/biz/server}/activity.go (99%) rename {server => internal/biz/server}/auth.go (99%) rename {server => internal/biz/server}/common.go (100%) rename {server => internal/biz/server}/importlist.go (100%) rename {server => internal/biz/server}/notify_client.go (100%) rename {server => internal/biz/server}/resources.go (99%) rename {server => internal/biz/server}/server.go (99%) rename {server => internal/biz/server}/setting.go (99%) rename {server => internal/biz/server}/storage.go (99%) rename {server => internal/biz/server}/systems.go (98%) rename {server => internal/biz/server}/watchlist.go (99%) rename {db => internal/db}/const.go (100%) rename {db => internal/db}/db.go (100%) rename {db => internal/db}/interface.go (100%) rename {db => internal/db}/migrate.go (100%) rename {db => internal/db}/notification.go (100%) diff --git a/cmd/binding/main.go b/cmd/binding/main.go index b01bf79..1706b59 100644 --- a/cmd/binding/main.go +++ b/cmd/binding/main.go @@ -2,9 +2,9 @@ package main import "C" import ( - "polaris/db" + "polaris/internal/db" "polaris/log" - "polaris/server" + "polaris/internal/biz/server" ) func main() {} diff --git a/cmd/polaris/polaris.go b/cmd/polaris/polaris.go index 8b5b443..7c3c0bb 100644 --- a/cmd/polaris/polaris.go +++ b/cmd/polaris/polaris.go @@ -2,9 +2,9 @@ package main import ( "os" - "polaris/db" + "polaris/internal/db" "polaris/log" - "polaris/server" + "polaris/internal/biz/server" ) func main() { diff --git a/engine/client.go b/internal/biz/engine/client.go similarity index 99% rename from engine/client.go rename to internal/biz/engine/client.go index 045c625..db83411 100644 --- a/engine/client.go +++ b/internal/biz/engine/client.go @@ -1,7 +1,7 @@ package engine import ( - "polaris/db" + "polaris/internal/db" "polaris/ent" "polaris/ent/downloadclients" "polaris/log" diff --git a/engine/fliters.go b/internal/biz/engine/fliters.go similarity index 100% rename from engine/fliters.go rename to internal/biz/engine/fliters.go diff --git a/engine/importlist.go b/internal/biz/engine/importlist.go similarity index 99% rename from engine/importlist.go rename to internal/biz/engine/importlist.go index 09618b6..c521004 100644 --- a/engine/importlist.go +++ b/internal/biz/engine/importlist.go @@ -8,7 +8,7 @@ import ( "net/http" "os" "path/filepath" - "polaris/db" + "polaris/internal/db" "polaris/ent" "polaris/ent/episode" "polaris/ent/importlist" diff --git a/engine/indexer.go b/internal/biz/engine/indexer.go similarity index 100% rename from engine/indexer.go rename to internal/biz/engine/indexer.go diff --git a/engine/integration.go b/internal/biz/engine/integration.go similarity index 99% rename from engine/integration.go rename to internal/biz/engine/integration.go index b655579..c1458ee 100644 --- a/engine/integration.go +++ b/internal/biz/engine/integration.go @@ -6,7 +6,7 @@ import ( "fmt" "io/fs" "path/filepath" - "polaris/db" + "polaris/internal/db" "polaris/ent/media" storage1 "polaris/ent/storage" "polaris/log" diff --git a/engine/nfo.go b/internal/biz/engine/nfo.go similarity index 100% rename from engine/nfo.go rename to internal/biz/engine/nfo.go diff --git a/engine/resources.go b/internal/biz/engine/resources.go similarity index 100% rename from engine/resources.go rename to internal/biz/engine/resources.go diff --git a/engine/scheduler.go b/internal/biz/engine/scheduler.go similarity index 99% rename from engine/scheduler.go rename to internal/biz/engine/scheduler.go index 059ed18..6463b33 100644 --- a/engine/scheduler.go +++ b/internal/biz/engine/scheduler.go @@ -4,7 +4,7 @@ import ( "fmt" "os" "path/filepath" - "polaris/db" + "polaris/internal/db" "polaris/ent" "polaris/ent/episode" "polaris/ent/history" diff --git a/engine/stun.go b/internal/biz/engine/stun.go similarity index 100% rename from engine/stun.go rename to internal/biz/engine/stun.go diff --git a/engine/torrent.go b/internal/biz/engine/torrent.go similarity index 99% rename from engine/torrent.go rename to internal/biz/engine/torrent.go index a30c132..4984c7e 100644 --- a/engine/torrent.go +++ b/internal/biz/engine/torrent.go @@ -2,7 +2,7 @@ package engine import ( "fmt" - "polaris/db" + "polaris/internal/db" "polaris/ent" "polaris/ent/media" "polaris/log" diff --git a/server/activity.go b/internal/biz/server/activity.go similarity index 99% rename from server/activity.go rename to internal/biz/server/activity.go index 0d63f56..6bd5f25 100644 --- a/server/activity.go +++ b/internal/biz/server/activity.go @@ -2,7 +2,7 @@ package server import ( "fmt" - "polaris/engine" + "polaris/internal/biz/engine" "polaris/ent" "polaris/ent/episode" "polaris/ent/history" diff --git a/server/auth.go b/internal/biz/server/auth.go similarity index 99% rename from server/auth.go rename to internal/biz/server/auth.go index 3ff0153..daebac8 100644 --- a/server/auth.go +++ b/internal/biz/server/auth.go @@ -2,7 +2,7 @@ package server import ( "net/http" - "polaris/db" + "polaris/internal/db" "polaris/log" "polaris/pkg/utils" "time" diff --git a/server/common.go b/internal/biz/server/common.go similarity index 100% rename from server/common.go rename to internal/biz/server/common.go diff --git a/server/importlist.go b/internal/biz/server/importlist.go similarity index 100% rename from server/importlist.go rename to internal/biz/server/importlist.go diff --git a/server/notify_client.go b/internal/biz/server/notify_client.go similarity index 100% rename from server/notify_client.go rename to internal/biz/server/notify_client.go diff --git a/server/resources.go b/internal/biz/server/resources.go similarity index 99% rename from server/resources.go rename to internal/biz/server/resources.go index b11b420..07b426a 100644 --- a/server/resources.go +++ b/internal/biz/server/resources.go @@ -2,8 +2,8 @@ package server import ( "fmt" - "polaris/db" - "polaris/engine" + "polaris/internal/db" + "polaris/internal/biz/engine" "polaris/ent/media" "polaris/log" "polaris/pkg/torznab" diff --git a/server/server.go b/internal/biz/server/server.go similarity index 99% rename from server/server.go rename to internal/biz/server/server.go index 37d2a6e..3ab17d2 100644 --- a/server/server.go +++ b/internal/biz/server/server.go @@ -6,8 +6,8 @@ import ( "net/http" "net/http/httputil" "net/url" - "polaris/db" - "polaris/engine" + "polaris/internal/db" + "polaris/internal/biz/engine" "polaris/log" "polaris/pkg/cache" "polaris/pkg/tmdb" diff --git a/server/setting.go b/internal/biz/server/setting.go similarity index 99% rename from server/setting.go rename to internal/biz/server/setting.go index a2b5bbc..e869fed 100644 --- a/server/setting.go +++ b/internal/biz/server/setting.go @@ -3,7 +3,7 @@ package server import ( "fmt" "html/template" - "polaris/db" + "polaris/internal/db" "polaris/ent" "polaris/ent/downloadclients" "polaris/log" diff --git a/server/storage.go b/internal/biz/server/storage.go similarity index 99% rename from server/storage.go rename to internal/biz/server/storage.go index 6a0e96b..fd3b194 100644 --- a/server/storage.go +++ b/internal/biz/server/storage.go @@ -3,7 +3,7 @@ package server import ( "fmt" "os" - "polaris/db" + "polaris/internal/db" "strings" "polaris/log" diff --git a/server/systems.go b/internal/biz/server/systems.go similarity index 98% rename from server/systems.go rename to internal/biz/server/systems.go index 46687b5..306c394 100644 --- a/server/systems.go +++ b/internal/biz/server/systems.go @@ -2,7 +2,7 @@ package server import ( "os" - "polaris/db" + "polaris/internal/db" "polaris/log" "polaris/pkg/metadata" "polaris/pkg/uptime" diff --git a/server/watchlist.go b/internal/biz/server/watchlist.go similarity index 99% rename from server/watchlist.go rename to internal/biz/server/watchlist.go index 2d8de74..a06e0af 100644 --- a/server/watchlist.go +++ b/internal/biz/server/watchlist.go @@ -3,8 +3,8 @@ package server import ( "os" "path/filepath" - "polaris/db" - "polaris/engine" + "polaris/internal/db" + "polaris/internal/biz/engine" "polaris/ent" "polaris/ent/episode" "polaris/ent/media" diff --git a/db/const.go b/internal/db/const.go similarity index 100% rename from db/const.go rename to internal/db/const.go diff --git a/db/db.go b/internal/db/db.go similarity index 100% rename from db/db.go rename to internal/db/db.go diff --git a/db/interface.go b/internal/db/interface.go similarity index 100% rename from db/interface.go rename to internal/db/interface.go diff --git a/db/migrate.go b/internal/db/migrate.go similarity index 100% rename from db/migrate.go rename to internal/db/migrate.go diff --git a/db/notification.go b/internal/db/notification.go similarity index 100% rename from db/notification.go rename to internal/db/notification.go diff --git a/pkg/prowlarr/prowlarr.go b/pkg/prowlarr/prowlarr.go index 91df179..da8d9a3 100644 --- a/pkg/prowlarr/prowlarr.go +++ b/pkg/prowlarr/prowlarr.go @@ -3,7 +3,7 @@ package prowlarr import ( "encoding/json" "fmt" - "polaris/db" + "polaris/internal/db" "polaris/ent" "strings" "time"