marco/yt-dlp-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Marco Piovanello <35533749+marcopeocchi@users.noreply.github.com>
This commit is contained in:
Andrási István
2024-11-10 13:59:40 +01:00
committed by GitHub
parent baa25afa27
commit 846fb294d0
24 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -7,14 +7,12 @@ fe:
cd frontend && pnpm install && pnpm build cd frontend && pnpm install && pnpm build
dev: dev:
cd frontend && pnpm dev ( cd frontend && pnpm install && pnpm dev )
all: all: fe
$(MAKE) fe && cd ..
CGO_ENABLED=0 go build -o yt-dlp-webui main.go CGO_ENABLED=0 go build -o yt-dlp-webui main.go
multiarch: multiarch: fe
$(MAKE) fe
mkdir -p build 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=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 CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/yt-dlp-webui_linux-arm64 main.go

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/marcopeocchi/yt-dlp-web-ui module github.com/marcopeocchi/yt-dlp-web-ui/v3
go 1.23 go 1.23

8
main.go
View File

@@ -8,10 +8,10 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/marcopeocchi/yt-dlp-web-ui/server" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server"
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/cli"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
) )
var ( var (

2
server/dbutil/migrate.go
View File

@@ -6,7 +6,7 @@ import (
"os" "os"
"path/filepath" "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") var lockFilePath = filepath.Join(config.Instance().Dir(), ".db.lock")

4
server/handlers/archive.go
View File

@@ -17,8 +17,8 @@ import (
"time" "time"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
) )
/* /*

2
server/handlers/login.go
View File

@@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/golang-jwt/jwt/v5" "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" const TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"

4
server/internal/livestream/livestream.go
View File

@@ -10,8 +10,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
) )
const ( const (

4
server/internal/livestream/livestream_test.go
View File

@@ -4,8 +4,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
) )
func setupTest() { func setupTest() {

4
server/internal/livestream/monitor.go
View File

@@ -7,8 +7,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
) )
type Monitor struct { type Monitor struct {

2
server/internal/memory_db.go
View File

@@ -8,7 +8,7 @@ import (
"sync" "sync"
"github.com/google/uuid" "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 // In-Memory Thread-Safe Key-Value Storage with optional persistence

2
server/internal/message_queue.go
View File

@@ -6,7 +6,7 @@ import (
"log/slog" "log/slog"
evbus "github.com/asaskevich/EventBus" 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" "golang.org/x/sync/semaphore"
) )

2
server/internal/playlist.go
View File

@@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
) )
type metadata struct { type metadata struct {

6
server/internal/process.go
View File

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

6
server/logging/handler.go
View File

@@ -9,9 +9,9 @@ import (
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware" middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
) )
var upgrader = websocket.Upgrader{ var upgrader = websocket.Upgrader{

2
server/openid/config.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"github.com/coreos/go-oidc/v3/oidc" "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" "golang.org/x/oauth2"
) )

2
server/rest/common.go
View File

@@ -3,7 +3,7 @@ package rest
import ( import (
"database/sql" "database/sql"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
) )
type ContainerArgs struct { type ContainerArgs struct {

6
server/rest/container.go
View File

@@ -2,9 +2,9 @@ package rest
import ( import (
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware" middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
) )
func Container(args *ContainerArgs) *Handler { func Container(args *ContainerArgs) *Handler {

2
server/rest/handlers.go
View File

@@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"github.com/go-chi/chi/v5" "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 { type Handler struct {

6
server/rest/service.go
View File

@@ -10,9 +10,9 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
) )
type Service struct { type Service struct {

10
server/rpc/container.go
View File

@@ -2,11 +2,11 @@ package rpc
import ( import (
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware" middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
) )
// Dependency injection container. // Dependency injection container.

8
server/rpc/service.go
View File

@@ -4,10 +4,10 @@ import (
"errors" "errors"
"log/slog" "log/slog"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
"github.com/marcopeocchi/yt-dlp-web-ui/server/sys" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/sys"
"github.com/marcopeocchi/yt-dlp-web-ui/server/updater" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/updater"
) )
type Service struct { type Service struct {

20
server/server.go
View File

@@ -19,16 +19,16 @@ import (
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/cors" "github.com/go-chi/cors"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/dbutil" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/dbutil"
"github.com/marcopeocchi/yt-dlp-web-ui/server/handlers" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/handlers"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal/livestream" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
"github.com/marcopeocchi/yt-dlp-web-ui/server/logging" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/logging"
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware" middlewares "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/middleware"
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/openid"
"github.com/marcopeocchi/yt-dlp-web-ui/server/rest" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/rest"
ytdlpRPC "github.com/marcopeocchi/yt-dlp-web-ui/server/rpc" ytdlpRPC "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/rpc"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )

4
server/sys/fs.go
View File

@@ -4,8 +4,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal" "github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
server/updater/update.go
View File

@@ -3,7 +3,7 @@ package updater
import ( import (
"os/exec" "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 // Update using the builtin function of yt-dlp