Fix various download issues

Author: Xwilarg

downloader/Downloader/Models/ITabView.cs

@@ -5,4 +5,5 @@ namespace Downloader.Models;
 public interface ITabView
 {
     public void AfterInit();
+    public void OnDataRefresh();
 }

downloader/Downloader/ViewModels/ImportAlbumsViewModel.cs

@@ -6,13 +6,11 @@
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using System;
-using System.IO;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Web;
 using System.Windows.Input;
-using System.Xml.Linq;
 
 namespace Downloader.ViewModels;
 
@@ -31,32 +29,40 @@ public ImportAlbumsViewModel(MainViewModel mainViewModel)
             IsImporting = true;
             _ = Task.Run(async () =>
             {
+                string reqUrl;
+                LastFmApi json;
                 try
                 {
                     var songs = _mainViewModel.Data.Musics.Where(x => x.Album == null);
                     if (ImportLocalOnly)
                     {
                         songs = songs.Where(x => x.Source == "localfile");
                     }
+                    int i = 0;
+                    var songCount = songs.Count();
                     foreach (var s in songs)
                     {
-                        var reqUrl = $"https://ws.audioscrobbler.com/2.0/?method=track.getInfo&api_key={LastFmApiKey}&artist={HttpUtility.UrlEncode(s.Artist)}&track={HttpUtility.UrlEncode(s.Name)}&format=json";
-                        var json = JsonSerializer.Deserialize<LastFmApi>(await _mainViewModel.Client.GetStringAsync(reqUrl));
+                        reqUrl = $"https://ws.audioscrobbler.com/2.0/?method=track.getInfo&api_key={LastFmApiKey}&artist={HttpUtility.UrlEncode(s.Artist)}&track={HttpUtility.UrlEncode(s.Name)}&format=json";
+                        json = JsonSerializer.Deserialize<LastFmApi>(await _mainViewModel.Client.GetStringAsync(reqUrl), _mainViewModel.JsonOptions);
 
-                        if (json.Message != null && json.Track.Album != null && json.Track.Album.Image.Any())
+                        if (json.Message == null && json.Track.Album != null && json.Track.Album.Image.Any())
                         {
                             string album = json.Track.Album.Title;
                             var url = json.Track.Album.Image.Last().Text;
                             if (url != string.Empty)
                             {
                                 var path = _mainViewModel.GetAlbumName(s.Artist, album);
-                                if (_mainViewModel.Data.Albums.Any(x => x.Key == path))
+                                if (!_mainViewModel.Data.Albums.Any(x => x.Key == path))
                                 {
                                     await foreach (var prog in ProcessManager.DownloadImageAsync(_mainViewModel.Client, url, $"{_mainViewModel.DataFolderPath}/icon/{path}.png")) { }
+                                    s.Album = path;
                                     _mainViewModel.SaveImage(path, album, url);
                                 }
                             }
                         }
+
+                        i++;
+                        ImportAlbums = i / (float)songCount;
                     }
                 }
                 catch (Exception ex)
@@ -69,6 +75,9 @@ public ImportAlbumsViewModel(MainViewModel mainViewModel)
                 }
                 finally
                 {
+                    _mainViewModel.SaveData();
+                    UpdateAffectedFiles();
+                    ImportAlbums = 0f;
                     IsImporting = false;
                 }
             });
@@ -86,6 +95,11 @@ public void AfterInit()
         UpdateAffectedFiles();
     }
 
+    public void OnDataRefresh()
+    {
+        UpdateAffectedFiles();
+    }
+
     private MainViewModel _mainViewModel;
 
     public ICommand ImportAll { get; }

downloader/Downloader/ViewModels/ImportSongsViewModel.cs

@@ -137,10 +137,12 @@ private void UpdatePreview()
 
     public void AfterInit()
     {
-        ImportSong = 0;
         UpdatePreview();
     }
 
+    public void OnDataRefresh()
+    { }
+
     private string[] _allFiles = [];
     private string[] _songPreview = [];
 

downloader/Downloader/ViewModels/MainViewModel.cs

@@ -66,7 +66,7 @@ public MainViewModel()
                         ..DataImportChoices,
                         target.Path.LocalPath
                     ];
-                    DataImportIndex = files.Count - 1;
+                    DataImportIndex = DataImportChoices.Length - 1;
                 }
             }
         });
@@ -141,6 +141,11 @@ public void LateInit()
 
     public const string AudioFormat = "mp3";
 
+    public void SaveData()
+    {
+        File.WriteAllText(DataPath, JsonSerializer.Serialize(Data, JsonOptions));
+    }
+
     public void SaveImage(string key, string name, string source)
     {
         Data.Albums.Add(key, new()
@@ -221,8 +226,9 @@ public async ValueTask<bool> AddMusicAsync(string songName, string? source, stri
             fileMethod(normMusicPath, $"{DataFolderPath}/normalized/{outMusicPath}");
 
             // Update the JSON with all we did
-            File.WriteAllText(DataPath, JsonSerializer.Serialize(Data, JsonOptions));
+            SaveData();
             UpdateMainUI();
+            foreach (var view in Views) view.OnDataRefresh();
             return true;
         }
         catch (Exception ex)

downloader/Downloader/ViewModels/YoutubeDownloadViewModel.cs

@@ -179,6 +179,9 @@ public void AfterInit()
         ClearAll();
     }
 
+    public void OnDataRefresh()
+    { }
+
     public ICommand DownloadCmd { get; }
 
     private MainViewModel _mainViewModel;