Merge pull request #123 from contre95/fix/analyze_ui

Fix/analyze UI

Author: contre95

public/svg/fingerprint.svg

@@ -6,7 +6,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/contre95/soulsolid/src/features/analyze"
 	"github.com/contre95/soulsolid/src/features/config"
 	"github.com/contre95/soulsolid/src/features/downloading"
 	"github.com/contre95/soulsolid/src/features/importing"
@@ -16,6 +15,7 @@ import (
 	"github.com/contre95/soulsolid/src/features/metadata"
 	"github.com/contre95/soulsolid/src/features/metrics"
 	"github.com/contre95/soulsolid/src/features/playlists"
+	"github.com/contre95/soulsolid/src/features/reorganize"
 	"github.com/contre95/soulsolid/src/features/syncdap"
 	"github.com/contre95/soulsolid/src/features/ui"
 	"github.com/contre95/soulsolid/src/music"
@@ -30,7 +30,7 @@ type Server struct {
 }
 
 // NewServer creates a new HTTP server.
-func NewServer(cfg *config.Manager, importingService *importing.Service, libraryService *library.Service, playlistsService *playlists.Service, syncService *syncdap.Service, downloadingService *downloading.Service, jobService *jobs.Service, tagService *metadata.Service, lyricsService *lyrics.Service, metricsService *metrics.Service, analyzeService *analyze.Service) *Server {
+func NewServer(cfg *config.Manager, importingService *importing.Service, libraryService *library.Service, playlistsService *playlists.Service, syncService *syncdap.Service, downloadingService *downloading.Service, jobService *jobs.Service, tagService *metadata.Service, lyricsService *lyrics.Service, metricsService *metrics.Service, reorganizeService *reorganize.Service) *Server {
 	engine := html.New("./views", ".html")
 	engine.Debug(cfg.Get().Logger.Level == "debug")
 	// Add custom template functions
@@ -121,7 +121,6 @@ func NewServer(cfg *config.Manager, importingService *importing.Service, library
 	})
 
 	uiHandler := ui.NewHandler(cfg)
-	analyzeHandler := analyze.NewHandler(analyzeService)
 
 	importing.RegisterRoutes(app, importingService)
 	library.RegisterRoutes(app, libraryService)
@@ -138,7 +137,8 @@ func NewServer(cfg *config.Manager, importingService *importing.Service, library
 	metadata.RegisterRoutes(app, tagService)
 	lyricsHandler := lyrics.NewHandler(lyricsService, tagService)
 	lyrics.RegisterRoutes(app, lyricsHandler)
-	analyze.RegisterRoutes(app, analyzeHandler)
+	reorganizeHandler := reorganize.NewHandler(reorganizeService)
+	reorganize.RegisterRoutes(app, reorganizeHandler)
 
 	return &Server{app: app, port: cfg.Get().Server.Port}
 }

public/svg/mic.svg

@@ -86,3 +86,56 @@ func (h *Handler) GetTrackLyrics(c *fiber.Ctx) error {
 	}
 	return c.SendString(track.Metadata.Lyrics)
 }
+
+// StartLyricsAnalysis handles starting the lyrics analysis job
+func (h *Handler) StartLyricsAnalysis(c *fiber.Ctx) error {
+	slog.Info("Starting lyrics analysis via HTTP request")
+
+	// Get provider from form data
+	provider := c.FormValue("provider")
+	if provider == "" {
+		return c.Render("toast/toastErr", fiber.Map{
+			"Msg": "Please select a lyrics provider",
+		})
+	}
+
+	jobID, err := h.service.StartLyricsAnalysis(c.Context(), provider)
+	if err != nil {
+		slog.Error("Failed to start lyrics analysis", "error", err)
+		return c.Render("toast/toastErr", fiber.Map{
+			"Msg": "Failed to start lyrics analysis: " + err.Error(),
+		})
+	}
+
+	slog.Info("Lyrics analysis job started successfully", "jobID", jobID, "provider", provider)
+
+	// Trigger HTMX to refresh the job list
+	c.Set("HX-Trigger", "refreshJobList")
+
+	if c.Get("HX-Request") == "true" {
+		return c.Render("toast/toastOk", fiber.Map{
+			"Msg": "Lyrics analysis started successfully",
+		})
+	}
+
+	return c.Redirect("/ui/analyze/lyrics")
+}
+
+// RenderLyricsAnalysisSection renders the lyrics analysis section page
+func (h *Handler) RenderLyricsAnalysisSection(c *fiber.Ctx) error {
+	slog.Debug("Rendering lyrics analysis section")
+
+	data := fiber.Map{
+		"Title": "Lyrics Analysis",
+	}
+
+	// Get lyrics providers info for the UI
+	data["LyricsProviders"] = h.service.GetLyricsProvidersInfo()
+
+	if c.Get("HX-Request") != "true" {
+		data["Section"] = "analyze_lyrics"
+		return c.Render("main", data)
+	}
+
+	return c.Render("sections/analyze_lyrics", data)
+}

src/features/analyze/handlers.go

@@ -1,4 +1,4 @@
-package analyze
+package lyrics
 
 import (
 	"context"
@@ -30,7 +30,7 @@ func (t *LyricsJobTask) Execute(ctx context.Context, job *music.Job, progressUpd
 	job.Logger.Info("EXECUTE STARTED: Lyrics job task is running", "color", "pink")
 
 	// Check if any lyrics providers are enabled
-	enabledProviders := t.service.lyricsService.GetEnabledLyricsProviders()
+	enabledProviders := t.service.GetEnabledLyricsProviders()
 	hasEnabledProviders := false
 	for _, enabled := range enabledProviders {
 		if enabled {
@@ -47,7 +47,7 @@ func (t *LyricsJobTask) Execute(ctx context.Context, job *music.Job, progressUpd
 	job.Logger.Info("Enabled lyrics providers", "providers", enabledProviders, "color", "blue")
 
 	// Get total track count for progress reporting
-	totalTracks, err := t.service.library.GetTracksCount(ctx)
+	totalTracks, err := t.service.libraryRepo.GetTracksCount(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get tracks count: %w", err)
 	}
@@ -80,7 +80,7 @@ func (t *LyricsJobTask) Execute(ctx context.Context, job *music.Job, progressUpd
 		}
 
 		// Get next batch of tracks
-		tracks, err := t.service.library.GetTracksPaginated(ctx, batchSize, offset)
+		tracks, err := t.service.libraryRepo.GetTracksPaginated(ctx, batchSize, offset)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get tracks batch (offset %d): %w", offset, err)
 		}
@@ -112,7 +112,7 @@ func (t *LyricsJobTask) Execute(ctx context.Context, job *music.Job, progressUpd
 
 			// Try to fetch lyrics for this track using the specified provider
 			job.Logger.Info("Fetching lyrics for track", "trackID", track.ID, "title", track.Title, "artist", track.Artists, "album", track.Album, "provider", provider, "color", "cyan")
-			err := t.service.lyricsService.AddLyrics(ctx, track.ID, provider)
+			err := t.service.AddLyrics(ctx, track.ID, provider)
 			if err != nil {
 				job.Logger.Error("Failed to add lyrics for track", "trackID", track.ID, "title", track.Title, "provider", provider, "error", err.Error(), "manual_fix", "<a href='/ui/library/tag/edit/"+track.ID+"' target='_blank'>track</a>")
 				errors++

src/features/analyze/routes.go

@@ -17,4 +17,11 @@ func RegisterRoutes(app *fiber.App, handler *Handler) {
 	// Library routes for lyrics
 	library := app.Group("/library")
 	library.Get("/tracks/:id/lyrics", handler.GetTrackLyrics)
+
+	// Analyze routes - lyrics analysis
+	analyze := app.Group("/analyze")
+	analyze.Post("/lyrics", handler.StartLyricsAnalysis)
+
+	// UI routes for lyrics analysis section
+	ui.Get("/analyze/lyrics", handler.RenderLyricsAnalysisSection)
 }