Merge 6c0e0ff697 into 45593cb140

app/Desktop/Arguments.cs

@@ -69,7 +69,7 @@ sealed class Arguments {
 						Log.Warn("Invalid concurrent downloads count: " + value);
 					}
 					else if (concurrentDownloads > 10) {
-						Log.Warn("Limiting concurrent downloads to 10.");
+						Log.Warn("Limiting concurrent downloads to 10");
 						ConcurrentDownloads = 10;
 					}
 					else {

app/Desktop/Common/DatabaseGui.cs

@@ -52,7 +52,7 @@ static class DatabaseGui {
 		} catch (DatabaseTooNewException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
 		} catch (Exception ex) {
-			Log.Error("Could not open database file: " + path, ex);
+			Log.Error(ex);
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
 		}
 		

app/Desktop/Discord/DiscordAppSettings.cs

@@ -42,7 +42,8 @@ static class DiscordAppSettings {
 			JsonObject settingsJson = await ReadSettingsJson();
 			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
+			Log.Error("Cannot read settings file.");
+			Log.Error(e);
 			return null;
 		}
 	}
@@ -61,7 +62,7 @@ static class DiscordAppSettings {
 		} catch (JsonException) {
 			return SettingsJsonResult.InvalidJson;
 		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
+			Log.Error(e);
 			return SettingsJsonResult.ReadError;
 		}
 		
@@ -83,14 +84,16 @@ static class DiscordAppSettings {
 			
 			await WriteSettingsJson(json);
 		} catch (Exception e) {
-			Log.Error("Could not write settings file.", e);
+			Log.Error("An error occurred when writing settings file.");
+			Log.Error(e);
 			
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
 					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
-					Log.Error("Could not restore settings file from backup.", e2);
+					Log.Error("Cannot restore settings file from backup.");
+					Log.Error(e2);
 				}
 			}
 			
