mirror of
https://github.com/chylex/Discord-History-Tracker.git
synced 2025-09-17 16:24:47 +02:00
Compare commits
8 Commits
v45.0
...
e30b305eb5
Author | SHA1 | Date | |
---|---|---|---|
e30b305eb5
|
|||
fa17d0e224
|
|||
5741fad528
|
|||
e7c52fd1d5
|
|||
fb9b31175c
|
|||
f8e56ae367
|
|||
7ed31fbc8b
|
|||
e92aeb5a1b
|
@@ -13,6 +13,7 @@
|
||||
<entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
|
||||
<entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
|
||||
@@ -25,4 +26,4 @@
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
</project>
|
@@ -54,6 +54,22 @@
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
</Style>
|
||||
|
||||
<Style Selector="Panel.buttons">
|
||||
<Setter Property="Margin" Value="0 20 0 0" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.right">
|
||||
<Setter Property="HorizontalAlignment" Value="Right" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons Button">
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.left Button">
|
||||
<Setter Property="Margin" Value="0 0 8 0" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.right Button">
|
||||
<Setter Property="Margin" Value="8 0 0 0" />
|
||||
</Style>
|
||||
|
||||
</Application.Styles>
|
||||
|
||||
<Application.Resources>
|
||||
|
@@ -15,24 +15,6 @@
|
||||
<namespace:CheckBoxDialogModel />
|
||||
</Window.DataContext>
|
||||
|
||||
<Window.Styles>
|
||||
<Style Selector="Panel.buttons">
|
||||
<Setter Property="Margin" Value="0 20 0 0" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.right">
|
||||
<Setter Property="HorizontalAlignment" Value="Right" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons Button">
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.left Button">
|
||||
<Setter Property="Margin" Value="0 0 8 0" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.right Button">
|
||||
<Setter Property="Margin" Value="8 0 0 0" />
|
||||
</Style>
|
||||
</Window.Styles>
|
||||
|
||||
<StackPanel Margin="20">
|
||||
<ScrollViewer MaxHeight="400">
|
||||
<ItemsRepeater ItemsSource="{Binding Items}">
|
||||
|
@@ -8,6 +8,10 @@ using Avalonia.Platform.Storage;
|
||||
namespace DHT.Desktop.Dialogs.File;
|
||||
|
||||
static class FileDialogs {
|
||||
public static async Task<string[]> OpenFolders(this IStorageProvider storageProvider, FolderPickerOpenOptions options) {
|
||||
return (await storageProvider.OpenFolderPickerAsync(options)).ToLocalPaths();
|
||||
}
|
||||
|
||||
public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
|
||||
return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
|
||||
}
|
||||
@@ -26,11 +30,11 @@ static class FileDialogs {
|
||||
return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
|
||||
}
|
||||
|
||||
private static string ToLocalPath(this IStorageFile file) {
|
||||
return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
|
||||
private static string ToLocalPath(this IStorageItem itme) {
|
||||
return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
|
||||
}
|
||||
|
||||
private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
|
||||
return files.Select(ToLocalPath).ToArray();
|
||||
private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
|
||||
return items.Select(ToLocalPath).ToArray();
|
||||
}
|
||||
}
|
||||
|
@@ -20,24 +20,18 @@
|
||||
<Setter Property="FontSize" Value="15" />
|
||||
<Setter Property="TextWrapping" Value="Wrap" />
|
||||
</Style>
|
||||
<Style Selector="WrapPanel">
|
||||
<Setter Property="HorizontalAlignment" Value="Right" />
|
||||
<Setter Property="Margin" Value="0 8 0 0" />
|
||||
</Style>
|
||||
<Style Selector="Button">
|
||||
<Setter Property="Margin" Value="8 0 0 0" />
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
</Style>
|
||||
</Window.Styles>
|
||||
|
||||
<StackPanel Margin="20">
|
||||
<TextBlock Text="{Binding Message}" />
|
||||
<WrapPanel>
|
||||
<Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
|
||||
<Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
|
||||
<Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
|
||||
<Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
|
||||
</WrapPanel>
|
||||
<Panel Classes="buttons">
|
||||
<WrapPanel Classes="right">
|
||||
<Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
|
||||
<Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
|
||||
<Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
|
||||
<Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
|
||||
</WrapPanel>
|
||||
</Panel>
|
||||
</StackPanel>
|
||||
|
||||
</Window>
|
||||
|
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
|
||||
namespace DHT.Desktop.Dialogs.Progress;
|
||||
|
||||
interface IProgressCallback {
|
||||
Task Update(string message, int finishedItems, int totalItems);
|
||||
Task Update(string message, long finishedItems, long totalItems);
|
||||
Task UpdateIndeterminate(string message);
|
||||
Task Hide();
|
||||
}
|
||||
|
@@ -2,7 +2,6 @@ using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
using DHT.Desktop.Dialogs.Message;
|
||||
using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Desktop.Dialogs.Progress;
|
||||
@@ -12,57 +11,37 @@ public sealed partial class ProgressDialog : Window {
|
||||
private static readonly Log Log = Log.ForType<ProgressDialog>();
|
||||
|
||||
internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
|
||||
var taskCompletionSource = new TaskCompletionSource();
|
||||
var dialog = new ProgressDialog();
|
||||
|
||||
dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
|
||||
try {
|
||||
await action(dialog, callbacks[0]);
|
||||
taskCompletionSource.SetResult();
|
||||
} catch (Exception e) {
|
||||
taskCompletionSource.SetException(e);
|
||||
}
|
||||
});
|
||||
|
||||
dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
|
||||
await dialog.ShowProgressDialog(owner);
|
||||
await taskCompletionSource.Task;
|
||||
}
|
||||
|
||||
internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
|
||||
var taskCompletionSource = new TaskCompletionSource();
|
||||
var dialog = new ProgressDialog();
|
||||
|
||||
dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
|
||||
await callbacks[0].UpdateIndeterminate(message);
|
||||
try {
|
||||
await action(dialog);
|
||||
taskCompletionSource.SetResult();
|
||||
} catch (Exception e) {
|
||||
taskCompletionSource.SetException(e);
|
||||
}
|
||||
});
|
||||
|
||||
await dialog.ShowProgressDialog(owner);
|
||||
await taskCompletionSource.Task;
|
||||
}
|
||||
|
||||
internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
|
||||
internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
|
||||
var taskCompletionSource = new TaskCompletionSource<T>();
|
||||
var dialog = new ProgressDialog();
|
||||
|
||||
dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
|
||||
await callbacks[0].UpdateIndeterminate(message);
|
||||
try {
|
||||
taskCompletionSource.SetResult(await action(dialog));
|
||||
} catch (Exception e) {
|
||||
taskCompletionSource.SetException(e);
|
||||
}
|
||||
taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
|
||||
});
|
||||
|
||||
await dialog.ShowProgressDialog(owner);
|
||||
return await taskCompletionSource.Task;
|
||||
}
|
||||
|
||||
internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
|
||||
return Show(owner, title, async (dialog, callback) => {
|
||||
await callback.UpdateIndeterminate(message);
|
||||
await action(dialog);
|
||||
});
|
||||
}
|
||||
|
||||
internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
|
||||
return Show<T>(owner, title, async (dialog, callback) => {
|
||||
await callback.UpdateIndeterminate(message);
|
||||
return await action(dialog);
|
||||
});
|
||||
}
|
||||
|
||||
private bool isFinished = false;
|
||||
private Task progressTask = Task.CompletedTask;
|
||||
|
||||
@@ -88,11 +67,6 @@ public sealed partial class ProgressDialog : Window {
|
||||
|
||||
public async Task ShowProgressDialog(Window owner) {
|
||||
await ShowDialog(owner);
|
||||
try {
|
||||
await progressTask;
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(owner, "Unexpected Error", e.Message);
|
||||
}
|
||||
await progressTask;
|
||||
}
|
||||
}
|
||||
|
@@ -38,7 +38,7 @@ sealed class ProgressDialogModel {
|
||||
this.item = item;
|
||||
}
|
||||
|
||||
public async Task Update(string message, int finishedItems, int totalItems) {
|
||||
public async Task Update(string message, long finishedItems, long totalItems) {
|
||||
await Dispatcher.UIThread.InvokeAsync(() => {
|
||||
item.Message = message;
|
||||
item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
|
||||
|
@@ -23,7 +23,7 @@ sealed partial class ProgressItem : ObservableObject {
|
||||
private string items = "";
|
||||
|
||||
[ObservableProperty]
|
||||
private int progress = 0;
|
||||
private long progress = 0L;
|
||||
|
||||
[ObservableProperty]
|
||||
private bool isIndeterminate;
|
||||
|
@@ -15,19 +15,6 @@
|
||||
<namespace:TextBoxDialogModel />
|
||||
</Window.DataContext>
|
||||
|
||||
<Window.Styles>
|
||||
<Style Selector="Panel.buttons">
|
||||
<Setter Property="Margin" Value="0 20 0 0" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons > WrapPanel.right">
|
||||
<Setter Property="HorizontalAlignment" Value="Right" />
|
||||
</Style>
|
||||
<Style Selector="Panel.buttons Button">
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
<Setter Property="Margin" Value="8 0 0 0" />
|
||||
</Style>
|
||||
</Window.Styles>
|
||||
|
||||
<StackPanel Margin="20">
|
||||
<ScrollViewer MaxHeight="400">
|
||||
<StackPanel Spacing="10">
|
||||
|
57
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml
Normal file
57
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml
Normal file
@@ -0,0 +1,57 @@
|
||||
<Window xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:namespace="clr-namespace:DHT.Desktop.Main.Dialogs"
|
||||
mc:Ignorable="d" d:DesignWidth="450"
|
||||
x:Class="DHT.Desktop.Main.Dialogs.NewDatabaseSettingsDialog"
|
||||
x:DataType="namespace:NewDatabaseSettingsDialogModel"
|
||||
Title="New Database Settings"
|
||||
Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
|
||||
Closing="OnClosing"
|
||||
Width="450" SizeToContent="Height" CanResize="False"
|
||||
WindowStartupLocation="CenterOwner">
|
||||
|
||||
<Window.DataContext>
|
||||
<namespace:NewDatabaseSettingsDialogModel />
|
||||
</Window.DataContext>
|
||||
|
||||
<Window.Styles>
|
||||
<Style Selector="Label > StackPanel">
|
||||
<Setter Property="Margin" Value="0 4 0 0" />
|
||||
<Setter Property="Orientation" Value="Vertical" />
|
||||
<Setter Property="Spacing" Value="5" />
|
||||
</Style>
|
||||
<Style Selector="TextBlock.dim">
|
||||
<Setter Property="Foreground" Value="DimGray" />
|
||||
<Setter Property="FontSize" Value="13" />
|
||||
</Style>
|
||||
</Window.Styles>
|
||||
|
||||
<StackPanel Orientation="Vertical" Margin="20">
|
||||
<StackPanel Orientation="Vertical" Spacing="15">
|
||||
<CheckBox IsChecked="{Binding SeparateFileForDownloads}">
|
||||
<Label>
|
||||
<StackPanel>
|
||||
<TextBlock>Use a Separate Database File for Downloads</TextBlock>
|
||||
<TextBlock Classes="dim">Downloaded files will be stored separately from messages. This cannot be changed later.</TextBlock>
|
||||
</StackPanel>
|
||||
</Label>
|
||||
</CheckBox>
|
||||
<CheckBox IsChecked="{Binding DownloadsAutoStart}">
|
||||
<Label>
|
||||
<StackPanel>
|
||||
<TextBlock>Download Files Automatically</TextBlock>
|
||||
<TextBlock Classes="dim">Enables automatic downloads of files hosted on Discord. This can be changed later in the Downloads tab.</TextBlock>
|
||||
</StackPanel>
|
||||
</Label>
|
||||
</CheckBox>
|
||||
</StackPanel>
|
||||
<Panel Classes="buttons">
|
||||
<WrapPanel Classes="right">
|
||||
<Button Click="ClickOk">OK</Button>
|
||||
</WrapPanel>
|
||||
</Panel>
|
||||
</StackPanel>
|
||||
|
||||
</Window>
|
22
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml.cs
Normal file
22
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
|
||||
namespace DHT.Desktop.Main.Dialogs;
|
||||
|
||||
[SuppressMessage("ReSharper", "MemberCanBeInternal")]
|
||||
public sealed partial class NewDatabaseSettingsDialog : Window {
|
||||
public NewDatabaseSettingsDialog() {
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void OnClosing(object? sender, WindowClosingEventArgs e) {
|
||||
if (!e.IsProgrammatic) {
|
||||
e.Cancel = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void ClickOk(object? sender, RoutedEventArgs e) {
|
||||
Close();
|
||||
}
|
||||
}
|
11
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs
Normal file
11
app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
namespace DHT.Desktop.Main.Dialogs;
|
||||
|
||||
sealed partial class NewDatabaseSettingsDialogModel : ObservableObject {
|
||||
[ObservableProperty]
|
||||
private bool separateFileForDownloads = true;
|
||||
|
||||
[ObservableProperty]
|
||||
private bool downloadsAutoStart = true;
|
||||
}
|
@@ -16,11 +16,5 @@
|
||||
<Expander Header="Internal Server Configuration" IsExpanded="True">
|
||||
<controls:ServerConfigurationPanel DataContext="{Binding ServerConfigurationModel}" />
|
||||
</Expander>
|
||||
<Expander Header="Database Tools" IsExpanded="True">
|
||||
<StackPanel Orientation="Vertical" Spacing="10">
|
||||
<TextBlock TextWrapping="Wrap">Recreates the database to remove any traces of deleted data, which frees up space and prevents forensic recovery.</TextBlock>
|
||||
<Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
|
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
using DHT.Desktop.Dialogs.Message;
|
||||
using DHT.Desktop.Dialogs.Progress;
|
||||
using DHT.Desktop.Main.Controls;
|
||||
using DHT.Server;
|
||||
|
||||
@@ -11,26 +8,14 @@ namespace DHT.Desktop.Main.Pages;
|
||||
sealed class AdvancedPageModel : IDisposable {
|
||||
public ServerConfigurationPanelModel ServerConfigurationModel { get; }
|
||||
|
||||
private readonly Window window;
|
||||
private readonly State state;
|
||||
|
||||
[Obsolete("Designer")]
|
||||
public AdvancedPageModel() : this(null!, State.Dummy) {}
|
||||
|
||||
public AdvancedPageModel(Window window, State state) {
|
||||
this.window = window;
|
||||
this.state = state;
|
||||
|
||||
ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
ServerConfigurationModel.Dispose();
|
||||
}
|
||||
|
||||
public async Task VacuumDatabase() {
|
||||
const string Title = "Vacuum Database";
|
||||
await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
|
||||
await Dialog.ShowOk(window, Title, "Done.");
|
||||
}
|
||||
}
|
||||
|
@@ -27,6 +27,12 @@
|
||||
<Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
|
||||
<Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
|
||||
</WrapPanel>
|
||||
<Expander Header="Advanced Tools" Margin="0 15 0 0">
|
||||
<StackPanel Orientation="Vertical" Spacing="10">
|
||||
<TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
|
||||
<Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
|
||||
</StackPanel>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
|
||||
</UserControl>
|
||||
|
@@ -19,6 +19,7 @@ using DHT.Server.Data;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Database.Import;
|
||||
using DHT.Server.Database.Sqlite.Schema;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages;
|
||||
@@ -54,11 +55,11 @@ sealed class DatabasePageModel {
|
||||
break;
|
||||
|
||||
case PlatformID.Unix:
|
||||
Process.Start("xdg-open", new string[] { folder });
|
||||
Process.Start("xdg-open", [ folder ]);
|
||||
break;
|
||||
|
||||
case PlatformID.MacOSX:
|
||||
Process.Start("open", new string[] { folder });
|
||||
Process.Start("open", [ folder ]);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -73,15 +74,28 @@ sealed class DatabasePageModel {
|
||||
|
||||
public async Task MergeWithDatabase() {
|
||||
string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
|
||||
if (paths.Length > 0) {
|
||||
await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
|
||||
if (paths.Length == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const string Title = "Database Merge";
|
||||
|
||||
ImportResult? result;
|
||||
try {
|
||||
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
|
||||
}
|
||||
|
||||
private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
|
||||
private static async Task<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
|
||||
var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
|
||||
|
||||
await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
|
||||
return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
|
||||
IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
|
||||
|
||||
if (db == null) {
|
||||
@@ -97,14 +111,11 @@ sealed class DatabasePageModel {
|
||||
});
|
||||
}
|
||||
|
||||
private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
|
||||
private readonly ProgressDialog dialog;
|
||||
private readonly int total;
|
||||
private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
|
||||
private bool? decision;
|
||||
|
||||
public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
|
||||
this.total = total;
|
||||
this.dialog = dialog;
|
||||
public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
|
||||
return Task.FromResult<InitialDatabaseSettings?>(null);
|
||||
}
|
||||
|
||||
public async Task<bool> CanUpgrade() {
|
||||
@@ -139,15 +150,28 @@ sealed class DatabasePageModel {
|
||||
AllowMultiple = true,
|
||||
});
|
||||
|
||||
if (paths.Length > 0) {
|
||||
await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
|
||||
if (paths.Length == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const string Title = "Legacy Archive Import";
|
||||
|
||||
ImportResult? result;
|
||||
try {
|
||||
result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
|
||||
}
|
||||
|
||||
private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
|
||||
private static async Task<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
|
||||
var fakeSnowflake = new FakeSnowflake();
|
||||
|
||||
await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
|
||||
return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
|
||||
await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
|
||||
return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
|
||||
@@ -191,7 +215,7 @@ sealed class DatabasePageModel {
|
||||
.ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
|
||||
}
|
||||
|
||||
private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
|
||||
private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
|
||||
int total = paths.Length;
|
||||
DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
|
||||
|
||||
@@ -203,7 +227,7 @@ sealed class DatabasePageModel {
|
||||
++finished;
|
||||
|
||||
if (!File.Exists(path)) {
|
||||
await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
|
||||
await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -213,19 +237,18 @@ sealed class DatabasePageModel {
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Log.Error(ex);
|
||||
await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
|
||||
await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
await callback.Update("Done", finished, total);
|
||||
|
||||
if (successful == 0) {
|
||||
await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
|
||||
await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
|
||||
return new ImportResult(oldStatistics, newStatistics, successful, total);
|
||||
}
|
||||
|
||||
private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
|
||||
@@ -239,7 +262,16 @@ sealed class DatabasePageModel {
|
||||
}
|
||||
}
|
||||
|
||||
private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
|
||||
private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
|
||||
|
||||
private static string GetImportDialogMessage(ImportResult? result, string itemName) {
|
||||
if (result == null) {
|
||||
return "Nothing was imported.";
|
||||
}
|
||||
|
||||
var oldStatistics = result.OldStatistics;
|
||||
var newStatistics = result.NewStatistics;
|
||||
|
||||
long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
|
||||
long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
|
||||
long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
|
||||
@@ -248,11 +280,11 @@ sealed class DatabasePageModel {
|
||||
var message = new StringBuilder();
|
||||
message.Append("Processed ");
|
||||
|
||||
if (successfulItems == totalItems) {
|
||||
message.Append(successfulItems.Pluralize(itemName));
|
||||
if (result.SuccessfulItems == result.TotalItems) {
|
||||
message.Append(result.SuccessfulItems.Pluralize(itemName));
|
||||
}
|
||||
else {
|
||||
message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
|
||||
message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
|
||||
}
|
||||
|
||||
message.Append(" and added:\n\n \u2022 ");
|
||||
@@ -263,4 +295,18 @@ sealed class DatabasePageModel {
|
||||
|
||||
return message.ToString();
|
||||
}
|
||||
|
||||
public async Task VacuumDatabase() {
|
||||
const string Title = "Vacuum Database";
|
||||
|
||||
try {
|
||||
await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
await Dialog.ShowOk(window, Title, "Done.");
|
||||
}
|
||||
}
|
||||
|
@@ -51,7 +51,7 @@ sealed class DebugPageModel {
|
||||
|
||||
private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
|
||||
int batchCount = (messageCount + BatchSize - 1) / BatchSize;
|
||||
await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, batchCount);
|
||||
await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
|
||||
|
||||
var rand = new Random();
|
||||
var server = new DHT.Server.Data.Server {
|
||||
|
@@ -33,8 +33,9 @@
|
||||
<StackPanel Orientation="Vertical">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
|
||||
<Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
|
||||
<Button Command="{Binding OnClickDeleteOrphanedDownloads}">Delete Orphaned Downloads</Button>
|
||||
<Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
|
||||
<Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
|
||||
<Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All</Button>
|
||||
</WrapPanel>
|
||||
<StackPanel Orientation="Vertical" Spacing="20" Margin="0 10 0 0">
|
||||
<controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
|
||||
|
@@ -4,9 +4,11 @@ using System.Collections.ObjectModel;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Platform.Storage;
|
||||
using Avalonia.ReactiveUI;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using DHT.Desktop.Common;
|
||||
using DHT.Desktop.Dialogs.File;
|
||||
using DHT.Desktop.Dialogs.Message;
|
||||
using DHT.Desktop.Dialogs.Progress;
|
||||
using DHT.Desktop.Main.Controls;
|
||||
@@ -33,6 +35,9 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
|
||||
[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
|
||||
private bool isRetryingFailedDownloads = false;
|
||||
|
||||
[ObservableProperty(Setter = Access.Private)]
|
||||
private bool hasSuccessfulDownloads;
|
||||
|
||||
[ObservableProperty(Setter = Access.Private)]
|
||||
[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
|
||||
private bool hasFailedDownloads;
|
||||
@@ -148,7 +153,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
|
||||
RecomputeDownloadStatistics();
|
||||
}
|
||||
|
||||
public async Task OnClickRetryFailedDownloads() {
|
||||
public async Task OnClickRetryFailed() {
|
||||
IsRetryingFailedDownloads = true;
|
||||
|
||||
try {
|
||||
@@ -165,48 +170,94 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
|
||||
downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
|
||||
}
|
||||
|
||||
private const string DeleteOrphanedDownloadsTitle = "Delete Orphaned Downloads";
|
||||
|
||||
public async Task OnClickDeleteOrphanedDownloads() {
|
||||
await ProgressDialog.Show(window, DeleteOrphanedDownloadsTitle, DeleteOrphanedDownloads);
|
||||
public async Task OnClickDeleteOrphaned() {
|
||||
const string Title = "Delete Orphaned Downloads";
|
||||
|
||||
try {
|
||||
await ProgressDialog.Show(window, Title, async (_, callback) => {
|
||||
await callback.UpdateIndeterminate("Searching for orphaned downloads...");
|
||||
|
||||
HashSet<string> reachableNormalizedUrls = [];
|
||||
HashSet<string> orphanedNormalizedUrls = [];
|
||||
|
||||
await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
|
||||
reachableNormalizedUrls.Add(download.NormalizedUrl);
|
||||
}
|
||||
|
||||
await foreach (Download download in state.Db.Downloads.Get()) {
|
||||
string normalizedUrl = download.NormalizedUrl;
|
||||
if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
|
||||
orphanedNormalizedUrls.Add(normalizedUrl);
|
||||
}
|
||||
}
|
||||
|
||||
if (orphanedNormalizedUrls.Count == 0) {
|
||||
await Dialog.ShowOk(window, Title, "No orphaned downloads found.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (await Dialog.ShowYesNo(window, Title, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
|
||||
return;
|
||||
}
|
||||
|
||||
await callback.UpdateIndeterminate("Deleting orphaned downloads...");
|
||||
await state.Db.Downloads.Remove(orphanedNormalizedUrls);
|
||||
RecomputeDownloadStatistics();
|
||||
|
||||
if (await Dialog.ShowYesNo(window, Title, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
|
||||
return;
|
||||
}
|
||||
|
||||
await callback.UpdateIndeterminate("Vacuuming database...");
|
||||
await state.Db.Vacuum();
|
||||
});
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task DeleteOrphanedDownloads(ProgressDialog dialog, IProgressCallback callback) {
|
||||
await callback.UpdateIndeterminate("Searching for orphaned downloads...");
|
||||
public async Task OnClickExportAll() {
|
||||
const string Title = "Export Downloaded Files";
|
||||
|
||||
HashSet<string> reachableNormalizedUrls = [];
|
||||
HashSet<string> orphanedNormalizedUrls = [];
|
||||
string[] folders = await window.StorageProvider.OpenFolders(new FolderPickerOpenOptions {
|
||||
Title = Title,
|
||||
AllowMultiple = false,
|
||||
});
|
||||
|
||||
await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
|
||||
reachableNormalizedUrls.Add(download.NormalizedUrl);
|
||||
}
|
||||
|
||||
await foreach (Download download in state.Db.Downloads.Get()) {
|
||||
string normalizedUrl = download.NormalizedUrl;
|
||||
if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
|
||||
orphanedNormalizedUrls.Add(normalizedUrl);
|
||||
}
|
||||
}
|
||||
|
||||
if (orphanedNormalizedUrls.Count == 0) {
|
||||
await Dialog.ShowOk(window, DeleteOrphanedDownloadsTitle, "No orphaned downloads found.");
|
||||
if (folders.Length != 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
|
||||
string folderPath = folders[0];
|
||||
|
||||
DownloadExporter exporter = new DownloadExporter(state.Db, folderPath);
|
||||
DownloadExporter.Result result;
|
||||
try {
|
||||
result = await ProgressDialog.Show(window, Title, async (_, callback) => {
|
||||
await callback.UpdateIndeterminate("Exporting downloaded files...");
|
||||
return await exporter.Export(new ExportProgressReporter(callback));
|
||||
});
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
await callback.UpdateIndeterminate("Deleting orphaned downloads...");
|
||||
await state.Db.Downloads.Remove(orphanedNormalizedUrls);
|
||||
RecomputeDownloadStatistics();
|
||||
string messageStart = "Exported " + result.SuccessfulCount.Pluralize("file");
|
||||
|
||||
if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
|
||||
return;
|
||||
if (result.FailedCount > 0L) {
|
||||
await Dialog.ShowOk(window, Title, messageStart + " (" + result.FailedCount.Format() + " failed).");
|
||||
}
|
||||
else {
|
||||
await Dialog.ShowOk(window, Title, messageStart + ".");
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class ExportProgressReporter(IProgressCallback callback) : DownloadExporter.IProgressReporter {
|
||||
public Task ReportProgress(long processedCount, long totalCount) {
|
||||
return callback.Update("Exporting downloaded files...", processedCount, totalCount);
|
||||
}
|
||||
|
||||
await callback.UpdateIndeterminate("Vacuuming database...");
|
||||
await state.Db.Vacuum();
|
||||
}
|
||||
|
||||
private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
|
||||
@@ -226,6 +277,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
|
||||
statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
|
||||
statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
|
||||
|
||||
HasSuccessfulDownloads = statusStatistics.SuccessfulCount > 0;
|
||||
HasFailedDownloads = statusStatistics.FailedCount > 0;
|
||||
}
|
||||
|
||||
|
@@ -61,18 +61,23 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
|
||||
}
|
||||
|
||||
public async Task OnClickApplyFiltersToDatabase() {
|
||||
MessageFilter filter = FilterModel.CreateFilter();
|
||||
long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
|
||||
|
||||
if (DatabaseToolFilterModeKeep) {
|
||||
if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
|
||||
await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
|
||||
try {
|
||||
MessageFilter filter = FilterModel.CreateFilter();
|
||||
long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
|
||||
|
||||
if (DatabaseToolFilterModeKeep) {
|
||||
if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
|
||||
await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (DatabaseToolFilterModeRemove) {
|
||||
if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
|
||||
await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
|
||||
else if (DatabaseToolFilterModeRemove) {
|
||||
if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
|
||||
await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -9,9 +9,10 @@ using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using DHT.Desktop.Common;
|
||||
using DHT.Desktop.Dialogs.Message;
|
||||
using DHT.Desktop.Dialogs.Progress;
|
||||
using DHT.Server.Data.Settings;
|
||||
using DHT.Desktop.Main.Dialogs;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Server.Database.Sqlite.Schema;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Desktop.Main.Screens;
|
||||
@@ -52,21 +53,22 @@ sealed partial class WelcomeScreenModel : ObservableObject {
|
||||
public async Task OpenOrCreateDatabaseFromPath(string path) {
|
||||
dbFilePath = path;
|
||||
|
||||
bool isNew = !File.Exists(path);
|
||||
|
||||
IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
|
||||
if (db == null) {
|
||||
return;
|
||||
if (db != null) {
|
||||
DatabaseSelected?.Invoke(this, db);
|
||||
}
|
||||
|
||||
if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
|
||||
await db.Settings.Set(SettingsKey.DownloadsAutoStart, value: true);
|
||||
}
|
||||
|
||||
DatabaseSelected?.Invoke(this, db);
|
||||
}
|
||||
|
||||
private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
|
||||
public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
|
||||
var model = new NewDatabaseSettingsDialogModel();
|
||||
|
||||
var dialog = new NewDatabaseSettingsDialog { DataContext = model };
|
||||
await dialog.ShowDialog(window);
|
||||
|
||||
return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
|
||||
}
|
||||
|
||||
public async Task<bool> CanUpgrade() {
|
||||
return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
|
||||
}
|
||||
@@ -110,38 +112,32 @@ sealed partial class WelcomeScreenModel : ObservableObject {
|
||||
}
|
||||
|
||||
public async Task CheckUpdates() {
|
||||
var latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
|
||||
var client = new HttpClient(new SocketsHttpHandler {
|
||||
AutomaticDecompression = DecompressionMethods.None,
|
||||
AllowAutoRedirect = false,
|
||||
UseCookies = false,
|
||||
string response;
|
||||
try {
|
||||
response = await ProgressDialog.ShowIndeterminate<string>(window, "Check Updates", "Checking for updates...", static async _ => {
|
||||
var client = new HttpClient(new SocketsHttpHandler {
|
||||
AutomaticDecompression = DecompressionMethods.None,
|
||||
AllowAutoRedirect = false,
|
||||
UseCookies = false,
|
||||
});
|
||||
|
||||
client.Timeout = TimeSpan.FromSeconds(30);
|
||||
client.MaxResponseContentBufferSize = 1024;
|
||||
client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
|
||||
|
||||
return await client.GetStringAsync(Program.Website + "/version");
|
||||
});
|
||||
|
||||
client.Timeout = TimeSpan.FromSeconds(30);
|
||||
client.MaxResponseContentBufferSize = 1024;
|
||||
client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
|
||||
|
||||
string response;
|
||||
try {
|
||||
response = await client.GetStringAsync(Program.Website + "/version");
|
||||
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
||||
await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
|
||||
return null;
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!System.Version.TryParse(response, out Version? latestVersion)) {
|
||||
await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
|
||||
return null;
|
||||
}
|
||||
|
||||
return latestVersion;
|
||||
});
|
||||
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
||||
await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
|
||||
return;
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (latestVersion == null) {
|
||||
if (!System.Version.TryParse(response, out Version? latestVersion)) {
|
||||
await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis;
|
||||
namespace DHT.Server.Data.Settings;
|
||||
|
||||
public static class SettingsKey {
|
||||
public static Bool SeparateFileForDownloads { get; } = new ("separate_file_for_downloads");
|
||||
public static Bool DownloadsAutoStart { get; } = new ("downloads_auto_start");
|
||||
public static Bool DownloadsLimitSize { get; } = new ("downloads_limit_size");
|
||||
public static UnsignedLong DownloadsMaximumSize { get; } = new ("downloads_maximum_size");
|
||||
|
@@ -20,7 +20,7 @@ public interface IDownloadRepository {
|
||||
|
||||
Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken = default);
|
||||
|
||||
IAsyncEnumerable<Data.Download> Get();
|
||||
IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter = null);
|
||||
|
||||
Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
|
||||
|
||||
@@ -51,7 +51,7 @@ public interface IDownloadRepository {
|
||||
return Task.FromResult(new DownloadStatusStatistics());
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<Data.Download> Get() {
|
||||
public IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
|
||||
return AsyncEnumerable.Empty<Data.Download>();
|
||||
}
|
||||
|
||||
|
@@ -18,6 +18,8 @@ namespace DHT.Server.Database.Sqlite.Repositories;
|
||||
sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRepository(Log), IDownloadRepository {
|
||||
private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
|
||||
|
||||
public const string Schema = "downloads";
|
||||
|
||||
internal sealed class NewDownloadCollector : IAsyncDisposable {
|
||||
private readonly SqliteDownloadRepository repository;
|
||||
private bool hasChanged = false;
|
||||
@@ -71,7 +73,25 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
}
|
||||
}
|
||||
|
||||
private static SqliteBlob BlobReference(ISqliteConnection conn, long rowid, bool readOnly) {
|
||||
string schema = conn.HasAttachedDatabase(Schema) ? Schema : "main";
|
||||
return new SqliteBlob(conn.InnerConnection, databaseName: schema, tableName: "download_blobs", columnName: "blob", rowid, readOnly);
|
||||
}
|
||||
|
||||
public async Task AddDownload(Data.Download item, Stream? stream) {
|
||||
ulong? actualSize;
|
||||
|
||||
if (stream is not null) {
|
||||
actualSize = (ulong) stream.Length;
|
||||
|
||||
if (actualSize != item.Size) {
|
||||
Log.Warn("Download size differs from its metadata - metadata size: " + item.Size + " B, actual size: " + actualSize + " B, url: " + item.NormalizedUrl);
|
||||
}
|
||||
}
|
||||
else {
|
||||
actualSize = item.Size;
|
||||
}
|
||||
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
|
||||
@@ -87,7 +107,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
metadataCmd.Set(":download_url", item.DownloadUrl);
|
||||
metadataCmd.Set(":status", (int) item.Status);
|
||||
metadataCmd.Set(":type", item.Type);
|
||||
metadataCmd.Set(":size", item.Size);
|
||||
metadataCmd.Set(":size", actualSize);
|
||||
await metadataCmd.ExecuteNonQueryAsync();
|
||||
|
||||
if (stream == null) {
|
||||
@@ -107,10 +127,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
);
|
||||
|
||||
upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
|
||||
upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
|
||||
upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, actualSize);
|
||||
long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
|
||||
|
||||
await using var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid);
|
||||
await using var blob = BlobReference(conn, rowid, readOnly: false);
|
||||
await stream.CopyToAsync(blob);
|
||||
}
|
||||
|
||||
@@ -181,10 +201,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
};
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Data.Download> Get() {
|
||||
public async IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata");
|
||||
await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata" + filter.GenerateConditions().BuildWhereClause());
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
||||
while (await reader.ReadAsync()) {
|
||||
@@ -214,7 +234,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
rowid = reader.GetInt64(0);
|
||||
}
|
||||
|
||||
await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
|
||||
await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
|
||||
await dataProcessor(blob);
|
||||
}
|
||||
|
||||
@@ -249,7 +269,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
rowid = reader.GetInt64(2);
|
||||
}
|
||||
|
||||
await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
|
||||
await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
|
||||
await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
|
||||
}
|
||||
|
||||
|
@@ -43,10 +43,14 @@ sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepo
|
||||
}
|
||||
|
||||
public async Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
|
||||
await using var conn = await pool.Take();
|
||||
return await Get(conn, key, defaultValue);
|
||||
}
|
||||
|
||||
public static async Task<T?> Get<T>(ISqliteConnection conn, SettingsKey<T> key, T? defaultValue) {
|
||||
string? value;
|
||||
|
||||
await using (var conn = await pool.Take()) {
|
||||
await using var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key");
|
||||
await using (var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key")) {
|
||||
cmd.AddAndSet(":key", SqliteType.Text, key.Key);
|
||||
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
@@ -1,9 +1,11 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Schema;
|
||||
|
||||
public interface ISchemaUpgradeCallbacks {
|
||||
Task<InitialDatabaseSettings?> GetInitialDatabaseSettings();
|
||||
Task<bool> CanUpgrade();
|
||||
Task Start(int versionSteps, Func<IProgressReporter, Task> doUpgrade);
|
||||
|
||||
|
@@ -1,42 +1,46 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data.Settings;
|
||||
using DHT.Server.Database.Repositories;
|
||||
using DHT.Server.Database.Sqlite.Repositories;
|
||||
using DHT.Server.Database.Sqlite.Schema;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
using Microsoft.Data.Sqlite;
|
||||
using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite;
|
||||
|
||||
public sealed class SqliteDatabaseFile : IDatabaseFile {
|
||||
private static readonly Log Log = Log.ForType<SqliteDatabaseFile>();
|
||||
|
||||
private const int DefaultPoolSize = 5;
|
||||
|
||||
public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
|
||||
var connectionString = new SqliteConnectionStringBuilder {
|
||||
DataSource = path,
|
||||
Mode = SqliteOpenMode.ReadWriteCreate,
|
||||
};
|
||||
var connectionString = new SqliteConnectionStringFactory(path);
|
||||
var attachedDatabaseCollector = new AttachedDatabaseCollector(path);
|
||||
|
||||
var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize);
|
||||
bool wasOpened;
|
||||
|
||||
try {
|
||||
await using var conn = await pool.Take();
|
||||
wasOpened = await new SqliteSchema(conn).Setup(schemaUpgradeCallbacks);
|
||||
} catch (Exception) {
|
||||
await pool.DisposeAsync();
|
||||
throw;
|
||||
await using (var conn = await CustomSqliteConnection.OpenUnpooled(connectionString)) {
|
||||
wasOpened = await new SqliteSchema(conn).Setup(attachedDatabaseCollector, schemaUpgradeCallbacks);
|
||||
}
|
||||
|
||||
if (wasOpened) {
|
||||
var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize, attachedDatabaseCollector);
|
||||
return new SqliteDatabaseFile(path, pool);
|
||||
}
|
||||
else {
|
||||
await pool.DisposeAsync();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class AttachedDatabaseCollector(string path) : ISqliteAttachedDatabaseCollector {
|
||||
public async IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn) {
|
||||
bool useSeparateFileForDownloads = await SqliteSettingsRepository.Get(conn, SettingsKey.SeparateFileForDownloads, defaultValue: false);
|
||||
if (useSeparateFileForDownloads) {
|
||||
yield return new AttachedDatabase(path + "_downloads", SqliteDownloadRepository.Schema);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string Path { get; }
|
||||
|
||||
public ISettingsRepository Settings => settings;
|
||||
@@ -78,6 +82,21 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
|
||||
|
||||
public async Task Vacuum() {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
Perf perf = Log.Start();
|
||||
await conn.ExecuteAsync("VACUUM");
|
||||
perf.Step("Vacuum main schema");
|
||||
|
||||
await VacuumAttachedDatabase(conn, perf, SqliteDownloadRepository.Schema);
|
||||
|
||||
perf.End();
|
||||
return;
|
||||
|
||||
static async Task VacuumAttachedDatabase(ISqliteConnection conn, Perf perf, string schema) {
|
||||
if (conn.HasAttachedDatabase(schema)) {
|
||||
await conn.ExecuteAsync("VACUUM " + schema);
|
||||
perf.Step("Vacuum " + schema + " schema");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,28 +1,32 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data.Settings;
|
||||
using DHT.Server.Database.Exceptions;
|
||||
using DHT.Server.Database.Sqlite.Repositories;
|
||||
using DHT.Server.Database.Sqlite.Schema;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
using DHT.Utils.Logging;
|
||||
using Microsoft.Data.Sqlite;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite;
|
||||
|
||||
sealed class SqliteSchema {
|
||||
sealed class SqliteSchema(CustomSqliteConnection conn) {
|
||||
internal const int Version = 10;
|
||||
|
||||
private static readonly Log Log = Log.ForType<SqliteSchema>();
|
||||
|
||||
private readonly ISqliteConnection conn;
|
||||
|
||||
public SqliteSchema(ISqliteConnection conn) {
|
||||
this.conn = conn;
|
||||
}
|
||||
|
||||
public async Task<bool> Setup(ISchemaUpgradeCallbacks callbacks) {
|
||||
public async Task<bool> Setup(ISqliteAttachedDatabaseCollector attachedDatabaseCollector, ISchemaUpgradeCallbacks callbacks) {
|
||||
await conn.ExecuteAsync("CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT)");
|
||||
|
||||
string? dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
|
||||
if (dbVersionStr == null) {
|
||||
if (await callbacks.GetInitialDatabaseSettings() is {} initialSettings) {
|
||||
await ApplyInitialSettings(initialSettings);
|
||||
await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
|
||||
}
|
||||
|
||||
await InitializeSchemas();
|
||||
}
|
||||
else if (!int.TryParse(dbVersionStr, out int dbVersion) || dbVersion < 1) {
|
||||
@@ -37,12 +41,44 @@ sealed class SqliteSchema {
|
||||
return false;
|
||||
}
|
||||
|
||||
await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
|
||||
await callbacks.Start(Version - dbVersion, async reporter => await UpgradeSchemas(dbVersion, reporter));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private async Task ApplyInitialSettings(InitialDatabaseSettings initialSettings) {
|
||||
await using var cmd = conn.Command("INSERT INTO metadata (key, value) VALUES (:key, :value)");
|
||||
cmd.Add("key", SqliteType.Text);
|
||||
cmd.Add("value", SqliteType.Text);
|
||||
|
||||
static async Task ApplySetting<T>(SqliteCommand cmd, SettingsKey<T> key, T value) {
|
||||
cmd.Set("key", key.Key);
|
||||
cmd.Set("value", key.ToString(value));
|
||||
await cmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
|
||||
if (initialSettings.SeparateFileForDownloads) {
|
||||
await ApplySetting(cmd, SettingsKey.SeparateFileForDownloads, value: true);
|
||||
}
|
||||
|
||||
if (initialSettings.DownloadsAutoStart) {
|
||||
await ApplySetting(cmd, SettingsKey.DownloadsAutoStart, value: true);
|
||||
}
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
|
||||
private async Task AttachAdditionalDatabasesIfNecessary(ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
|
||||
await foreach (var attachedDatabase in attachedDatabaseCollector.GetAttachedDatabases(conn)) {
|
||||
if (!File.Exists(attachedDatabase.Path)) {
|
||||
await using CustomSqliteConnection _ = await CustomSqliteConnection.OpenUnpooled(conn.ConnectionStringFactory with { Path = attachedDatabase.Path });
|
||||
}
|
||||
|
||||
await conn.AttachDatabase(attachedDatabase);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task InitializeSchemas() {
|
||||
await conn.ExecuteAsync("""
|
||||
CREATE TABLE users (
|
||||
@@ -142,23 +178,25 @@ sealed class SqliteSchema {
|
||||
}
|
||||
|
||||
internal static async Task CreateDownloadTables(ISqliteConnection conn) {
|
||||
await conn.ExecuteAsync("""
|
||||
CREATE TABLE download_metadata (
|
||||
normalized_url TEXT NOT NULL PRIMARY KEY,
|
||||
download_url TEXT NOT NULL,
|
||||
status INTEGER NOT NULL,
|
||||
type TEXT,
|
||||
size INTEGER
|
||||
)
|
||||
""");
|
||||
string schema = conn.HasAttachedDatabase(SqliteDownloadRepository.Schema) ? SqliteDownloadRepository.Schema : "main";
|
||||
|
||||
await conn.ExecuteAsync("""
|
||||
CREATE TABLE download_blobs (
|
||||
normalized_url TEXT NOT NULL PRIMARY KEY,
|
||||
blob BLOB NOT NULL,
|
||||
FOREIGN KEY (normalized_url) REFERENCES download_metadata (normalized_url) ON UPDATE CASCADE ON DELETE CASCADE
|
||||
)
|
||||
""");
|
||||
await conn.ExecuteAsync($"""
|
||||
CREATE TABLE {schema}.download_metadata (
|
||||
normalized_url TEXT NOT NULL PRIMARY KEY,
|
||||
download_url TEXT NOT NULL,
|
||||
status INTEGER NOT NULL,
|
||||
type TEXT,
|
||||
size INTEGER
|
||||
)
|
||||
""");
|
||||
|
||||
await conn.ExecuteAsync($"""
|
||||
CREATE TABLE {schema}.download_blobs (
|
||||
normalized_url TEXT NOT NULL PRIMARY KEY,
|
||||
blob BLOB NOT NULL,
|
||||
FOREIGN KEY (normalized_url) REFERENCES download_metadata (normalized_url) ON UPDATE CASCADE ON DELETE CASCADE
|
||||
)
|
||||
""");
|
||||
}
|
||||
|
||||
internal static async Task CreateMessageAttachmentsTable(ISqliteConnection conn) {
|
||||
|
3
app/Server/Database/Sqlite/Utils/AttachedDatabase.cs
Normal file
3
app/Server/Database/Sqlite/Utils/AttachedDatabase.cs
Normal file
@@ -0,0 +1,3 @@
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
sealed record AttachedDatabase(string Path, string Schema);
|
91
app/Server/Database/Sqlite/Utils/CustomSqliteConnection.cs
Normal file
91
app/Server/Database/Sqlite/Utils/CustomSqliteConnection.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using System;
|
||||
using System.Collections.Immutable;
|
||||
using System.Data.Common;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Data.Sqlite;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
class CustomSqliteConnection : ISqliteConnection {
|
||||
internal static async Task<CustomSqliteConnection> OpenUnpooled(SqliteConnectionStringFactory connectionStringFactory) {
|
||||
SqliteConnection conn = new SqliteConnection(connectionStringFactory.Create());
|
||||
await conn.OpenAsync();
|
||||
|
||||
CustomSqliteConnection custom = new CustomSqliteConnection(connectionStringFactory, conn);
|
||||
await custom.Setup(CancellationToken.None);
|
||||
|
||||
return custom;
|
||||
}
|
||||
|
||||
internal SqliteConnectionStringFactory ConnectionStringFactory { get; }
|
||||
public SqliteConnection InnerConnection { get; }
|
||||
|
||||
private ImmutableHashSet<string> attachedDatabases = [];
|
||||
private DbTransaction? activeTransaction;
|
||||
|
||||
protected CustomSqliteConnection(SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) {
|
||||
this.ConnectionStringFactory = connectionStringFactory;
|
||||
this.InnerConnection = innerConnection;
|
||||
}
|
||||
|
||||
internal async Task Setup(CancellationToken cancellationToken) {
|
||||
await this.ExecuteAsync("PRAGMA journal_mode=WAL", cancellationToken);
|
||||
await this.ExecuteAsync("PRAGMA foreign_keys=ON", cancellationToken);
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
|
||||
internal async Task AttachDatabase(AttachedDatabase attachedDatabase) {
|
||||
await this.ExecuteAsync("ATTACH DATABASE '" + attachedDatabase.Path.Replace("'", "''") + "' AS " + attachedDatabase.Schema);
|
||||
ImmutableInterlocked.Update(ref attachedDatabases, static (set, schema) => set.Add(schema), attachedDatabase.Schema);
|
||||
}
|
||||
|
||||
public bool HasAttachedDatabase(string schema) {
|
||||
return attachedDatabases.Contains(schema);
|
||||
}
|
||||
|
||||
public async Task BeginTransactionAsync() {
|
||||
if (activeTransaction != null) {
|
||||
throw new InvalidOperationException("A transaction is already active.");
|
||||
}
|
||||
|
||||
activeTransaction = await InnerConnection.BeginTransactionAsync();
|
||||
}
|
||||
|
||||
public async Task CommitTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to commit.");
|
||||
}
|
||||
|
||||
await activeTransaction.CommitAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public async Task RollbackTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to rollback.");
|
||||
}
|
||||
|
||||
await activeTransaction.RollbackAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public void AssignActiveTransaction(SqliteCommand command) {
|
||||
command.Transaction = (SqliteTransaction?) activeTransaction;
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync() {
|
||||
if (activeTransaction != null) {
|
||||
await RollbackTransactionAsync();
|
||||
}
|
||||
|
||||
await DisposeConnection();
|
||||
}
|
||||
|
||||
private protected virtual async ValueTask DisposeConnection() {
|
||||
await InnerConnection.DisposeAsync();
|
||||
}
|
||||
}
|
@@ -0,0 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
interface ISqliteAttachedDatabaseCollector {
|
||||
IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn);
|
||||
}
|
@@ -7,6 +7,8 @@ namespace DHT.Server.Database.Sqlite.Utils;
|
||||
interface ISqliteConnection : IAsyncDisposable {
|
||||
SqliteConnection InnerConnection { get; }
|
||||
|
||||
bool HasAttachedDatabase(string schema);
|
||||
|
||||
Task BeginTransactionAsync();
|
||||
Task CommitTransactionAsync();
|
||||
Task RollbackTransactionAsync();
|
||||
|
@@ -0,0 +1,3 @@
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
public sealed record InitialDatabaseSettings(bool SeparateFileForDownloads, bool DownloadsAutoStart);
|
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.Common;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Utils.Collections;
|
||||
@@ -9,16 +9,13 @@ using Microsoft.Data.Sqlite;
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
sealed class SqliteConnectionPool : IAsyncDisposable {
|
||||
public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringBuilder connectionStringBuilder, int poolSize) {
|
||||
var pool = new SqliteConnectionPool(poolSize);
|
||||
await pool.InitializePooledConnections(connectionStringBuilder);
|
||||
public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringFactory connectionStringFactory, int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
|
||||
SqliteConnectionPool pool = new SqliteConnectionPool(poolSize, attachedDatabaseCollector);
|
||||
await pool.InitializePooledConnections(connectionStringFactory);
|
||||
return pool;
|
||||
}
|
||||
|
||||
private static string GetConnectionString(SqliteConnectionStringBuilder connectionStringBuilder) {
|
||||
connectionStringBuilder.Pooling = false;
|
||||
return connectionStringBuilder.ToString();
|
||||
}
|
||||
private readonly ISqliteAttachedDatabaseCollector attachedDatabaseCollector;
|
||||
|
||||
private readonly int poolSize;
|
||||
private readonly List<PooledConnection> all;
|
||||
@@ -27,24 +24,35 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
|
||||
private readonly CancellationTokenSource disposalTokenSource = new ();
|
||||
private readonly CancellationToken disposalToken;
|
||||
|
||||
private SqliteConnectionPool(int poolSize) {
|
||||
private SqliteConnectionPool(int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
|
||||
this.attachedDatabaseCollector = attachedDatabaseCollector;
|
||||
|
||||
this.poolSize = poolSize;
|
||||
this.all = new List<PooledConnection>(poolSize);
|
||||
this.free = new ConcurrentPool<PooledConnection>(poolSize);
|
||||
|
||||
this.disposalToken = disposalTokenSource.Token;
|
||||
}
|
||||
|
||||
private async Task InitializePooledConnections(SqliteConnectionStringBuilder connectionStringBuilder) {
|
||||
string connectionString = GetConnectionString(connectionStringBuilder);
|
||||
private async Task InitializePooledConnections(SqliteConnectionStringFactory connectionStringFactory) {
|
||||
string connectionString = connectionStringFactory.Create();
|
||||
|
||||
List<AttachedDatabase> attachedDatabases = [];
|
||||
|
||||
for (int i = 0; i < poolSize; i++) {
|
||||
var conn = new SqliteConnection(connectionString);
|
||||
conn.Open();
|
||||
SqliteConnection innerConnection = new SqliteConnection(connectionString);
|
||||
await innerConnection.OpenAsync(disposalToken);
|
||||
|
||||
var pooledConnection = new PooledConnection(this, conn);
|
||||
PooledConnection pooledConnection = new PooledConnection(this, connectionStringFactory, innerConnection);
|
||||
await pooledConnection.Setup(disposalToken);
|
||||
|
||||
await pooledConnection.ExecuteAsync("PRAGMA journal_mode=WAL", disposalToken);
|
||||
await pooledConnection.ExecuteAsync("PRAGMA foreign_keys=ON", disposalToken);
|
||||
if (i == 0) {
|
||||
attachedDatabases = await attachedDatabaseCollector.GetAttachedDatabases(pooledConnection).ToListAsync(disposalToken);
|
||||
}
|
||||
|
||||
foreach (var attachedDatabase in attachedDatabases) {
|
||||
await pooledConnection.AttachDatabase(attachedDatabase);
|
||||
}
|
||||
|
||||
all.Add(pooledConnection);
|
||||
await free.Push(pooledConnection, disposalToken);
|
||||
@@ -74,48 +82,8 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
|
||||
disposalTokenSource.Dispose();
|
||||
}
|
||||
|
||||
private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnection conn) : ISqliteConnection {
|
||||
public SqliteConnection InnerConnection { get; } = conn;
|
||||
|
||||
private DbTransaction? activeTransaction;
|
||||
|
||||
public async Task BeginTransactionAsync() {
|
||||
if (activeTransaction != null) {
|
||||
throw new InvalidOperationException("A transaction is already active.");
|
||||
}
|
||||
|
||||
activeTransaction = await InnerConnection.BeginTransactionAsync();
|
||||
}
|
||||
|
||||
public async Task CommitTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to commit.");
|
||||
}
|
||||
|
||||
await activeTransaction.CommitAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public async Task RollbackTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to rollback.");
|
||||
}
|
||||
|
||||
await activeTransaction.RollbackAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public void AssignActiveTransaction(SqliteCommand command) {
|
||||
command.Transaction = (SqliteTransaction?) activeTransaction;
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync() {
|
||||
if (activeTransaction != null) {
|
||||
await RollbackTransactionAsync();
|
||||
}
|
||||
|
||||
private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) : CustomSqliteConnection(connectionStringFactory, innerConnection) {
|
||||
private protected override async ValueTask DisposeConnection() {
|
||||
await pool.Return(this);
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,15 @@
|
||||
using Microsoft.Data.Sqlite;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
sealed record SqliteConnectionStringFactory(string Path) {
|
||||
public string Create() {
|
||||
var builder = new SqliteConnectionStringBuilder {
|
||||
DataSource = Path,
|
||||
Mode = SqliteOpenMode.ReadWriteCreate,
|
||||
Pooling = false,
|
||||
};
|
||||
|
||||
return builder.ToString();
|
||||
}
|
||||
}
|
152
app/Server/Download/DownloadExporter.cs
Normal file
152
app/Server/Download/DownloadExporter.cs
Normal file
@@ -0,0 +1,152 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Channels;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Data.Filters;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Utils.Logging;
|
||||
using DHT.Utils.Tasks;
|
||||
using Channel = System.Threading.Channels.Channel;
|
||||
|
||||
namespace DHT.Server.Download;
|
||||
|
||||
public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath) {
|
||||
private static readonly Log Log = Log.ForType<DownloadExporter>();
|
||||
|
||||
private const int Concurrency = 3;
|
||||
|
||||
private static Channel<Data.Download> CreateExportChannel() {
|
||||
return Channel.CreateBounded<Data.Download>(new BoundedChannelOptions(Concurrency * 4) {
|
||||
SingleWriter = true,
|
||||
SingleReader = false,
|
||||
AllowSynchronousContinuations = true,
|
||||
FullMode = BoundedChannelFullMode.Wait,
|
||||
});
|
||||
}
|
||||
|
||||
public interface IProgressReporter {
|
||||
Task ReportProgress(long processedCount, long totalCount);
|
||||
}
|
||||
|
||||
public readonly record struct Result(long SuccessfulCount, long FailedCount) {
|
||||
internal static Result Combine(Result left, Result right) {
|
||||
return new Result(left.SuccessfulCount + right.SuccessfulCount, left.FailedCount + right.FailedCount);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Result> Export(IProgressReporter reporter) {
|
||||
DownloadItemFilter filter = new DownloadItemFilter {
|
||||
IncludeStatuses = [DownloadStatus.Success]
|
||||
};
|
||||
|
||||
long totalCount = await db.Downloads.Count(filter);
|
||||
|
||||
Channel<Data.Download> channel = CreateExportChannel();
|
||||
ExportRunner exportRunner = new ExportRunner(db, folderPath, channel.Reader, reporter, totalCount);
|
||||
|
||||
using CancellableTask progressTask = CancellableTask.Run(exportRunner.RunReportTask);
|
||||
|
||||
List<Task<Result>> readerTasks = [];
|
||||
for (int reader = 0; reader < Concurrency; reader++) {
|
||||
readerTasks.Add(Task.Run(exportRunner.RunExportTask, CancellationToken.None));
|
||||
}
|
||||
|
||||
await foreach (Data.Download download in db.Downloads.Get(filter).WithCancellation(CancellationToken.None)) {
|
||||
await channel.Writer.WriteAsync(download, CancellationToken.None);
|
||||
}
|
||||
|
||||
channel.Writer.Complete();
|
||||
|
||||
Result result = (await Task.WhenAll(readerTasks)).Aggregate(Result.Combine);
|
||||
|
||||
progressTask.Cancel();
|
||||
await progressTask.Task;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private sealed partial class ExportRunner(IDatabaseFile db, string folderPath, ChannelReader<Data.Download> reader, IProgressReporter reporter, long totalCount) {
|
||||
private long processedCount;
|
||||
|
||||
public async Task RunReportTask(CancellationToken cancellationToken) {
|
||||
try {
|
||||
while (true) {
|
||||
await reporter.ReportProgress(processedCount, totalCount);
|
||||
await Task.Delay(TimeSpan.FromMilliseconds(25), cancellationToken);
|
||||
}
|
||||
} catch (OperationCanceledException) {
|
||||
await reporter.ReportProgress(processedCount, totalCount);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Result> RunExportTask() {
|
||||
long successfulCount = 0L;
|
||||
long failedCount = 0L;
|
||||
|
||||
await foreach (Data.Download download in reader.ReadAllAsync()) {
|
||||
bool success;
|
||||
try {
|
||||
success = await db.Downloads.GetDownloadData(download.NormalizedUrl, stream => CopyToFile(download.NormalizedUrl, stream));
|
||||
} catch (FileAlreadyExistsException) {
|
||||
success = false;
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
success = false;
|
||||
}
|
||||
|
||||
if (success) {
|
||||
++successfulCount;
|
||||
}
|
||||
else {
|
||||
++failedCount;
|
||||
}
|
||||
|
||||
Interlocked.Increment(ref processedCount);
|
||||
}
|
||||
|
||||
return new Result(successfulCount, failedCount);
|
||||
}
|
||||
|
||||
private async Task CopyToFile(string normalizedUrl, Stream blobStream) {
|
||||
string fileName = UrlToFileName(normalizedUrl);
|
||||
string filePath = Path.Combine(folderPath, fileName);
|
||||
|
||||
if (File.Exists(filePath)) {
|
||||
Log.Error("Skipping existing file: " + fileName);
|
||||
throw FileAlreadyExistsException.Instance;
|
||||
}
|
||||
|
||||
await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
|
||||
await blobStream.CopyToAsync(fileStream);
|
||||
}
|
||||
|
||||
[GeneratedRegex("[^a-zA-Z0-9_.-]")]
|
||||
private static partial Regex DisallowedFileNameCharactersRegex();
|
||||
|
||||
private static string UrlToFileName(string url) {
|
||||
static string UriToFileName(Uri uri) {
|
||||
string fileName = uri.AbsolutePath.TrimStart('/');
|
||||
|
||||
if (uri.Query.Length > 0) {
|
||||
int periodIndex = fileName.LastIndexOf('.');
|
||||
return fileName.Insert(periodIndex == -1 ? fileName.Length : periodIndex, uri.Query.TrimEnd('&'));
|
||||
}
|
||||
else {
|
||||
return fileName;
|
||||
}
|
||||
}
|
||||
|
||||
string fileName = Uri.TryCreate(url, UriKind.Absolute, out var uri) ? UriToFileName(uri) : url;
|
||||
return DisallowedFileNameCharactersRegex().Replace(fileName, "_");
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class FileAlreadyExistsException : Exception {
|
||||
public static FileAlreadyExistsException Instance { get; } = new ();
|
||||
}
|
||||
}
|
28
app/Utils/Tasks/CancellableTask.cs
Normal file
28
app/Utils/Tasks/CancellableTask.cs
Normal file
@@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DHT.Utils.Tasks;
|
||||
|
||||
public sealed class CancellableTask : IDisposable {
|
||||
public static CancellableTask Run(Func<CancellationToken, Task> action) {
|
||||
return new CancellableTask(action);
|
||||
}
|
||||
|
||||
public Task Task { get; }
|
||||
|
||||
private readonly CancellationTokenSource cancellationTokenSource = new ();
|
||||
|
||||
private CancellableTask(Func<CancellationToken, Task> action) {
|
||||
CancellationToken cancellationToken = cancellationTokenSource.Token;
|
||||
Task = Task.Run(() => action(cancellationToken));
|
||||
}
|
||||
|
||||
public void Cancel() {
|
||||
cancellationTokenSource.Cancel();
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
cancellationTokenSource.Dispose();
|
||||
}
|
||||
}
|
@@ -55,7 +55,10 @@ public sealed class DelayedThrottledTask<T> : IDisposable {
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
try {
|
||||
cancellationTokenSource.Cancel();
|
||||
} catch (ObjectDisposedException) {}
|
||||
|
||||
taskChannel.Writer.Complete();
|
||||
cancellationTokenSource.Cancel();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user