feat: allow enqueuing whole folders

Author: MonstraG

infrastructure/helpers/readFolder.go

@@ -0,0 +1,51 @@
+package helpers
+
+import (
+	"errors"
+	"fmt"
+	"go-api/infrastructure/reqRes"
+	"io/fs"
+	"net/http"
+	"os"
+)
+
+func ReadFolder(w reqRes.MyResponseWriter, fileSystemFolder string) (bool, []os.DirEntry) {
+	dirAsFile, err := os.Open(fileSystemFolder)
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			message := fmt.Sprintf("%s does not exist", fileSystemFolder)
+			w.Error(message, http.StatusBadRequest)
+			return false, nil
+		}
+
+		message := fmt.Sprintf("Failure to open folder '%s': \n%v", fileSystemFolder, err)
+		w.Error(message, http.StatusInternalServerError)
+		return false, nil
+	}
+
+	dirEntries, err := dirAsFile.ReadDir(-1)
+	if err != nil {
+		// here I would check if this error is "NotADir" or something, but there seems to
+		// not be a consistent / sane way to do this?
+		// https://github.com/golang/go/issues/46734
+
+		if errors.Is(err, fs.ErrNotExist) {
+			message := fmt.Sprintf("Failure to read folder '%s': \n%v", fileSystemFolder, err)
+			w.Error(message, http.StatusInternalServerError)
+			return false, nil
+		}
+
+		message := fmt.Sprintf("Failure to read folder '%s': \n%v", fileSystemFolder, err)
+		w.Error(message, http.StatusInternalServerError)
+		return false, nil
+	}
+
+	err = dirAsFile.Close()
+	if err != nil {
+		message := fmt.Sprintf("Failure to close folder '%s': \n%v", fileSystemFolder, err)
+		w.Error(message, http.StatusInternalServerError)
+		return false, nil
+	}
+
+	return true, dirEntries
+}

infrastructure/setup/app.go

