Move utils and ytdl packages to pkg dir
This commit is contained in:
parent
b428fb2de2
commit
1a4f6ebaf2
|
@ -14,8 +14,8 @@ import (
|
||||||
"go.fifitido.net/ytdl-web/pkg/httpx"
|
"go.fifitido.net/ytdl-web/pkg/httpx"
|
||||||
"go.fifitido.net/ytdl-web/pkg/server"
|
"go.fifitido.net/ytdl-web/pkg/server"
|
||||||
"go.fifitido.net/ytdl-web/pkg/view"
|
"go.fifitido.net/ytdl-web/pkg/view"
|
||||||
"go.fifitido.net/ytdl-web/ytdl"
|
"go.fifitido.net/ytdl-web/pkg/ytdl"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
"golang.org/x/exp/slog"
|
"golang.org/x/exp/slog"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,8 @@ import (
|
||||||
"go.fifitido.net/ytdl-web/pkg/htmx"
|
"go.fifitido.net/ytdl-web/pkg/htmx"
|
||||||
"go.fifitido.net/ytdl-web/pkg/server"
|
"go.fifitido.net/ytdl-web/pkg/server"
|
||||||
"go.fifitido.net/ytdl-web/pkg/view"
|
"go.fifitido.net/ytdl-web/pkg/view"
|
||||||
|
"go.fifitido.net/ytdl-web/pkg/ytdl"
|
||||||
"go.fifitido.net/ytdl-web/version"
|
"go.fifitido.net/ytdl-web/version"
|
||||||
"go.fifitido.net/ytdl-web/ytdl"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type HomeController struct {
|
type HomeController struct {
|
||||||
|
|
|
@ -2,7 +2,7 @@ package models
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/samber/lo"
|
"github.com/samber/lo"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Video struct {
|
type Video struct {
|
||||||
|
|
|
@ -8,7 +8,7 @@ import (
|
||||||
|
|
||||||
"github.com/htfy96/reformism"
|
"github.com/htfy96/reformism"
|
||||||
"go.fifitido.net/ytdl-web/pkg/view/html"
|
"go.fifitido.net/ytdl-web/pkg/view/html"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed views/*
|
//go:embed views/*
|
||||||
|
|
|
@ -12,9 +12,9 @@ import (
|
||||||
"go.fifitido.net/ytdl-web/app/controllers"
|
"go.fifitido.net/ytdl-web/app/controllers"
|
||||||
"go.fifitido.net/ytdl-web/config"
|
"go.fifitido.net/ytdl-web/config"
|
||||||
"go.fifitido.net/ytdl-web/pkg/server"
|
"go.fifitido.net/ytdl-web/pkg/server"
|
||||||
"go.fifitido.net/ytdl-web/utils"
|
"go.fifitido.net/ytdl-web/pkg/utils"
|
||||||
"go.fifitido.net/ytdl-web/ytdl"
|
"go.fifitido.net/ytdl-web/pkg/ytdl"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/cache"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/cache"
|
||||||
"golang.org/x/exp/slog"
|
"golang.org/x/exp/slog"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dgraph-io/badger/v2"
|
"github.com/dgraph-io/badger/v2"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
type MetadataCache interface {
|
type MetadataCache interface {
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Exec(binary, url string, options ...Option) error {
|
func Exec(binary, url string, options ...Option) error {
|
|
@ -7,8 +7,8 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"go.fifitido.net/ytdl-web/utils"
|
"go.fifitido.net/ytdl-web/pkg/utils"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
"golang.org/x/exp/slog"
|
"golang.org/x/exp/slog"
|
||||||
)
|
)
|
||||||
|
|
|
@ -7,8 +7,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"go.fifitido.net/ytdl-web/config"
|
"go.fifitido.net/ytdl-web/config"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/cache"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/cache"
|
||||||
"go.fifitido.net/ytdl-web/ytdl/metadata"
|
"go.fifitido.net/ytdl-web/pkg/ytdl/metadata"
|
||||||
"golang.org/x/exp/slog"
|
"golang.org/x/exp/slog"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue