Added display of notifications about successful and unsuccessful database updates; improved error handling when loading files and updating data;

Author: poimenov

img/screen.jpg

@@ -9,6 +9,7 @@
 @inject IOptions<AppSettings> options
 @inject IStringLocalizer<Settings> localizer
 @inject IAppStateService appStateService
+@inject IToastService toastService
 
 <FluentDesignTheme @bind-Mode="@Mode" @bind-OfficeColor="@OfficeColor" StorageName="theme" />
 
@@ -40,7 +41,7 @@
                     <OptionTemplate>@context!.NativeName
                     </OptionTemplate>
                 </FluentSelect>
-                <div style="width: 250px;">(@localizer["LanguageAnnotation"])</div>
+                <div style="width: 250px;">@localizer["LanguageAnnotation"]</div>
             </FluentStack>
         </FluentGridItem>
 
@@ -113,7 +114,15 @@
     private async Task Update()
     {
         loading = true;
-        await dbUpdateService.UpdateDatabaseAsync();
+        if (await dbUpdateService.UpdateDatabaseAsync())
+        {
+            toastService.ShowSuccess(localizer["DataBaseUpdateSuccess"]);
+        }
+        else
+        {
+            toastService.ShowError(localizer["DataBaseUpdateFailed"]);
+        }
+
         loading = false;
     }
 

src/Components/Pages/Settings.razor

@@ -20,11 +20,12 @@ public DataLoader(ILogger<DataLoader> logger, IOptions<AppSettings> options, IDa
         _appSettings = options.Value;
         _databaseMigrator = databaseMigrator;
     }
-    public async Task LoadDataAsync(ParseResult result)
+    public async Task<bool> LoadDataAsync(ParseResult result)
     {
         _logger.LogInformation("Loading data started");
         var start = DateTime.Now;
         var favorites = Enumerable.Empty<int>();
+        var historyRecords = Enumerable.Empty<HistoryRecord>();
         var success = false;
         var sql = string.Empty;
         var filePath = Path.Combine(_appSettings.AppDataPath, Database.DB_FILE_NAME);
@@ -34,22 +35,46 @@ public async Task LoadDataAsync(ParseResult result)
             // backup database
             File.Copy(filePath, bakFilePath, true);
 
-            // select favorites and delete database
-            using (var db = new Database())
+            // select favorites, history and delete database
+            await using (var db = new Database())
             {
-                favorites = db.Stations.Where(s => s.IsFavorite).Select(s => s.Id).ToList();
-                db.Database.EnsureDeleted();
-            }
+                try
+                {
+                    favorites = await db.Stations.Where(s => s.IsFavorite).Select(s => s.Id).ToListAsync();
+                    var migrationIds = await db.Database.SqlQueryRaw<string>("SELECT MigrationId FROM __EFMigrationsHistory").ToListAsync();
+                    if (migrationIds.Any(id => id.Contains("AddedHistory")))
+                    {
+                        historyRecords = await db.HistoryRecords.ToListAsync();
+                    }
 
-            Debug.WriteLine($"Database was backuped ({DateTime.Now - start})");
+                    Debug.WriteLine($"Database was backuped ({DateTime.Now - start})");
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex.Message);
+                    _logger.LogError(ex, "Failed to backup database");
+                    if (ex.InnerException != null)
+                    {
+                        Debug.WriteLine(ex.InnerException);
+                        _logger.LogError(ex.InnerException, ex.InnerException.Message);
+                    }
+
+                    return false;
+                }
+                finally
+                {
+                    await db.Database.EnsureDeletedAsync();
+                    await db.DisposeAsync();
+                }
+            }
         }
 
         _databaseMigrator.MigrateDatabase();
         Debug.WriteLine($"Database migrated ({DateTime.Now - start})");
 
