Consolidating paths module into data

boggydigital · Dec 17, 2024 · 7b0cbc5 · 7b0cbc5
1 parent cfa7b1f
commit 7b0cbc5
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 48 deletions.
diff --git a/cli/backup.go b/cli/backup.go
@@ -4,7 +4,7 @@ import (
 	"github.com/boggydigital/backups"
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"net/url"
 )
 
@@ -16,12 +16,12 @@ func Backup() error {
 	ea := nod.NewProgress("backing up metadata...")
 	defer ea.End()
 
-	amp, err := pathways.GetAbsDir(paths.Metadata)
+	amp, err := pathways.GetAbsDir(data.Metadata)
 	if err != nil {
 		return ea.EndWithError(err)
 	}
 
-	abp, err := pathways.GetAbsDir(paths.Backups)
+	abp, err := pathways.GetAbsDir(data.Backups)
 	if err != nil {
 		return ea.EndWithError(err)
 	}

diff --git a/cli/cleanup_ended_videos.go b/cli/cleanup_ended_videos.go
@@ -6,7 +6,6 @@ import (
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"io"
@@ -36,7 +35,7 @@ func CleanupEndedVideos(now bool, rdx kevlar.WriteableRedux) error {
 		return cea.EndWithError(err)
 	}
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return cea.EndWithError(err)
 	}
@@ -159,7 +158,7 @@ func removeVideoFile(videoId string, rdx kevlar.ReadableRedux) error {
 func removePosters(videoId string) error {
 
 	for _, tq := range youtube_urls.AllThumbnailQualities() {
-		if app, err := paths.AbsPosterPath(videoId, tq); err == nil {
+		if app, err := data.AbsPosterPath(videoId, tq); err == nil {
 			if _, err := os.Stat(app); err == nil {
 				if err = os.Remove(app); err != nil {
 					return err

diff --git a/cli/download_video.go b/cli/download_video.go
@@ -6,7 +6,6 @@ import (
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/url"
@@ -132,7 +131,7 @@ func downloadVideo(
 
 	relFilename := yeti.RelLocalVideoFilename(channel, title, videoId)
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return err
 	}
@@ -181,7 +180,7 @@ func downloadWithYtDlp(videoId, absFilename string, options *VideoOptions) error
 		}
 	}
 
-	ytDlpDir, err := pathways.GetAbsDir(paths.YtDlp)
+	ytDlpDir, err := pathways.GetAbsDir(data.YtDlp)
 	if err != nil {
 		return dyda.EndWithError(err)
 	}

diff --git a/cli/get_captions.go b/cli/get_captions.go
@@ -6,7 +6,6 @@ import (
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/url"
@@ -28,7 +27,7 @@ func GetCaptions(force bool, videoIds ...string) error {
 
 	dl := dolo.DefaultClient
 
-	metadataDir, err := pathways.GetAbsDir(paths.Metadata)
+	metadataDir, err := pathways.GetAbsDir(data.Metadata)
 	if err != nil {
 		return gca.EndWithError(err)
 	}

diff --git a/cli/get_rutube_video.go b/cli/get_rutube_video.go
@@ -9,7 +9,7 @@ import (
 	"github.com/boggydigital/dolo"
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/rutube_urls"
 	"net/http"
@@ -200,7 +200,7 @@ func getVideoSegments(
 	gvsa := nod.NewProgress(" getting video segments for %s...", videoId)
 	defer gvsa.End()
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return gvsa.EndWithError(err)
 	}
@@ -240,7 +240,7 @@ func absManifestFilename(playOptions *rutube_urls.PlayOptions) (string, error) {
 	videoId := playOptions.VideoId
 	channel := busan.Sanitize(playOptions.Author.Name)
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return "", err
 	}
@@ -295,7 +295,7 @@ func mergeVideoSegments(playOptions *rutube_urls.PlayOptions, force bool) error
 	mvsa := nod.Begin(" merging video segments for %s, this can take a while...", videoId)
 	defer mvsa.End()
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return mvsa.EndWithError(err)
 	}
@@ -338,7 +338,7 @@ func removeManifestSegments(playOptions *rutube_urls.PlayOptions, segments []str
 	rmsa := nod.NewProgress(" removing manifest, segments for %s...", videoId)
 	defer rmsa.End()
 
-	absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+	absVideosDir, err := pathways.GetAbsDir(data.Videos)
 	if err != nil {
 		return rmsa.EndWithError(err)
 	}

diff --git a/cli/migrate.go b/cli/migrate.go
@@ -4,7 +4,7 @@ import (
 	"github.com/boggydigital/kevlar"
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"net/url"
 )
 
@@ -20,7 +20,7 @@ func Migrate() error {
 		return ma.EndWithError(err)
 	}
 
-	amd, err := pathways.GetAbsDir(paths.Metadata)
+	amd, err := pathways.GetAbsDir(data.Metadata)
 	if err != nil {
 		return ma.EndWithError(err)
 	}

diff --git a/cli/update_yt_dlp.go b/cli/update_yt_dlp.go
@@ -9,7 +9,6 @@ import (
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet/yeti"
 	"io"
 	"net/http"
@@ -46,7 +45,7 @@ func UpdateYtDlp(force bool) error {
 	uyda := nod.Begin("updating yt-dlp and plugins...")
 	defer uyda.EndWithResult("done")
 
-	metadataDir, err := pathways.GetAbsDir(paths.Metadata)
+	metadataDir, err := pathways.GetAbsDir(data.Metadata)
 	if err != nil {
 		return uyda.EndWithError(err)
 	}
@@ -56,7 +55,7 @@ func UpdateYtDlp(force bool) error {
 		return uyda.EndWithError(err)
 	}
 
-	ytDlpDir, err := pathways.GetAbsDir(paths.YtDlp)
+	ytDlpDir, err := pathways.GetAbsDir(data.YtDlp)
 	if err != nil {
 		return uyda.EndWithError(err)
 	}

diff --git a/cli/validate_redux.go b/cli/validate_redux.go
@@ -3,12 +3,12 @@ package cli
 import (
 	"github.com/boggydigital/kevlar"
 	"github.com/boggydigital/pathways"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 )
 
 func validateWritableRedux(rdx kevlar.WriteableRedux, properties ...string) (kevlar.WriteableRedux, error) {
 	if rdx == nil {
-		metadataDir, err := pathways.GetAbsDir(paths.Metadata)
+		metadataDir, err := pathways.GetAbsDir(data.Metadata)
 		if err != nil {
 			return nil, err
 		}

diff --git a/paths/dirs.go → data/dirs.go b/paths/dirs.go → data/dirs.go
@@ -1,4 +1,4 @@
-package paths
+package data
 
 import (
 	"github.com/boggydigital/pathways"

diff --git a/paths/paths.go → data/paths.go b/paths/paths.go → data/paths.go
@@ -1,4 +1,4 @@
-package paths
+package data
 
 import (
 	"errors"

diff --git a/main.go b/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/boggydigital/nod"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/cli"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"os"
 )
 
@@ -29,9 +29,9 @@ func main() {
 	defer ya.End()
 
 	if err := pathways.Setup(dirOverridesFilename,
-		paths.DefaultYetRootDir,
+		data.DefaultYetRootDir,
 		nil,
-		paths.AllAbsDirs...); err != nil {
+		data.AllAbsDirs...); err != nil {
 		_ = ya.EndWithError(err)
 		os.Exit(1)
 	}

diff --git a/rest/get_captions.go b/rest/get_captions.go
@@ -1,7 +1,7 @@
 package rest
 
 import (
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"net/http"
 	"os"
 )
@@ -13,7 +13,7 @@ func GetCaptions(w http.ResponseWriter, r *http.Request) {
 	videoId := r.URL.Query().Get("v")
 	lang := r.URL.Query().Get("l")
 
-	absCaptionsFilename, err := paths.AbsCaptionsTrackPath(videoId, lang)
+	absCaptionsFilename, err := data.AbsCaptionsTrackPath(videoId, lang)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

diff --git a/rest/get_poster.go b/rest/get_poster.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	_ "embed"
 	"github.com/boggydigital/dolo"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"io"
@@ -34,7 +34,7 @@ func GetPoster(w http.ResponseWriter, r *http.Request) {
 
 	for q := quality; q != youtube_urls.ThumbnailQualityUnknown; q = youtube_urls.LowerQuality(q) {
 
-		absPosterFilename, err := paths.AbsPosterPath(videoId, q)
+		absPosterFilename, err := data.AbsPosterPath(videoId, q)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

diff --git a/rest/get_video.go b/rest/get_video.go
@@ -2,7 +2,7 @@ package rest
 
 import (
 	"github.com/boggydigital/pathways"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/http"
 	"os"
@@ -18,7 +18,7 @@ func GetVideo(w http.ResponseWriter, r *http.Request) {
 
 	if filepath.IsLocal(file) {
 
-		absVideosDir, err := pathways.GetAbsDir(paths.Videos)
+		absVideosDir, err := pathways.GetAbsDir(data.Videos)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

diff --git a/rest/init.go b/rest/init.go
@@ -5,7 +5,6 @@ import (
 	"github.com/boggydigital/kevlar"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"html/template"
 )
 
@@ -18,7 +17,7 @@ var (
 
 func Init() error {
 
-	metadataDir, err := pathways.GetAbsDir(paths.Metadata)
+	metadataDir, err := pathways.GetAbsDir(data.Metadata)
 	if err != nil {
 		return err
 	}

diff --git a/rest/view_models/watch_view_model.go b/rest/view_models/watch_view_model.go
@@ -5,7 +5,6 @@ import (
 	"github.com/boggydigital/kevlar"
 	"github.com/boggydigital/pathways"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet/yeti"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/url"
@@ -96,7 +95,7 @@ func GetWatchViewModel(videoId, currentTime string, rdx kevlar.WriteableRedux) (
 				if _, err := os.Stat(absLocalVideoFilename); err == nil {
 					localPlayback = true
 
-					videosDir, err := pathways.GetAbsDir(paths.Videos)
+					videosDir, err := pathways.GetAbsDir(data.Videos)
 					if err != nil {
 						return nil, err
 					}

diff --git a/yeti/get_captions.go b/yeti/get_captions.go
@@ -4,7 +4,6 @@ import (
 	"github.com/boggydigital/dolo"
 	"github.com/boggydigital/kevlar"
 	"github.com/boggydigital/yet/data"
-	"github.com/boggydigital/yet/paths"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/url"
 )
@@ -47,7 +46,7 @@ func GetCaptions(dl *dolo.Client, rdx kevlar.WriteableRedux, videoId string, cap
 			return err
 		}
 
-		if absFilename, err := paths.AbsCaptionsTrackPath(videoId, ct.LanguageCode); err == nil {
+		if absFilename, err := data.AbsCaptionsTrackPath(videoId, ct.LanguageCode); err == nil {
 			if err := dl.Download(u, force, nil, absFilename); err != nil {
 				return err
 			}

diff --git a/yeti/get_player.go b/yeti/get_player.go
@@ -1,7 +1,7 @@
 package yeti
 
 import (
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"io"
 	"net/http"
@@ -28,7 +28,7 @@ func GetPlayerContent(hc *http.Client, playerUrl string) (io.ReadCloser, error)
 
 	version := PlayerVersion(playerUrl)
 
-	absPlayerPath, err := paths.AbsPlayerPath(version)
+	absPlayerPath, err := data.AbsPlayerPath(version)
 	if err != nil {
 		return nil, err
 	}

diff --git a/yeti/get_posters.go b/yeti/get_posters.go
@@ -3,7 +3,7 @@ package yeti
 import (
 	"github.com/boggydigital/dolo"
 	"github.com/boggydigital/nod"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"path/filepath"
 	"strings"
@@ -23,7 +23,7 @@ func GetPosters(videoId string, dl *dolo.Client, force bool, qualities ...youtub
 		_, fnse := filepath.Split(u.Path)
 		fnse = strings.TrimSuffix(fnse, filepath.Ext(fnse))
 
-		if absFilename, err := paths.AbsPosterPath(videoId, q); err == nil {
+		if absFilename, err := data.AbsPosterPath(videoId, q); err == nil {
 			if err := dl.Download(u, force, nil, absFilename); err != nil {
 				if lq := youtube_urls.LowerQuality(q); lq != youtube_urls.ThumbnailQualityUnknown {
 					return GetPosters(videoId, dl, force, lq)

diff --git a/yeti/get_thumbnail.go b/yeti/get_thumbnail.go
@@ -0,0 +1 @@
+package yeti
diff --git a/yeti/get_video_page.go b/yeti/get_video_page.go
@@ -2,7 +2,7 @@ package yeti
 
 import (
 	"github.com/boggydigital/coost"
-	"github.com/boggydigital/yet/paths"
+	"github.com/boggydigital/yet/data"
 	"github.com/boggydigital/yet_urls/youtube_urls"
 	"net/http"
 	"strings"
@@ -23,7 +23,7 @@ func GetVideoPage(videoId string) (*youtube_urls.InitialPlayerResponse, error) {
 			if strings.Contains(err.Error(), esc) {
 				errSolvedWithCookies = true
 				// fallback to HTTP client with cookies
-				if absCookiePath, err := paths.AbsCookiesPath(); err == nil {
+				if absCookiePath, err := data.AbsCookiesPath(); err == nil {
 					if hc, err := coost.NewHttpClientFromFile(absCookiePath); err == nil {
 						return youtube_urls.GetVideoPage(hc, videoId)
 					} else {