From cf7b9272a97c01dfb16d175eb226a94d036305da Mon Sep 17 00:00:00 2001 From: marcopiovanello Date: Mon, 29 Jun 2026 18:44:56 +0200 Subject: [PATCH] updated package name --- go.mod | 2 +- main.go | 9 ++---- server/archive/archive.go | 2 +- server/archive/container.go | 2 +- server/archive/domain/archive.go | 2 +- server/archive/provider.go | 8 ++--- server/archive/repository/repository.go | 4 +-- server/archive/rest/handler.go | 8 ++--- server/archive/service/service.go | 4 +-- server/archive/utils.go | 2 +- server/archiver/archiver.go | 4 +-- server/dbutil/migrate.go | 2 +- server/filebrowser/handlers.go | 6 ++-- server/formats/parser.go | 2 +- server/internal/common_types.go | 2 +- server/internal/downloaders/common.go | 2 +- server/internal/downloaders/downloader.go | 4 +-- server/internal/downloaders/generic.go | 6 ++-- server/internal/downloaders/livestream.go | 8 ++--- server/internal/downloaders/logging.go | 2 +- server/internal/downloaders/utils.go | 2 +- server/internal/kv/store.go | 6 ++-- server/internal/kv/types.go | 2 +- server/internal/livestream/livestream.go | 10 +++--- server/internal/livestream/livestream_test.go | 6 ++-- server/internal/livestream/monitor.go | 4 +-- server/internal/metadata/fetchers.go | 4 +-- server/internal/queue/message_queue.go | 6 ++-- server/logging/handler.go | 6 ++-- server/middleware/utils.go | 4 +-- server/openid/config.go | 2 +- server/openid/handler.go | 2 +- server/playlist/modifiers.go | 2 +- server/playlist/playlist.go | 12 +++---- server/playlist/types.go | 2 +- server/rest/common.go | 6 ++-- server/rest/container.go | 6 ++-- server/rest/handlers.go | 2 +- server/rest/service.go | 14 ++++---- server/rpc/container.go | 12 +++---- server/rpc/service.go | 18 +++++------ server/server.go | 32 +++++++++---------- server/status/repository/repository.go | 6 ++-- server/status/rest/handler.go | 2 +- server/status/service/service.go | 4 +-- server/status/status.go | 8 ++--- server/subscription/container.go | 4 +-- server/subscription/domain/subscription.go | 2 +- server/subscription/provider.go | 10 +++--- server/subscription/repository/repository.go | 4 +-- server/subscription/rest/handler.go | 8 ++--- server/subscription/service/service.go | 6 ++-- server/subscription/task/runner.go | 12 +++---- server/sys/fs.go | 4 +-- server/twitch/monitor.go | 10 +++--- server/updater/update.go | 2 +- server/user/handlers.go | 2 +- 57 files changed, 161 insertions(+), 164 deletions(-) diff --git a/go.mod b/go.mod index f8dc6dc..f6cf6ac 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/marcopiovanello/yt-dlp-web-ui/v3 +module github.com/marcopiovanello/yt-dlp-web-ui/v4 go 1.26 diff --git a/main.go b/main.go index f0f8eb8..a74d049 100644 --- a/main.go +++ b/main.go @@ -12,9 +12,9 @@ import ( "strings" "syscall" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" "github.com/spf13/viper" ) @@ -52,7 +52,6 @@ func main() { v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) v.AutomaticEnv() - // Load YAML file if exists if err := v.ReadInConfig(); err != nil { slog.Debug("using defaults") } @@ -66,7 +65,6 @@ func main() { cfg.Server.QueueSize = 2 } - // Frontend FS var appFS fs.FS if fp := v.GetString("frontend_path"); fp != "" { appFS = os.DirFS(fp) @@ -79,7 +77,6 @@ func main() { appFS = sub } - // Configure OpenID if needed openid.Configure() // Graceful shutdown diff --git a/server/archive/archive.go b/server/archive/archive.go index 94496d2..997b28d 100644 --- a/server/archive/archive.go +++ b/server/archive/archive.go @@ -4,7 +4,7 @@ import ( "database/sql" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" ) // alias type diff --git a/server/archive/container.go b/server/archive/container.go index a745fd0..03034d1 100644 --- a/server/archive/container.go +++ b/server/archive/container.go @@ -3,7 +3,7 @@ package archive import ( "database/sql" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" ) func Container(db *sql.DB) (domain.RestHandler, domain.Service) { diff --git a/server/archive/domain/archive.go b/server/archive/domain/archive.go index 92052fd..9ac0c85 100644 --- a/server/archive/domain/archive.go +++ b/server/archive/domain/archive.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/data" ) type ArchiveEntry struct { diff --git a/server/archive/provider.go b/server/archive/provider.go index 6b37af8..17bf1cf 100644 --- a/server/archive/provider.go +++ b/server/archive/provider.go @@ -4,10 +4,10 @@ import ( "database/sql" "sync" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/repository" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/rest" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/service" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/repository" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/rest" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/service" ) var ( diff --git a/server/archive/repository/repository.go b/server/archive/repository/repository.go index 926636a..0f1c107 100644 --- a/server/archive/repository/repository.go +++ b/server/archive/repository/repository.go @@ -6,8 +6,8 @@ import ( "os" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/data" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" ) type Repository struct { diff --git a/server/archive/rest/handler.go b/server/archive/rest/handler.go index 40a4666..0da84b6 100644 --- a/server/archive/rest/handler.go +++ b/server/archive/rest/handler.go @@ -6,11 +6,11 @@ import ( "strconv" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" ) type Handler struct { diff --git a/server/archive/service/service.go b/server/archive/service/service.go index f60094d..9438f81 100644 --- a/server/archive/service/service.go +++ b/server/archive/service/service.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/data" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive/domain" ) type Service struct { diff --git a/server/archive/utils.go b/server/archive/utils.go index 09f29e3..e6e52ab 100644 --- a/server/archive/utils.go +++ b/server/archive/utils.go @@ -8,7 +8,7 @@ import ( "os/exec" "path/filepath" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) // Perform a search on the archive.txt file an determines if a download diff --git a/server/archiver/archiver.go b/server/archiver/archiver.go index 7ae88f4..51603b3 100644 --- a/server/archiver/archiver.go +++ b/server/archiver/archiver.go @@ -5,8 +5,8 @@ import ( "database/sql" "log/slog" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) var ( diff --git a/server/dbutil/migrate.go b/server/dbutil/migrate.go index 2ba6f34..5c8eb70 100644 --- a/server/dbutil/migrate.go +++ b/server/dbutil/migrate.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) var lockFilePath = filepath.Join(config.Instance().Dir(), ".db.lock") diff --git a/server/filebrowser/handlers.go b/server/filebrowser/handlers.go index 5d81335..64b03bd 100644 --- a/server/filebrowser/handlers.go +++ b/server/filebrowser/handlers.go @@ -17,9 +17,9 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" ) /* diff --git a/server/formats/parser.go b/server/formats/parser.go index e8ecba1..0438879 100644 --- a/server/formats/parser.go +++ b/server/formats/parser.go @@ -6,7 +6,7 @@ import ( "os/exec" "sync" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) func ParseURL(url string) (*Metadata, error) { diff --git a/server/internal/common_types.go b/server/internal/common_types.go index 69fe473..6bf41f9 100644 --- a/server/internal/common_types.go +++ b/server/internal/common_types.go @@ -1,7 +1,7 @@ package internal import ( - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" ) // Used to unmarshall yt-dlp progress diff --git a/server/internal/downloaders/common.go b/server/internal/downloaders/common.go index 9b4eb34..bc8b040 100644 --- a/server/internal/downloaders/common.go +++ b/server/internal/downloaders/common.go @@ -4,7 +4,7 @@ import ( "log/slog" "sync" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" ) type DownloaderBase struct { diff --git a/server/internal/downloaders/downloader.go b/server/internal/downloaders/downloader.go index 1083872..589ef81 100644 --- a/server/internal/downloaders/downloader.go +++ b/server/internal/downloaders/downloader.go @@ -1,8 +1,8 @@ package downloaders import ( - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" ) type Downloader interface { diff --git a/server/internal/downloaders/generic.go b/server/internal/downloaders/generic.go index 14f97f2..65824ff 100644 --- a/server/internal/downloaders/generic.go +++ b/server/internal/downloaders/generic.go @@ -12,9 +12,9 @@ import ( "syscall" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" ) const downloadTemplate = `download: diff --git a/server/internal/downloaders/livestream.go b/server/internal/downloaders/livestream.go index 8bc0a2e..412dfec 100644 --- a/server/internal/downloaders/livestream.go +++ b/server/internal/downloaders/livestream.go @@ -14,10 +14,10 @@ import ( "time" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/pipes" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/pipes" ) type LiveStreamDownloader struct { diff --git a/server/internal/downloaders/logging.go b/server/internal/downloaders/logging.go index b05fdab..3b3c951 100644 --- a/server/internal/downloaders/logging.go +++ b/server/internal/downloaders/logging.go @@ -5,7 +5,7 @@ import ( "log/slog" "strings" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" ) type LogConsumer interface { diff --git a/server/internal/downloaders/utils.go b/server/internal/downloaders/utils.go index 2cc4634..9c38a95 100644 --- a/server/internal/downloaders/utils.go +++ b/server/internal/downloaders/utils.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" ) func argsSanitizer(params []string) []string { diff --git a/server/internal/kv/store.go b/server/internal/kv/store.go index 457e89b..a976460 100644 --- a/server/internal/kv/store.go +++ b/server/internal/kv/store.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" bolt "go.etcd.io/bbolt" ) diff --git a/server/internal/kv/types.go b/server/internal/kv/types.go index 74452d0..3d8ba93 100644 --- a/server/internal/kv/types.go +++ b/server/internal/kv/types.go @@ -1,6 +1,6 @@ package kv -import "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" +import "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" // struct representing the current status of the memoryDB // used for serializaton/persistence reasons diff --git a/server/internal/livestream/livestream.go b/server/internal/livestream/livestream.go index 48299eb..694ed63 100644 --- a/server/internal/livestream/livestream.go +++ b/server/internal/livestream/livestream.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/pipes" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/pipes" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" ) const ( diff --git a/server/internal/livestream/livestream_test.go b/server/internal/livestream/livestream_test.go index f39c2e7..81878ec 100644 --- a/server/internal/livestream/livestream_test.go +++ b/server/internal/livestream/livestream_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" ) func setupTest() { diff --git a/server/internal/livestream/monitor.go b/server/internal/livestream/monitor.go index 253730e..bbe49c7 100644 --- a/server/internal/livestream/monitor.go +++ b/server/internal/livestream/monitor.go @@ -1,8 +1,8 @@ package livestream import ( - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" bolt "go.etcd.io/bbolt" ) diff --git a/server/internal/metadata/fetchers.go b/server/internal/metadata/fetchers.go index f03f70a..90b4fd3 100644 --- a/server/internal/metadata/fetchers.go +++ b/server/internal/metadata/fetchers.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) func DefaultFetcher(url string) (*common.DownloadMetadata, error) { diff --git a/server/internal/queue/message_queue.go b/server/internal/queue/message_queue.go index be3ea2b..5e0fda4 100644 --- a/server/internal/queue/message_queue.go +++ b/server/internal/queue/message_queue.go @@ -5,9 +5,9 @@ import ( "errors" "log/slog" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/metadata" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/metadata" ) type MessageQueue struct { diff --git a/server/logging/handler.go b/server/logging/handler.go index d843c2f..5f6c11b 100644 --- a/server/logging/handler.go +++ b/server/logging/handler.go @@ -9,9 +9,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/gorilla/websocket" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" ) var upgrader = websocket.Upgrader{ diff --git a/server/middleware/utils.go b/server/middleware/utils.go index d9e1d96..6b83f52 100644 --- a/server/middleware/utils.go +++ b/server/middleware/utils.go @@ -3,8 +3,8 @@ package middlewares import ( "net/http" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" ) func ApplyAuthenticationByConfig(next http.Handler) http.Handler { diff --git a/server/openid/config.go b/server/openid/config.go index 70f3ed3..c0d47ed 100644 --- a/server/openid/config.go +++ b/server/openid/config.go @@ -4,7 +4,7 @@ import ( "context" "github.com/coreos/go-oidc/v3/oidc" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" "golang.org/x/oauth2" ) diff --git a/server/openid/handler.go b/server/openid/handler.go index d8a4191..8daccd8 100644 --- a/server/openid/handler.go +++ b/server/openid/handler.go @@ -11,7 +11,7 @@ import ( "github.com/coreos/go-oidc/v3/oidc" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" "golang.org/x/oauth2" ) diff --git a/server/playlist/modifiers.go b/server/playlist/modifiers.go index d7f3201..5da5653 100644 --- a/server/playlist/modifiers.go +++ b/server/playlist/modifiers.go @@ -4,7 +4,7 @@ import ( "slices" "strconv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" ) /* diff --git a/server/playlist/playlist.go b/server/playlist/playlist.go index 9c80ffe..57b07b9 100644 --- a/server/playlist/playlist.go +++ b/server/playlist/playlist.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" ) func PlaylistDetect(req internal.DownloadRequest, mq *queue.MessageQueue, db *kv.Store) error { diff --git a/server/playlist/types.go b/server/playlist/types.go index 523736c..4c477af 100644 --- a/server/playlist/types.go +++ b/server/playlist/types.go @@ -1,6 +1,6 @@ package playlist -import "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/common" +import "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/common" type Metadata struct { Entries []common.DownloadMetadata `json:"entries"` diff --git a/server/rest/common.go b/server/rest/common.go index 57c09c9..0c87cd9 100644 --- a/server/rest/common.go +++ b/server/rest/common.go @@ -1,9 +1,9 @@ package rest import ( - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/livestream" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" bolt "go.etcd.io/bbolt" ) diff --git a/server/rest/container.go b/server/rest/container.go index b319e4d..5d99911 100644 --- a/server/rest/container.go +++ b/server/rest/container.go @@ -2,9 +2,9 @@ package rest import ( "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" ) func Container(args *ContainerArgs) *Handler { diff --git a/server/rest/handlers.go b/server/rest/handlers.go index b7cc5ae..55f8944 100644 --- a/server/rest/handlers.go +++ b/server/rest/handlers.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" ) type Handler struct { diff --git a/server/rest/service.go b/server/rest/service.go index 1ba7baa..f5d145a 100644 --- a/server/rest/service.go +++ b/server/rest/service.go @@ -11,13 +11,13 @@ import ( "time" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/playlist" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/livestream" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/playlist" bolt "go.etcd.io/bbolt" ) diff --git a/server/rpc/container.go b/server/rpc/container.go index 9ec6281..ba0314e 100644 --- a/server/rpc/container.go +++ b/server/rpc/container.go @@ -2,12 +2,12 @@ package rpc import ( "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/livestream" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" ) // Dependency injection container. diff --git a/server/rpc/service.go b/server/rpc/service.go index c8ccb6c..86124e7 100644 --- a/server/rpc/service.go +++ b/server/rpc/service.go @@ -4,15 +4,15 @@ import ( "errors" "log/slog" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/formats" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/playlist" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/sys" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/updater" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/formats" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/livestream" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/playlist" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/sys" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/updater" ) type Service struct { diff --git a/server/server.go b/server/server.go index 0a650f3..1c847bb 100644 --- a/server/server.go +++ b/server/server.go @@ -17,22 +17,22 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/cors" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/filebrowser" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/pipeline" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/logging" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rest" - ytdlpRPC "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rpc" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/task" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/twitch" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/user" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/filebrowser" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/livestream" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/pipeline" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/logging" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/rest" + ytdlpRPC "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/rpc" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/task" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/twitch" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/user" bolt "go.etcd.io/bbolt" ) diff --git a/server/status/repository/repository.go b/server/status/repository/repository.go index dc8f119..78c68b2 100644 --- a/server/status/repository/repository.go +++ b/server/status/repository/repository.go @@ -4,9 +4,9 @@ import ( "context" "slices" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/domain" ) type Repository struct { diff --git a/server/status/rest/handler.go b/server/status/rest/handler.go index 9d3bc6f..d9c4eeb 100644 --- a/server/status/rest/handler.go +++ b/server/status/rest/handler.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/domain" ) type RestHandler struct { diff --git a/server/status/service/service.go b/server/status/service/service.go index fb0b253..2a785f1 100644 --- a/server/status/service/service.go +++ b/server/status/service/service.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rest" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/rest" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/domain" ) type Service struct { diff --git a/server/status/status.go b/server/status/status.go index 2e213c6..a31c3e3 100644 --- a/server/status/status.go +++ b/server/status/status.go @@ -2,10 +2,10 @@ package status import ( "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/repository" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/rest" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status/service" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/repository" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/rest" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/status/service" ) func ApplyRouter(mdb *kv.Store) func(chi.Router) { diff --git a/server/subscription/container.go b/server/subscription/container.go index 065bc7c..fe4921d 100644 --- a/server/subscription/container.go +++ b/server/subscription/container.go @@ -1,8 +1,8 @@ package subscription import ( - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/task" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/task" bolt "go.etcd.io/bbolt" ) diff --git a/server/subscription/domain/subscription.go b/server/subscription/domain/subscription.go index 3af1f1e..dc2e7d0 100644 --- a/server/subscription/domain/subscription.go +++ b/server/subscription/domain/subscription.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/data" ) type Subscription struct { diff --git a/server/subscription/provider.go b/server/subscription/provider.go index e3f0797..388b73f 100644 --- a/server/subscription/provider.go +++ b/server/subscription/provider.go @@ -3,11 +3,11 @@ package subscription import ( "sync" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/repository" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/rest" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/service" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/task" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/repository" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/rest" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/service" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/task" bolt "go.etcd.io/bbolt" ) diff --git a/server/subscription/repository/repository.go b/server/subscription/repository/repository.go index 2709097..942a195 100644 --- a/server/subscription/repository/repository.go +++ b/server/subscription/repository/repository.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/google/uuid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/data" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" bolt "go.etcd.io/bbolt" ) diff --git a/server/subscription/rest/handler.go b/server/subscription/rest/handler.go index ffc492d..61efafa 100644 --- a/server/subscription/rest/handler.go +++ b/server/subscription/rest/handler.go @@ -6,10 +6,10 @@ import ( "strconv" "github.com/go-chi/chi/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/middleware" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/openid" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + middlewares "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/middleware" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/openid" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" ) type RestHandler struct { diff --git a/server/subscription/service/service.go b/server/subscription/service/service.go index eb8bc77..a0c31c7 100644 --- a/server/subscription/service/service.go +++ b/server/subscription/service/service.go @@ -5,9 +5,9 @@ import ( "errors" "math" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/data" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/task" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/data" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/task" "github.com/robfig/cron/v3" ) diff --git a/server/subscription/task/runner.go b/server/subscription/task/runner.go index 3d6647a..08e4802 100644 --- a/server/subscription/task/runner.go +++ b/server/subscription/task/runner.go @@ -9,12 +9,12 @@ import ( "regexp" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/subscription/domain" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/archive" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/subscription/domain" "github.com/robfig/cron/v3" ) diff --git a/server/sys/fs.go b/server/sys/fs.go index 11e0873..15edc8f 100644 --- a/server/sys/fs.go +++ b/server/sys/fs.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal" "golang.org/x/sys/unix" ) diff --git a/server/twitch/monitor.go b/server/twitch/monitor.go index 9875361..ef166a9 100644 --- a/server/twitch/monitor.go +++ b/server/twitch/monitor.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/downloaders" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/kv" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/pipes" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/queue" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/downloaders" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/kv" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/pipes" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/internal/queue" bolt "go.etcd.io/bbolt" ) diff --git a/server/updater/update.go b/server/updater/update.go index e91e6c8..b456f43 100644 --- a/server/updater/update.go +++ b/server/updater/update.go @@ -3,7 +3,7 @@ package updater import ( "os/exec" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" ) // Update using the builtin function of yt-dlp diff --git a/server/user/handlers.go b/server/user/handlers.go index 11d26e6..8e96a12 100644 --- a/server/user/handlers.go +++ b/server/user/handlers.go @@ -7,7 +7,7 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" + "github.com/marcopiovanello/yt-dlp-web-ui/v4/server/config" "golang.org/x/crypto/bcrypt" )