@@ -95,7 +95,8 @@ func (app *App) MapRoutes() {
 
 	var playerController = player.NewController(app.Config, app.Db)
 	app.handleFunc("GET /player", authRequired(playerController.GetPlayer))
-	app.handleFunc("POST /addSong/{path...}", authRequired(playerController.AddSong))
+	app.handleFunc("POST /enqueueSong/{path...}", authRequired(playerController.EnqueueSong))
+	app.handleFunc("POST /enqueueFolder/{path...}", authRequired(playerController.EnqueueFolder))
 	app.handleFunc("DELETE /removeSong/{id}", authRequired(playerController.RemoveSong))
 	app.handleFunc("POST /reportSongDuration/{queuedSongId}", authRequired(playerController.ReportSongDuration))
 

pages/fileExplorer/ExploreAt.go

@@ -1,14 +1,12 @@
 package fileExplorer
 
 import (
-	"errors"
 	"fmt"
+	"go-api/infrastructure/helpers"
 	"go-api/infrastructure/myLog"
 	"go-api/infrastructure/reqRes"
 	"html/template"
-	"io/fs"
 	"mime"
-	"net/http"
 	"os"
 	"path"
 	"path/filepath"
@@ -41,40 +39,8 @@ func (controller *Controller) ExploreAt(w reqRes.MyResponseWriter, r *reqRes.MyR
 }
 
 func renderExplorer(w reqRes.MyResponseWriter, fileSystemFolder string, queryFolder string, resultMessage string) {
-	dirAsFile, err := os.Open(fileSystemFolder)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			message := fmt.Sprintf("%s does not exist", fileSystemFolder)
-			w.Error(message, http.StatusBadRequest)
-			return
-		}
-
-		message := fmt.Sprintf("Failure to open folder '%s': \n%v", fileSystemFolder, err)
-		w.Error(message, http.StatusInternalServerError)
-		return
-	}
-
-	dirEntries, err := dirAsFile.ReadDir(-1)
-	if err != nil {
-		// here I would check if this error is "NotADir" or something, but there seems to
-		// not be a consistent / sane way to do this?
-		// https://github.com/golang/go/issues/46734
-
-		if errors.Is(err, fs.ErrNotExist) {
-			message := fmt.Sprintf("Failure to read folder '%s': \n%v", fileSystemFolder, err)
-			w.Error(message, http.StatusInternalServerError)
-			return
-		}
-
-		message := fmt.Sprintf("Failure to read folder '%s': \n%v", fileSystemFolder, err)
-		w.Error(message, http.StatusInternalServerError)
-		return
-	}
-
-	err = dirAsFile.Close()
-	if err != nil {
-		message := fmt.Sprintf("Failure to close folder '%s': \n%v", fileSystemFolder, err)
-		w.Error(message, http.StatusInternalServerError)
+	ok, dirEntries := helpers.ReadFolder(w, fileSystemFolder)
+	if !ok {
 		return
 	}
 

pages/fileExplorer/fileExplorerPartial.gohtml

@@ -1,7 +1,12 @@
 {{- /*gotype: go-api/pages/music.FilesData*/ -}}
 <div id="files-partial" class="card">
 	<div class="grow">
-		<h3>/{{.Path}}</h3>
+		<div class="files-header">
+			<h3>/{{.Path}}</h3>
+			<button class="secondary-button small" hx-post="/enqueueFolder/{{.Path}}" hx-target="#player">
+				Enqueue folder
+			</button>
+		</div>
 		<table>
 			<tbody>
 			{{range .Items}}
@@ -27,7 +32,8 @@
 					</td>
 					<td class="align-end short">
 						{{if .IsSong}}
-							<button class="icon-button" hx-post="/addSong/{{.Path}}" hx-target="#player">
+							<button class="icon-button" hx-post="/enqueueSong/{{.Path}}" hx-target="#player"
+									title="Enqueue song">
 								<img src="/public/icons/add.svg" width="20" height="20" alt="Add"/>
 							</button>
 						{{end}}
@@ -36,7 +42,8 @@
 						{{if not .IsGoUp}}
 							<button class="icon-button" hx-delete="/file/{{.Path}}"
 									hx-confirm='Are you sure you want to delete {{if .IsDir}}folder{{else}}file{{end}} "{{.Name}}"?'
-									hx-target="#files-partial" hx-swap="outerHTML">
+									hx-target="#files-partial" hx-swap="outerHTML"
+									title="Delete {{if .IsDir}}folder{{else}}file{{end}}">
 								<img src="/public/icons/delete.svg" width="20" height="20" alt="Delete"/>
 							</button>
 						{{end}}

pages/index/index.gohtml

@@ -30,9 +30,14 @@
 				flex-grow: 1;
 			}
 
+			.files-header {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 8px;
+			}
+
 			h3 {
-				font-size: 16px;
-				margin-bottom: 4px;
+				font-size: 20px;
 			}
 
 			hr {

pages/player/GetPlayer.go

@@ -2,6 +2,7 @@ package player
 
 import (
 	"fmt"
+	"go-api/infrastructure/helpers"
 	"go-api/infrastructure/models"
 	"go-api/infrastructure/reqRes"
 	"go-api/pages/fileExplorer"
@@ -50,7 +51,7 @@ func (controller *Controller) GetPlayer(w reqRes.MyResponseWriter, r *reqRes.MyR
 	w.RenderTemplate(playerTemplate, pageData)
 }
 
-func (controller *Controller) AddSong(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+func (controller *Controller) EnqueueSong(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
 	pathQueryParam := r.PathValue("path")
 	pathToFile := filepath.Join(controller.explorerRoot, pathQueryParam)
 
@@ -86,6 +87,39 @@ func (controller *Controller) AddSong(w reqRes.MyResponseWriter, r *reqRes.MyReq
 	controller.GetPlayer(w, r)
 }
 
+func (controller *Controller) EnqueueFolder(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+	pathQueryParam := r.PathValue("path")
+	folder := filepath.Join(controller.explorerRoot, pathQueryParam)
+
+	ok, dirEntries := helpers.ReadFolder(w, folder)
+	if !ok {
+		return
+	}
+
+	songsToAdd := make([]models.QueuedSong, 0)
+	for _, file := range dirEntries {
+		fileName := file.Name()
+		isSong := fileExplorer.IsSong(fileName)
+		if !isSong {
+			continue
+		}
+
+		songsToAdd = append(songsToAdd, models.QueuedSong{
+			Path: filepath.Join(pathQueryParam, fileName),
+		})
+	}
+
+	result := controller.db.Create(&songsToAdd)
+
+	if result.Error != nil {
+		message := fmt.Sprintf("Failed to insert song into queue: \n%v", result.Error)
+		w.Error(message, http.StatusBadRequest)
+		return
+	}
+
+	controller.GetPlayer(w, r)
+}
+
 // ReportSongDuration should be called by client to tell the server when the song actually ends
 // It would have been nice to be able to figure out duration server-side, but that seems to not be that easy
 func (controller *Controller) ReportSongDuration(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {

public/styles.css

@@ -104,6 +104,30 @@ button.primary-button {
 	}
 }
 
+button.secondary-button {
+	background: none;
+	color: var(--foreground);
+	border: 1px solid var(--primary);
+	padding: 0.5rem 0.75rem;
+	border-radius: 99px;
+	cursor: pointer;
+	font-size: 0.875rem;
+
+	transition: background-color 0.125s ease-in;
+
+	&:hover {
+		background-color: color-mix(in srgb, transparent, var(--primary) 20%);
+	}
+
+	&:active {
+		background-color: color-mix(in srgb, transparent, var(--primary) 40%);
+	}
+}
+
+button.small {
+	padding: 0.25rem 0.5rem;
+}
+
 button.icon-button {
 	background-color: transparent;
 	padding: 0.25rem;
@@ -186,4 +210,4 @@ button.icon-button {
 			}
 		}
 	}
-}
+}