@@ -100,7 +103,8 @@ static class DiscordAppSettings {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-			Log.Error("Could not delete backup file.", e);
+			Log.Error("Cannot delete backup file.");
+			Log.Error(e);
 		}
 		
 		return SettingsJsonResult.Success;

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -109,7 +109,8 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
 			});
 		} catch (Exception e) {
-			Log.Error("Could not save download filter settings.", e);
+			Log.Error("Could not save download filter settings");
+			Log.Error(e);
 		}
 	}
 	

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -62,7 +62,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		try {
 			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
 		} catch (Exception e) {
-			Log.Error("Could not start internal server.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
 		}
 		
@@ -76,7 +76,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		try {
 			await server.Stop();
 		} catch (Exception e) {
-			Log.Error("Could not stop internal server.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
 		}
 		

app/Desktop/Main/MainWindowModel.cs

@@ -89,21 +89,14 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		try {
 			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
 		} catch (Exception ex) {
-			Log.Error("Could not start internal server.", ex);
+			Log.Error(ex);
 			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 		}
 		
-		try {
+		mainContentScreenModel = new MainContentScreenModel(window, state);
-			mainContentScreenModel = new MainContentScreenModel(window, state);
+		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-			mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
+		
-			await mainContentScreenModel.Initialize();
+		await mainContentScreenModel.Initialize();
-		} catch (Exception ex) {
-			Log.Error("Could not initialize content screen.", ex);
-			await Dialog.ShowOk(window, "Initialization Error", ex.Message);
-			await DisposeContent();
-			await DisposeState();
-			return;
-		}
 		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -84,7 +84,7 @@ sealed class DatabasePageModel {
 		try {
 			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
 		} catch (Exception e) {
-			Log.Error("Could not merge databases.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
 			return;
 		}
@@ -160,7 +160,7 @@ sealed class DatabasePageModel {
 		try {
 			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
 		} catch (Exception e) {
-			Log.Error("Could not import legacy archives.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
 			return;
 		}
@@ -236,7 +236,7 @@ sealed class DatabasePageModel {
 					++successful;
 				}
 			} catch (Exception ex) {
-				Log.Error("Could not import file: " + path, ex);
+				Log.Error(ex);
 				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
@@ -302,7 +302,7 @@ sealed class DatabasePageModel {
 		try {
 			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
 		} catch (Exception e) {
-			Log.Error("Could not vacuum database.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
 			return;
 		}

app/Desktop/Main/Pages/DebugPage.axaml

@@ -45,8 +45,5 @@
                 </StackPanel>
             </WrapPanel>
         </Expander>
-        <Expander Header="About" IsExpanded="True">
-            <TextBlock Text="{Binding SqliteVersion, StringFormat=Sqlite Version: {0}}" />
-        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -9,18 +9,14 @@ using DHT.Desktop.Dialogs.Progress;
 using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class DebugPageModel {
+sealed class DebugPageModel {
 	public string GenerateChannels { get; set; } = "0";
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 	
-	[Notify(Setter.Private)]
-	private string? sqliteVersion = string.Empty;
-	
 	private readonly Window window;
 	private readonly State state;
 	
@@ -32,10 +28,6 @@ sealed partial class DebugPageModel {
 		this.state = state;
 	}
 	
-	public async Task Initialize() {
-		SqliteVersion = await state.Db.GetVersion() ?? "<unknown>";
-	}
-	
 	public async void OnClickAddRandomDataToDatabase() {
 		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
 			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
@@ -177,8 +169,6 @@ sealed class DebugPageModel {
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 
-	public string SqliteVersion => string.Empty;
-	
 	public void OnClickAddRandomDataToDatabase() {}
 }
 #endif

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -92,12 +92,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		await FilterModel.Initialize();
 		
 		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
-			try {
+			await StartDownload();
-				await StartDownload();
-			} catch (Exception e) {
-				Log.Error("Could not automatically start downloads.", e);
-				await Dialog.ShowOk(window, "Database Error", "Could not automatically start downloads: " + e.Message);
-			}
 		}
 	}
 	
@@ -116,43 +111,23 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	
 	public async Task OnClickToggleDownload() {
 		IsToggleDownloadButtonEnabled = false;
-		try {
+		
-			if (IsDownloading) {
+		if (IsDownloading) {
-				await StopDownload();
+			await StopDownload();
-			}
-			else {
-				try {
-					await StartDownload();
-				} catch (Exception e) {
-					Log.Error("Could not start downloads.", e);
-					await Dialog.ShowOk(window, "Database Error", "Could not start downloads: " + e.Message);
-					return;
-				}
-			}
-			
-			try {
-				await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
-			} catch (Exception e) {
-				Log.Error("Could not update auto-start setting in database.", e);
-			}
-		} finally {
-			IsToggleDownloadButtonEnabled = true;
 		}
+		else {
+			await StartDownload();
+		}
+		
+		await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
+		IsToggleDownloadButtonEnabled = true;
 	}
 	
 	private async Task StartDownload() {
 		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
 		
-		try {
+		IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
-			currentDownloadFilter = FilterModel.CreateFilter();
+		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
-			IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter);
-			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
-		} catch (Exception) {
-			finishedItemsSubscription?.Dispose();
-			finishedItemsSubscription = null;
-			currentDownloadFilter = null;
-			throw;
-		}
 		
 		OnDownloadStateChanged();
 	}
@@ -163,8 +138,8 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		
 		finishedItemsSubscription?.Dispose();
 		finishedItemsSubscription = null;
-		currentDownloadFilter = null;
 		
+		currentDownloadFilter = null;
 		OnDownloadStateChanged();
 	}
 	
@@ -180,12 +155,12 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	
 	public async Task OnClickRetryFailed() {
 		IsRetryingFailedDownloads = true;
+		
 		try {
 			await state.Db.Downloads.RetryFailed();
 			RecomputeDownloadStatistics();
 		} catch (Exception e) {
-			Log.Error("Could not retry failed downloads.", e);
+			Log.Error(e);
-			await Dialog.ShowOk(window, "Retry Failed", "Could not retry failed downloads: " + e.Message);
 		} finally {
 			IsRetryingFailedDownloads = false;
 		}
@@ -237,7 +212,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 				await state.Db.Vacuum();
 			});
 		} catch (Exception e) {
-			Log.Error("Could not delete orphaned downloads.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
 		}
 	}
@@ -264,7 +239,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 				return await exporter.Export(new ExportProgressReporter(callback));
 			});
 		} catch (Exception e) {
-			Log.Error("Could not export downloaded files.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
 			return;
 		}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -146,7 +146,7 @@ sealed partial class TrackingPageModel {
 			await clipboard.SetTextAsync(script);
 			return true;
 		} catch (Exception e) {
-			Log.Error("Could not copy to clipboard.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
 			return false;
 		}

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -75,7 +75,7 @@ sealed partial class ViewerPageModel : IDisposable {
 				}
 			}
 		} catch (Exception e) {
-			Log.Error("Could not apply filters.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -70,10 +70,6 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 	
 	public async Task Initialize() {
 		await DownloadsPageModel.Initialize();
-		
-		#if DEBUG
-		await DebugPageModel.Initialize();
-		#endif
 	}
 	
 	public async ValueTask DisposeAsync() {

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -131,7 +131,7 @@ sealed partial class WelcomeScreenModel {
 			await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
 			return;
 		} catch (Exception e) {
-			Log.Error("Could not check for updates.", e);
+			Log.Error(e);
 			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
 			return;
 		}

app/Resources/Tracker/scripts/discord.js

@@ -67,7 +67,7 @@ class DISCORD {
 	/**
 	 * @type {function(String): MessageData}
 	 */
-	static #getMessages = WEBPACK.findFunction("getMessages", [ "isLoadingMessages" ]);
+	static #getMessages = WEBPACK.findFunction("getMessages");
 	
 	/**
 	 * @type {function(String): void}

app/Resources/Tracker/scripts/webpack.js

@@ -88,7 +88,7 @@ class WEBPACK {
 			return modules[0];
 		}
 		
-		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length, modules);
+		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
 		return null;
 	}
 	

app/Server/Database/DummyDatabaseFile.cs

@@ -19,10 +19,6 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 	
 	private DummyDatabaseFile() {}
 	
-	public Task<string?> GetVersion() {
-		return Task.FromResult<string?>(null);
-	}
-	
 	public Task Vacuum() {
 		return Task.CompletedTask;
 	}

app/Server/Database/IDatabaseFile.cs

@@ -14,6 +14,5 @@ public interface IDatabaseFile : IAsyncDisposable {
 	IMessageRepository Messages { get; }
 	IDownloadRepository Downloads { get; }
 	
-	Task<string?> GetVersion();
 	Task Vacuum();
 }

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -80,11 +80,6 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		await pool.DisposeAsync();
 	}
 	
-	public async Task<string?> GetVersion() {
-		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT sqlite_version()", static reader => reader?.GetString(0));
-	}
-	
 	public async Task Vacuum() {
 		await using var conn = await pool.Take();
 		

app/Server/Download/DownloadExporter.cs

@@ -95,7 +95,7 @@ public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath
 				} catch (FileAlreadyExistsException) {
 					success = false;
 				} catch (Exception e) {
-					Log.Error("Could not export downloaded file: " + download.NormalizedUrl, e);
+					Log.Error(e);
 					success = false;
 				}
 				

app/Server/Download/DownloaderTask.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Reactive.Subjects;
 using System.Threading;
@@ -95,10 +94,12 @@ sealed class DownloaderTask : IAsyncDisposable {
 			} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
 				await db.Downloads.AddDownload(item.ToFailure(), stream: null);
 				log.Error("Download timed out: " + item.DownloadUrl);
+			} catch (HttpRequestException e) {
+				await db.Downloads.AddDownload(item.ToFailure(e.StatusCode), stream: null);
+				log.Error(e);
 			} catch (Exception e) {
-				HttpStatusCode? statusCode = e is HttpRequestException hre ? hre.StatusCode : null;
+				await db.Downloads.AddDownload(item.ToFailure(), stream: null);
-				await db.Downloads.AddDownload(item.ToFailure(statusCode), stream: null);
+				log.Error(e);
-				log.Error("Could not download file: " + item.DownloadUrl, e);
 			} finally {
 				try {
 					finishedItemPublisher.OnNext(item);

app/Server/Endpoints/BaseEndpoint.cs

@@ -33,7 +33,7 @@ abstract class BaseEndpoint {
 				await response.WriteAsync(e.Message);
 			}
 		} catch (Exception e) {
-			Log.Error("Could not handle request.", e);
+			Log.Error(e);
 			response.StatusCode = (int) HttpStatusCode.InternalServerError;
 		}
 	}

app/Server/Server.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
   

app/Server/Service/Middlewares/ServerLoggingMiddleware.cs

@@ -30,11 +30,11 @@ sealed class ServerLoggingMiddleware(RequestDelegate next) {
 		long elapsedMs = stopwatch.ElapsedMilliseconds;
 		
 		if (context.RequestAborted.IsCancellationRequested) {
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms.");
+			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
 		}
 		else {
 			int responseStatus = context.Response.StatusCode;
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms.");
+			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
 		}
 	}
 }

app/Server/Service/ServerManager.cs

@@ -88,7 +88,7 @@ public sealed class ServerManager {
 			throw;
 		}
 		
-		Log.Info("Server started.");
+		Log.Info("Server started");
 		
 		server = newServer;
 		
@@ -104,7 +104,7 @@ public sealed class ServerManager {
 		
 		Log.Info("Stopping server...");
 		await server.StopAsync();
-		Log.Info("Server stopped.");
+		Log.Info("Server stopped");
 		
 		server.Dispose();
 		server = null;

app/Utils/Logging/Log.cs

@@ -88,11 +88,6 @@ public sealed class Log {
 		LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
 	}
 	
-	public void Error(string message, Exception e) {
-		Error(message);
-		Error(e);
-	}
-	
 	public Perf Start(string? context = null, [CallerMemberName] string callerMemberName = "") {
 		return Perf.Start(this, context, callerMemberName);
 	}