Small fixes for UpdateDeezer command

Author: MusicMoveArr

MiniMediaScanner/Callbacks/UpdateDeezerCallback.cs

@@ -44,4 +44,6 @@ public UpdateDeezerCallback(
         this.ArtistId = artistId;
         this.Status = status;
     }
+
+    public string UpdateKey => $"{ArtistId}{ArtistName}";
 }

MiniMediaScanner/Commands/UpdateDeezerCommandHandler.cs

@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using MiniMediaScanner.Callbacks.Status;
 using MiniMediaScanner.Helpers;
 using MiniMediaScanner.Repositories;
@@ -52,53 +53,65 @@ await _deezerService.UpdateArtistByNameAsync(artistName, callback =>
 
     public async Task UpdateAllDeezerArtistsAsync()
     {
-        
-        await AnsiConsole.Status()
-            .Spinner(Spinner.Known.Dots)
-            .StartAsync(Markup.Escape($"Updating all Deezer Artist..."), async ctx =>
+        await AnsiConsole.Progress()
+            .HideCompleted(true)
+            .AutoClear(true)
+            .Columns(new ProgressColumn[]
+            {
+                new TaskDescriptionColumn()
+                {
+                    Alignment = Justify.Left
+                },
+                new ProgressBarColumn(),
+                new PercentageColumn(),
+                new RemainingTimeColumn(),
+            })
+            .StartAsync(async ctx =>
             {
                 await _deezerService.PrepareProxiesAsync();
-
-                int offset = 0;
-
-                while (true)
+                
+                var artistIds = await _deezerRepository.GetAllDeezerArtistIdsAsync();
+                
+                await ParallelHelper.ForEachAsync(artistIds, _threads, async artistId =>
                 {
-                    var artistIds = await _deezerRepository.GetAllDeezerArtistIdsAsync(offset);
-                    offset += DeezerRepository.PagingSize;
-
-                    if (artistIds.Count == 0)
-                    {
-                        break;
-                    }
+                    ConcurrentDictionary<string, ProgressTask> tasks = new ConcurrentDictionary<string, ProgressTask>();
 
-                    await ParallelHelper.ForEachAsync(artistIds, _threads, async artistId =>
+                    try
                     {
-                        try
+                        await _deezerService.UpdateArtistByIdAsync(artistId, callback =>
                         {
-                            await _deezerService.UpdateArtistByIdAsync(artistId, callback =>
+                            if (callback.Status == UpdateDeezerStatus.Updating)
                             {
-                                if (callback.Status == UpdateDeezerStatus.Updating)
+                                if (string.IsNullOrWhiteSpace(callback.ExtraInfo))
                                 {
-                                    if (string.IsNullOrWhiteSpace(callback.ExtraInfo))
-                                    {
-                                        AnsiConsole.WriteLine(Markup.Escape(
-                                            $"Importing Album '{callback.AlbumName}', Artist '{callback.ArtistName}'"));
-                                    }
-
-                                    ctx.Status(Markup.Escape($"Updating Deezer Artist '{callback.ArtistName}' Albums {callback.Progress} of {callback.AlbumCount}{callback.ExtraInfo}"));
+                                    AnsiConsole.WriteLine(Markup.Escape($"Importing Album '{callback.AlbumName}', Artist '{callback.ArtistName}'"));
                                 }
-                                else if(callback.Status == UpdateDeezerStatus.SkippedSyncedWithin)
+                                
+                                if (!tasks.ContainsKey(callback.UpdateKey))
                                 {
-                                    AnsiConsole.WriteLine(Markup.Escape($"Skipped synchronizing for Deezer ArtistId '{callback?.ArtistId}' synced already within {_deezerService.PreventUpdateWithinDays}days"));
+                                    tasks.TryAdd(callback.UpdateKey, ctx.AddTask(Markup.Escape($"Updating Deezer Artist '{callback.ArtistName}'")));
                                 }
-                            });
-                        }
-                        catch (Exception e)
-                        {
-                            Console.WriteLine(e.Message);
-                        }
-                    });
-                }
+                                
+                                ProgressTask? task = tasks[callback.UpdateKey];
+                                
+                                if (task != null)
+                                {
+                                    task.MaxValue = callback.AlbumCount;
+                                    task.Value = callback.Progress;
+                                    task.Description = Markup.Escape( $"Updating Deezer Artist '{callback.ArtistName}' Albums {callback.Progress} of {callback.AlbumCount}{callback.ExtraInfo}");
+                                }
+                            }
+                            else if(callback.Status == UpdateDeezerStatus.SkippedSyncedWithin)
+                            {
+                                AnsiConsole.WriteLine(Markup.Escape($"Skipped synchronizing for Deezer ArtistId '{callback?.ArtistId}' synced already within {_deezerService.PreventUpdateWithinDays}days"));
+                            }
+                        });
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                });
             });
     }
 }

MiniMediaScanner/Models/Deezer/DeezerTrackDbModel.cs

@@ -7,6 +7,7 @@ public class DeezerTrackDbModel
     public long AlbumId { get; set; }
     public int DiscNumber { get; set; }
     public TimeSpan Duration { get; set; }
+    public string Preview { get; set; }
     public bool ExplicitLyrics { get; set; }
     public string TrackHref { get; set; }
     public int TrackPosition { get; set; }

MiniMediaScanner/Repositories/DeezerRepository.cs

@@ -147,21 +147,16 @@ from deezer_track track
         return tracks;
     }
 
-    public async Task<List<int>> GetAllDeezerArtistIdsAsync(int offset)
+    public async Task<List<int>> GetAllDeezerArtistIdsAsync()
     {
         string query = @"SELECT artistid FROM deezer_artist 
-                         order by name asc 
-                         offset @offset
-                         limit @PagingSize";
+                         order by lastsynctime asc, nbalbum asc";
 
         await using var conn = new NpgsqlConnection(_connectionString);
 
         return (await conn
-                .QueryAsync<int>(query, param: new
-                {
-                    offset,
-                    PagingSize
-                }))
+                .QueryAsync<int>(query))
             .ToList();
     }
+    
 }