Fix module name to match major version v3. Simplify makefile. (#213)

Co-authored-by: Marco Piovanello <35533749+marcopeocchi@users.noreply.github.com>
2024-11-10 13:59:40 +01:00
parent baa25afa27
commit 846fb294d0
24 changed files with 58 additions and 60 deletions
--- a/8
+++ b/8
@@ -7,14 +7,12 @@ fe:
 	cd frontend && pnpm install && pnpm build

 dev:
-	cd frontend && pnpm dev
+	( cd frontend && pnpm install && pnpm dev )

-all:
-	$(MAKE) fe && cd ..
+all: fe
 	CGO_ENABLED=0 go build -o yt-dlp-webui main.go

-multiarch:
-	$(MAKE) fe
+multiarch: fe
 	mkdir -p build
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/yt-dlp-webui_linux-amd64 main.go
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/yt-dlp-webui_linux-arm64 main.go
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/marcopeocchi/yt-dlp-web-ui
+module github.com/marcopeocchi/yt-dlp-web-ui/v3

 go 1.23

--- a/main.go
+++ b/main.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"runtime"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/cli"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
 )

 var (
--- a/server/dbutil/migrate.go
+++ b/server/dbutil/migrate.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 var lockFilePath = filepath.Join(config.Instance().Dir(), ".db.lock")
--- a/server/handlers/archive.go
+++ b/server/handlers/archive.go
@@ -17,8 +17,8 @@ import (
 	"time"

 	"github.com/go-chi/chi/v5"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 /*
--- a/server/handlers/login.go
+++ b/server/handlers/login.go
@@ -7,7 +7,7 @@ import (
 	"time"

 	"github.com/golang-jwt/jwt/v5"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 const TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"
--- a/server/internal/livestream/livestream.go
+++ b/server/internal/livestream/livestream.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 const (
--- a/server/internal/livestream/livestream_test.go
+++ b/server/internal/livestream/livestream_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 func setupTest() {
--- a/server/internal/livestream/monitor.go
+++ b/server/internal/livestream/monitor.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 type Monitor struct {
--- a/server/internal/memory_db.go
+++ b/server/internal/memory_db.go
@@ -8,7 +8,7 @@ import (
 	"sync"

 	"github.com/google/uuid"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 // In-Memory Thread-Safe Key-Value Storage with optional persistence
--- a/server/internal/message_queue.go
+++ b/server/internal/message_queue.go
@@ -6,7 +6,7 @@ import (
 	"log/slog"

 	evbus "github.com/asaskevich/EventBus"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 	"golang.org/x/sync/semaphore"
 )

--- a/server/internal/playlist.go
+++ b/server/internal/playlist.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 type metadata struct {
--- a/server/internal/process.go
+++ b/server/internal/process.go
@@ -19,12 +19,12 @@ import (
 	"strings"
 	"time"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 const downloadTemplate = `download:
 {
-	"eta":%(progress.eta)s, 
+	"eta":%(progress.eta)s,
 	"percentage":"%(progress._percent_str)s",
 	"speed":%(progress.speed)s
 }`
@@ -225,7 +225,7 @@ func (p *Process) Complete() {
 		Speed:      0,
 		ETA:        0,
 	}
-	
+
 	// for safety, if the filename is not set, set it with original function
 	if p.Output.SavedFilePath == "" {
 		p.GetFileName(&p.Output)
--- 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/marcopeocchi/yt-dlp-web-ui/server/config"
-	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
 )

 var upgrader = websocket.Upgrader{
--- 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/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 	"golang.org/x/oauth2"
 )

--- a/server/rest/common.go
+++ b/server/rest/common.go
@@ -3,7 +3,7 @@ package rest
 import (
 	"database/sql"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 type ContainerArgs struct {
--- 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/marcopeocchi/yt-dlp-web-ui/server/config"
-	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
 )

 func Container(args *ContainerArgs) *Handler {
--- 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/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 )

 type Handler struct {
--- a/server/rest/service.go
+++ b/server/rest/service.go
@@ -10,9 +10,9 @@ import (
 	"time"

 	"github.com/google/uuid"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
 )

 type Service struct {
--- a/server/rpc/container.go
+++ b/server/rpc/container.go
@@ -2,11 +2,11 @@ package rpc

 import (
 	"github.com/go-chi/chi/v5"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream"
-	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
+	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
 )

 // Dependency injection container.
--- a/server/rpc/service.go
+++ b/server/rpc/service.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"log/slog"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/sys"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/updater"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/sys"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/updater"
 )

 type Service struct {
--- a/server/server.go
+++ b/server/server.go
@@ -19,16 +19,16 @@ import (

 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/cors"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/dbutil"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/handlers"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/logging"
-	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/rest"
-	ytdlpRPC "github.com/marcopeocchi/yt-dlp-web-ui/server/rpc"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/dbutil"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/handlers"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/logging"
+	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/rest"
+	ytdlpRPC "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/rpc"

 	_ "modernc.org/sqlite"
 )
--- a/server/sys/fs.go
+++ b/server/sys/fs.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 	"golang.org/x/sys/unix"
 )

--- a/server/updater/update.go
+++ b/server/updater/update.go
@@ -3,7 +3,7 @@ package updater
 import (
 	"os/exec"

-	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
 )

 // Update using the builtin function of yt-dlp