Release v39.1

app/Desktop/Common/DatabaseGui.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using Avalonia.Threading;
 using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
@@ -44,15 +42,10 @@ static class DatabaseGui {
 	}
 
 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
-		var prevSynchronizationContext = SynchronizationContext.Current;
-		SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-		var taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-		SynchronizationContext.SetSynchronizationContext(prevSynchronizationContext);
-		
 		IDatabaseFile? file = null;
 
 		try {
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks, taskScheduler);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -86,10 +86,13 @@ sealed class DatabasePageModel : BaseModel {
 	}
 
 	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
+		int total = paths.Length;
 
 		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
-			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
+			SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
+			SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
+			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, new SchemaUpgradeCallbacks(dialog, total));
+			SynchronizationContext.SetSynchronizationContext(prevSyncContext);
 
 			if (db == null) {
 				return false;

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -21,7 +21,7 @@ public static class LegacyArchiveImport {
 
 	public static async Task<bool> Read(Stream stream, IDatabaseFile db, FakeSnowflake fakeSnowflake, Func<Data.Server[], Task<Dictionary<Data.Server, ulong>?>> askForServerIds) {
 		var perf = Log.Start();
-		var root = await JsonSerializer.DeserializeAsync(stream, JsonElementContext.Default.JsonElement);
+		var root = await JsonSerializer.DeserializeAsync(stream, LegacyArchiveJsonContext.Default.JsonElement);
 
 		try {
 			var meta = root.RequireObject("meta");

app/Server/Database/Import/LegacyArchiveJsonContext.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace DHT.Utils.Http;
+namespace DHT.Server.Database.Import;
 
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase, GenerationMode = JsonSourceGenerationMode.Default)]
 [JsonSerializable(typeof(JsonElement))]
-public sealed partial class JsonElementContext : JsonSerializerContext {}
+sealed partial class LegacyArchiveJsonContext : JsonSerializerContext {}

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -18,7 +18,7 @@ namespace DHT.Server.Database.Sqlite;
 public sealed class SqliteDatabaseFile : IDatabaseFile {
 	private const int DefaultPoolSize = 5;
 
-	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks, TaskScheduler computeTaskResultScheduler) {
+	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
 		var connectionString = new SqliteConnectionStringBuilder {
 			DataSource = path,
 			Mode = SqliteOpenMode.ReadWriteCreate,
@@ -36,7 +36,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		}
 
 		if (wasOpened) {
-			return new SqliteDatabaseFile(path, pool, computeTaskResultScheduler);
+			return new SqliteDatabaseFile(path, pool);
 		}
 		else {
 			pool.Dispose();
@@ -53,13 +53,13 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	private readonly AsyncValueComputer<long>.Single totalAttachmentsComputer;
 	private readonly AsyncValueComputer<long>.Single totalDownloadsComputer;
 
-	private SqliteDatabaseFile(string path, SqliteConnectionPool pool, TaskScheduler computeTaskResultScheduler) {
+	private SqliteDatabaseFile(string path, SqliteConnectionPool pool) {
 		this.log = Log.ForType(typeof(SqliteDatabaseFile), System.IO.Path.GetFileName(path));
 		this.pool = pool;
 
-		this.totalMessagesComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateMessageStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeMessageStatistics);
-		this.totalAttachmentsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateAttachmentStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeAttachmentStatistics);
-		this.totalDownloadsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateDownloadStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeDownloadStatistics);
+		this.totalMessagesComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateMessageStatistics).WithOutdatedResults().BuildWithComputer(ComputeMessageStatistics);
+		this.totalAttachmentsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateAttachmentStatistics).WithOutdatedResults().BuildWithComputer(ComputeAttachmentStatistics);
+		this.totalDownloadsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateDownloadStatistics).WithOutdatedResults().BuildWithComputer(ComputeDownloadStatistics);
 
 		this.Path = path;
 		this.Statistics = new DatabaseStatistics();

app/Server/Endpoints/BaseEndpoint.cs

@@ -60,10 +60,6 @@ abstract class BaseEndpoint {
 	protected abstract Task<IHttpOutput> Respond(HttpContext ctx);
 
 	protected static async Task<JsonElement> ReadJson(HttpContext ctx) {
-		try {
-			return await ctx.Request.ReadFromJsonAsync(JsonElementContext.Default.JsonElement);
-		} catch (JsonException) {
-			throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
-		}
+		return await ctx.Request.ReadFromJsonAsync<JsonElement?>() ?? throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
 	}
 }