-        using (var db = new Database())
+        await using (var db = new Database())
         {
-            using (var transaction = db.Database.BeginTransaction())
+            await using (var transaction = await db.Database.BeginTransactionAsync())
             {
                 try
                 {
@@ -130,6 +155,13 @@ public async Task LoadDataAsync(ParseResult result)
                     await db.SaveChangesAsync();
                     Debug.WriteLine($"Added station subgenres ({DateTime.Now - start})");
 
+                    if (historyRecords.Any())
+                    {
+                        await db.HistoryRecords.AddRangeAsync(historyRecords);
+                        await db.SaveChangesAsync();
+                        Debug.WriteLine($"Restored history records ({DateTime.Now - start})");
+                    }
+
                     await transaction.CommitAsync();
                     success = true;
                     _logger.LogInformation("Loading data completed");
@@ -152,5 +184,7 @@ public async Task LoadDataAsync(ParseResult result)
         {
             File.Copy(bakFilePath, filePath, true);
         }
+
+        return success;
     }
 }

src/DataAccess/DataLoader.cs

@@ -4,5 +4,5 @@ namespace PCRadio.DataAccess.Interfaces;
 
 public interface IDataLoader
 {
-    Task LoadDataAsync(ParseResult result);
+    Task<bool> LoadDataAsync(ParseResult result);
 }

src/DataAccess/Interfaces/IDataLoader.cs

@@ -82,10 +82,10 @@ public static void Main(string[] args)
         {
             var stopwatch = new Stopwatch();
             stopwatch.Start();
-            app.Services.GetRequiredService<IDbUpdateService>().UpdateDatabaseAsync().Wait();
+            var success = app.Services.GetRequiredService<IDbUpdateService>().UpdateDatabaseAsync().GetAwaiter().GetResult();
             stopwatch.Stop();
-            Debug.WriteLine($"Database update took {stopwatch.ElapsedMilliseconds} ms");
-            settings.NeedsDatabaseUpdate = false;
+            Debug.WriteLine($"Database update was {(success ? "successful" : "not successful")} and took {stopwatch.ElapsedMilliseconds} ms");
+            settings.NeedsDatabaseUpdate = !success;
             settings.Save();
         }
 

src/Program.cs

@@ -10,7 +10,7 @@
         <value>Color</value>
     </data>
     <data name="Language" xml:space="preserve">
-        <value>Language</value>
+        <value>Language *</value>
     </data> 
     <data name="Quality" xml:space="preserve">
         <value>Stream quality</value>
@@ -28,6 +28,12 @@
         <value>Update stations list</value>
     </data>              
     <data name="LanguageAnnotation" xml:space="preserve">
-        <value>changes will take effect after restart program</value>
-    </data>        
+        <value>* changes will take effect after restart program</value>
+    </data>  
+    <data name="DataBaseUpdateSuccess" xml:space="preserve">
+        <value>Database update completed successfully.</value>
+    </data>  
+    <data name="DataBaseUpdateFailed" xml:space="preserve">
+        <value>Database update failed. Details in the log. Please try again later.</value>
+    </data>
 </root>

src/Resources/Components/Pages/Settings.resx

@@ -10,7 +10,7 @@
         <value>Цвет</value>
     </data>
     <data name="Language" xml:space="preserve">
-        <value>Язык</value>
+        <value>Язык *</value>
     </data>
     <data name="Quality" xml:space="preserve">
         <value>Качество потока</value>
@@ -28,6 +28,12 @@
         <value>Обновить список станций</value>
     </data>                    
     <data name="LanguageAnnotation" xml:space="preserve">
-        <value>изменения вступят вступят силу после перезапуска программы</value>
-    </data>     
+        <value>* изменения вступят вступят силу после перезапуска программы</value>
+    </data> 
+    <data name="DataBaseUpdateSuccess" xml:space="preserve">
+        <value>Обновление базы данных успешно завершено.</value>
+    </data>  
+    <data name="DataBaseUpdateFailed" xml:space="preserve">
+        <value>Ошибка обновления базы данных. Подробности в логе. Повторите попытку позже.</value>
+    </data>    
 </root>

src/Resources/Components/Pages/Settings.ru-RU.resx

@@ -24,15 +24,15 @@ public async Task<string> ExtractArchiveAsync(string archivePath, string archive
 
         var outputPath = fi.FullName.Replace(fi.Extension, ".json");
 
-        using (ZipInputStream s = new ZipInputStream(fi.OpenRead()))
+        await using (ZipInputStream s = new ZipInputStream(fi.OpenRead()))
         {
             s.Password = archivePassword;
             ZipEntry theEntry;
             while ((theEntry = s.GetNextEntry()) != null)
             {
                 if (!string.IsNullOrEmpty(theEntry.Name) && theEntry.Name.EndsWith(".json"))
                 {
-                    using (FileStream streamWriter = File.Create(outputPath))
+                    await using (FileStream streamWriter = File.Create(outputPath))
                     {
                         int size = 2048;
                         byte[] data = new byte[2048];

src/Services/ArchiveExtractService.cs

@@ -26,18 +26,18 @@ public DbUpdateService(IOptions<AppSettings> options, ILogger<DbUpdateService> l
         _dataLoader = dataLoader;
     }
 
-    public async Task UpdateDatabaseAsync()
+    public async Task<bool> UpdateDatabaseAsync()
     {
         if (string.IsNullOrEmpty(_settings.ArchiveUrl))
         {
             _logger.LogWarning("ArchiveUrl is not set.");
-            return;
+            return false;
         }
 
         if (string.IsNullOrEmpty(_settings.ArchivePassword))
         {
             _logger.LogWarning("ArchivePassword is not set.");
-            return;
+            return false;
         }
 
         var filePath = Path.Combine(_settings.AppDataPath, FILE_NAME);
@@ -48,16 +48,28 @@ public async Task UpdateDatabaseAsync()
         }
 
         //download file
-        await _fileDownloadService.DownloadFileAsync(string.Format(_settings.ArchiveUrl, culture.TwoLetterISOLanguageName), filePath);
+        if (!await _fileDownloadService.DownloadFileAsync(string.Format(_settings.ArchiveUrl, culture.TwoLetterISOLanguageName), filePath))
+        {
+            _logger.LogError("Failed to download archive file.");
+            return false;
+        }
 
-        //extract file
-        var jsonFilePath = await _archiveExtractService.ExtractArchiveAsync(filePath, _settings.ArchivePassword);
+        try
+        {
+            //extract file
+            var jsonFilePath = await _archiveExtractService.ExtractArchiveAsync(filePath, _settings.ArchivePassword);
 
-        ///parse json
-        var parseResult = _parseJsonService.Parse(jsonFilePath);
+            ///parse json
+            var parseResult = await _parseJsonService.ParseAsync(jsonFilePath);
 
-        //load data
-        await _dataLoader.LoadDataAsync(parseResult);
+            //load data
+            return await _dataLoader.LoadDataAsync(parseResult);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to update database.");
+            return false;
+        }
     }
 
 }

src/Services/DbUpdateService.cs

@@ -16,22 +16,33 @@ public FileDownloadService(ILogger<FileDownloadService> logger, HttpClient httpC
         _httpClient = httpClient;
     }
 
-    public async Task DownloadFileAsync(string url, string filePath)
+    public async Task<bool> DownloadFileAsync(string url, string filePath)
     {
         _httpClient.DefaultRequestHeaders.Clear();
         _httpClient.DefaultRequestHeaders.Add(USER_AGENT_HEADER_NAME, USER_AGENT);
-        HttpResponseMessage response = await _httpClient.GetAsync(url);
-        if (response.IsSuccessStatusCode)
+        try
         {
-            using (Stream stream = await response.Content.ReadAsStreamAsync())
+            HttpResponseMessage response = await _httpClient.GetAsync(url);
+            if (response.IsSuccessStatusCode)
             {
-                using (FileStream fileStream = new FileStream(filePath, FileMode.Create))
+                using (Stream stream = await response.Content.ReadAsStreamAsync())
                 {
-                    await stream.CopyToAsync(fileStream);
+                    using (FileStream fileStream = new FileStream(filePath, FileMode.Create))
+                    {
+                        await stream.CopyToAsync(fileStream);
+                    }
+                    _logger.LogInformation("File downloaded successfully.");
+                    Debug.WriteLine("File downloaded successfully.");
+                    return true;
                 }
-                _logger.LogInformation("File downloaded successfully.");
-                Debug.WriteLine("File downloaded successfully.");
             }
         }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error downloading file.");
+            Debug.WriteLine($"Error downloading file: {ex.Message}");
+        }
+
+        return false;
     }
 }