Enrich MonitorAlbum response, prevent duplicate downloads, recover orphaned jobs on startup

internal/service.go

@@ -297,13 +297,13 @@ func (service *MusicAgregatorService) MonitorAlbum(ctx context.Context, req *pb.
 		return nil, err
 	}
 
-	dbAlbum, _ := service.metadata.GetAlbumByExternalID(ctx, req.GetAlbumId())
+	dbAlbum, _ := service.metadata.GetAlbumByExternalID(ctx, album.GetId())
 	if dbAlbum != nil {
 		qualityStr := normalizeQuality(req.GetQuality(), 0, 0)
 		owned, err := service.downloads.HasAlbumInQuality(ctx, dbAlbum.ID, req.GetQuality().String(), qualityStr)
 		if err == nil && owned {
 			log.Info().Str("album", dbAlbum.Title).Str("quality", qualityStr).Msg("album already owned in requested quality")
-			return &pb.MonitorAlbumResponse{}, nil
+			return service.buildMonitorAlbumResponse(ctx, album, dbAlbum, nil), nil
 		}
 	}
 
@@ -317,7 +317,7 @@ func (service *MusicAgregatorService) MonitorAlbum(ctx context.Context, req *pb.
 	filtered := filterByQuality(parsed, req.GetQuality())
 	if len(filtered) == 0 {
 		log.Warn().Str("album", album.GetTitle()).Str("quality", req.GetQuality().String()).Msg("no releases match quality filter")
-		return &pb.MonitorAlbumResponse{}, nil
+		return service.buildMonitorAlbumResponse(ctx, album, dbAlbum, nil), nil
 	}
 
 	best := selectBestRelease(filtered)
@@ -326,15 +326,14 @@ func (service *MusicAgregatorService) MonitorAlbum(ctx context.Context, req *pb.
 		return nil, err
 	}
 
+	dbAlbum, _ = service.metadata.GetAlbumByExternalID(ctx, album.GetId())
 	if dbAlbum != nil {
 		service.saveTorrentAndDownload(ctx, dbAlbum.ID, best)
 	} else {
 		log.Warn().Str("album_id", req.GetAlbumId()).Msg("album not in DB, skipping torrent/download persistence")
 	}
 
-	return &pb.MonitorAlbumResponse{
-		Release: buildMonitoredRelease(best),
-	}, nil
+	return service.buildMonitorAlbumResponse(ctx, album, dbAlbum, &best), nil
 }
 
 func (service *MusicAgregatorService) searchIndexer(album *metadataPb.Album, tracker string) (*indexer.SearchResponse, error) {
@@ -515,6 +514,16 @@ func (service *MusicAgregatorService) saveTorrentAndDownload(ctx context.Context
 		return
 	}
 
+	existingDownloads, err := service.downloads.GetByAlbumID(ctx, dbAlbumID)
+	if err == nil {
+		for _, d := range existingDownloads {
+			if d.TorrentID == savedTorrent.ID && d.State != "failed" {
+				log.Info().Str("hash", best.rel.InfoHash).Str("state", d.State).Msg("active download already exists, skipping")
+				return
+			}
+		}
+	}
+
 	download := &database.Download{
 		TorrentID: savedTorrent.ID,
 		AlbumID:   dbAlbumID,
@@ -583,6 +592,68 @@ func buildMonitoredRelease(p parsedItem) *pb.MonitoredRelease {
 	}
 }
 
+func (service *MusicAgregatorService) buildMonitorAlbumResponse(ctx context.Context, metadataAlbum *metadataPb.Album, dbAlbum *database.Album, best *parsedItem) *pb.MonitorAlbumResponse {
+	resp := &pb.MonitorAlbumResponse{}
+
+	if best != nil {
+		resp.Release = buildMonitoredRelease(*best)
+	}
+
+	if dbAlbum != nil {
+		resp.Album = service.buildAlbumDetail(ctx, dbAlbum)
+	}
+
+	if len(metadataAlbum.GetArtists()) > 0 {
+		dbArtist, err := service.metadata.GetArtistByExternalID(ctx, metadataAlbum.GetArtists()[0].GetArtist().GetId())
+		if err == nil {
+			resp.Artist = &pb.ArtistSummary{
+				Id:           dbArtist.ID,
+				ExternalId:   dbArtist.ExternalID,
+				Name:         dbArtist.Name,
+				ArtistType:   dbArtist.ArtistType,
+				Country:      dbArtist.Country,
+				Genres:       dbArtist.Genres,
+				ImageUrl:     dbArtist.ImageURL,
+				MonitorState: toProtoMonitorState(dbArtist.MonitorState),
+			}
+		}
+	}
+
+	return resp
+}
+
+func (service *MusicAgregatorService) buildAlbumDetail(ctx context.Context, dbAlbum *database.Album) *pb.AlbumDetail {
+	detail := &pb.AlbumDetail{
+		Id:           dbAlbum.ID,
+		ExternalId:   dbAlbum.ExternalID,
+		Title:        dbAlbum.Title,
+		AlbumType:    dbAlbum.AlbumType,
+		TotalTracks:  int32(dbAlbum.TotalTracks),
+		TotalDiscs:   int32(dbAlbum.TotalDiscs),
+		Label:        dbAlbum.Label,
+		Genres:       dbAlbum.Genres,
+		CoverUrl:     dbAlbum.CoverURL,
+		MonitorState: toProtoMonitorState(dbAlbum.MonitorState),
+	}
+
+	if dbAlbum.ReleaseDate != nil {
+		detail.ReleaseDate = dbAlbum.ReleaseDate.Format("2006-01-02")
+	}
+
+	downloads, err := service.downloads.GetByAlbumID(ctx, dbAlbum.ID)
+	if err == nil && len(downloads) > 0 {
+		best := downloads[0]
+		detail.Download = &pb.DownloadInfo{
+			State:    best.State,
+			Format:   best.Format,
+			Quality:  best.Quality,
+			SavePath: best.SavePath,
+		}
+	}
+
+	return detail
+}
+
 func toProtoMonitorState(state database.MonitorState) pb.MonitorState {
 	switch state {
 	case database.Monitored: