mirror of
https://github.com/chylex/Discord-History-Tracker.git
synced 2025-09-14 08:32:10 +02:00
Compare commits
18 Commits
50d2288203
...
v44.0
Author | SHA1 | Date | |
---|---|---|---|
bfac9b91d9
|
|||
4215dc76f4
|
|||
86adda610b
|
|||
f1c4cd040e
|
|||
737ab43ea4
|
|||
0229c00259
|
|||
95361d2e01
|
|||
5b7312109b
|
|||
9f1db9a662
|
|||
d3e1bb901c
|
|||
9bd105f57e
|
|||
e1eae393c3
|
|||
fbed74529d
|
|||
8924aa7c06
|
|||
9738880ba7
|
|||
1700f99bf7
|
|||
84acf5f5d5
|
|||
ae56433836
|
9
app/Desktop/Common/SystemUtils.cs
Normal file
9
app/Desktop/Common/SystemUtils.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
namespace DHT.Desktop.Common;
|
||||||
|
|
||||||
|
static class SystemUtils {
|
||||||
|
public static void OpenUrl(string url) {
|
||||||
|
Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
|
||||||
|
}
|
||||||
|
}
|
@@ -15,14 +15,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="11.0.6" />
|
<PackageReference Include="Avalonia" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
|
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
|
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
|
<PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
|
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" Condition=" '$(Configuration)' == 'Debug' " />
|
||||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
|
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
|
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
|
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
@@ -3,12 +3,12 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:main="clr-namespace:DHT.Desktop.Main"
|
xmlns:main="clr-namespace:DHT.Desktop.Main"
|
||||||
mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
|
mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="360"
|
||||||
x:Class="DHT.Desktop.Main.AboutWindow"
|
x:Class="DHT.Desktop.Main.AboutWindow"
|
||||||
x:DataType="main:AboutWindowModel"
|
x:DataType="main:AboutWindowModel"
|
||||||
Title="About Discord History Tracker"
|
Title="About Discord History Tracker"
|
||||||
Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
|
Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
|
||||||
Width="480" Height="295" CanResize="False"
|
Width="480" Height="360" CanResize="False"
|
||||||
WindowStartupLocation="CenterOwner">
|
WindowStartupLocation="CenterOwner">
|
||||||
|
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
@@ -39,10 +39,11 @@
|
|||||||
|
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
|
<Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
|
||||||
|
<Button Command="{Binding ShowIssueTracker}">Issue Tracker</Button>
|
||||||
<Button Command="{Binding ShowSourceCode}">Source Code</Button>
|
<Button Command="{Binding ShowSourceCode}">Source Code</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
|
<Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
|
||||||
<TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
|
<TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
|
||||||
<TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
|
<TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
|
||||||
<TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
|
<TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
|
||||||
@@ -55,13 +56,21 @@
|
|||||||
<TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
|
<TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
|
||||||
<Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
|
<Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
|
||||||
|
|
||||||
<TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
|
<TextBlock Grid.Row="4" Grid.Column="0">MVVM Toolkit</TextBlock>
|
||||||
<TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
|
<TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
|
||||||
<Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
|
<Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">GitHub</Button>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
|
||||||
|
<Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
|
||||||
|
|
||||||
<TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
|
<TextBlock Grid.Row="6" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
|
||||||
<TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
|
<TextBlock Grid.Row="6" Grid.Column="1">Apache-2.0</TextBlock>
|
||||||
<Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
|
<Button Grid.Row="6" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="0">Rx.NET</TextBlock>
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
|
||||||
|
<Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@@ -1,33 +1,41 @@
|
|||||||
using System.Diagnostics;
|
using DHT.Desktop.Common;
|
||||||
|
|
||||||
namespace DHT.Desktop.Main;
|
namespace DHT.Desktop.Main;
|
||||||
|
|
||||||
sealed class AboutWindowModel {
|
sealed class AboutWindowModel {
|
||||||
public void ShowOfficialWebsite() {
|
public void ShowOfficialWebsite() {
|
||||||
OpenUrl("https://dht.chylex.com");
|
SystemUtils.OpenUrl(Program.Website);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ShowIssueTracker() {
|
||||||
|
SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
|
||||||
|
}
|
||||||
|
|
||||||
public void ShowSourceCode() {
|
public void ShowSourceCode() {
|
||||||
OpenUrl("https://github.com/chylex/Discord-History-Tracker");
|
SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
|
||||||
}
|
|
||||||
|
|
||||||
public void ShowLibraryAvalonia() {
|
|
||||||
OpenUrl("https://www.nuget.org/packages/Avalonia");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ShowLibrarySqlite() {
|
|
||||||
OpenUrl("https://www.sqlite.org");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ShowLibrarySqliteAdoNet() {
|
|
||||||
OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ShowLibraryNetCore() {
|
public void ShowLibraryNetCore() {
|
||||||
OpenUrl("https://github.com/dotnet/core");
|
SystemUtils.OpenUrl("https://github.com/dotnet/core");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void OpenUrl(string url) {
|
public void ShowLibraryAvalonia() {
|
||||||
Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
|
SystemUtils.OpenUrl("https://www.nuget.org/packages/Avalonia");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowLibraryCommunityToolkit() {
|
||||||
|
SystemUtils.OpenUrl("https://github.com/CommunityToolkit/dotnet");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowLibrarySqlite() {
|
||||||
|
SystemUtils.OpenUrl("https://www.sqlite.org");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowLibrarySqliteAdoNet() {
|
||||||
|
SystemUtils.OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowLibraryRxNet() {
|
||||||
|
SystemUtils.OpenUrl("https://github.com/dotnet/reactive");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia.ReactiveUI;
|
using Avalonia.ReactiveUI;
|
||||||
@@ -8,13 +9,17 @@ using CommunityToolkit.Mvvm.ComponentModel;
|
|||||||
using DHT.Desktop.Common;
|
using DHT.Desktop.Common;
|
||||||
using DHT.Server;
|
using DHT.Server;
|
||||||
using DHT.Server.Data.Filters;
|
using DHT.Server.Data.Filters;
|
||||||
|
using DHT.Server.Data.Settings;
|
||||||
|
using DHT.Utils.Logging;
|
||||||
using DHT.Utils.Tasks;
|
using DHT.Utils.Tasks;
|
||||||
|
|
||||||
namespace DHT.Desktop.Main.Controls;
|
namespace DHT.Desktop.Main.Controls;
|
||||||
|
|
||||||
sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
|
sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisposable {
|
||||||
|
private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
|
||||||
|
|
||||||
public sealed record Unit(string Name, uint Scale);
|
public sealed record Unit(string Name, uint Scale);
|
||||||
|
|
||||||
private static readonly Unit[] AllUnits = [
|
private static readonly Unit[] AllUnits = [
|
||||||
new Unit("B", 1),
|
new Unit("B", 1),
|
||||||
new Unit("kB", 1024),
|
new Unit("kB", 1024),
|
||||||
@@ -33,7 +38,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
|
|||||||
private bool limitSize = false;
|
private bool limitSize = false;
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
private ulong maximumSize = 0L;
|
private ulong maximumSize = 0UL;
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
private Unit maximumSizeUnit = AllUnits[0];
|
private Unit maximumSizeUnit = AllUnits[0];
|
||||||
@@ -43,6 +48,9 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
|
|||||||
private readonly State state;
|
private readonly State state;
|
||||||
private readonly string verb;
|
private readonly string verb;
|
||||||
|
|
||||||
|
private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
|
||||||
|
private bool isLoadingFilterSettings;
|
||||||
|
|
||||||
private readonly RestartableTask<long> downloadItemCountTask;
|
private readonly RestartableTask<long> downloadItemCountTask;
|
||||||
private long? matchingItemCount;
|
private long? matchingItemCount;
|
||||||
|
|
||||||
@@ -56,6 +64,8 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
|
|||||||
this.state = state;
|
this.state = state;
|
||||||
this.verb = verb;
|
this.verb = verb;
|
||||||
|
|
||||||
|
this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
|
||||||
|
|
||||||
this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
|
this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
|
||||||
this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
|
this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
|
||||||
|
|
||||||
@@ -64,13 +74,51 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
|
|||||||
PropertyChanged += OnPropertyChanged;
|
PropertyChanged += OnPropertyChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public async Task Initialize() {
|
||||||
|
isLoadingFilterSettings = true;
|
||||||
|
|
||||||
|
LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
|
||||||
|
MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
|
||||||
|
|
||||||
|
if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
|
||||||
|
MaximumSizeUnit = unitValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
isLoadingFilterSettings = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync() {
|
||||||
|
saveFilterSettingsTask.Dispose();
|
||||||
|
|
||||||
downloadItemCountTask.Cancel();
|
downloadItemCountTask.Cancel();
|
||||||
downloadItemCountSubscription.Dispose();
|
downloadItemCountSubscription.Dispose();
|
||||||
|
|
||||||
|
await SaveFilterSettings(new FilterSettings(this));
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
|
||||||
|
public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SaveFilterSettings(FilterSettings settings) {
|
||||||
|
try {
|
||||||
|
await state.Db.Settings.Set(async setter => {
|
||||||
|
await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
|
||||||
|
await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
|
||||||
|
await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
|
||||||
|
});
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.Error("Could not save download filter settings");
|
||||||
|
Log.Error(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
|
private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
|
||||||
if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
|
if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
|
||||||
|
if (!isLoadingFilterSettings) {
|
||||||
|
saveFilterSettingsTask.Post(new FilterSettings(this));
|
||||||
|
}
|
||||||
|
|
||||||
UpdateFilterStatistics();
|
UpdateFilterStatistics();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -95,6 +95,8 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
|||||||
mainContentScreenModel = new MainContentScreenModel(window, state);
|
mainContentScreenModel = new MainContentScreenModel(window, state);
|
||||||
mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
|
mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
|
||||||
|
|
||||||
|
await mainContentScreenModel.Initialize();
|
||||||
|
|
||||||
Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
|
Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
|
||||||
CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
|
CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
|
||||||
|
|
||||||
@@ -104,7 +106,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
|||||||
private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
|
private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
|
||||||
if (mainContentScreenModel != null) {
|
if (mainContentScreenModel != null) {
|
||||||
mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
|
mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
|
||||||
mainContentScreenModel.Dispose();
|
await mainContentScreenModel.DisposeAsync();
|
||||||
mainContentScreenModel = null;
|
mainContentScreenModel = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,7 +126,10 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask DisposeAsync() {
|
public async ValueTask DisposeAsync() {
|
||||||
mainContentScreenModel?.Dispose();
|
if (mainContentScreenModel != null) {
|
||||||
|
await mainContentScreenModel.DisposeAsync();
|
||||||
|
}
|
||||||
|
|
||||||
await DisposeState();
|
await DisposeState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -31,8 +31,14 @@
|
|||||||
</UserControl.Styles>
|
</UserControl.Styles>
|
||||||
|
|
||||||
<StackPanel Orientation="Vertical" Spacing="20">
|
<StackPanel Orientation="Vertical" Spacing="20">
|
||||||
<Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
|
<StackPanel Orientation="Horizontal" Spacing="10">
|
||||||
|
<Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
|
||||||
|
<Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
|
||||||
|
</StackPanel>
|
||||||
<controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
|
<controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
|
||||||
|
<TextBlock TextWrapping="Wrap">
|
||||||
|
Downloading state and filter settings are remembered per-database.
|
||||||
|
</TextBlock>
|
||||||
<StackPanel Orientation="Vertical" Spacing="12">
|
<StackPanel Orientation="Vertical" Spacing="12">
|
||||||
<Expander Header="Download Status" IsExpanded="True">
|
<Expander Header="Download Status" IsExpanded="True">
|
||||||
<DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
|
<DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
|
||||||
@@ -43,9 +49,6 @@
|
|||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
</Expander>
|
</Expander>
|
||||||
<StackPanel Orientation="Horizontal" Spacing="10">
|
|
||||||
<Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
@@ -9,13 +9,14 @@ using DHT.Desktop.Main.Controls;
|
|||||||
using DHT.Server;
|
using DHT.Server;
|
||||||
using DHT.Server.Data.Aggregations;
|
using DHT.Server.Data.Aggregations;
|
||||||
using DHT.Server.Data.Filters;
|
using DHT.Server.Data.Filters;
|
||||||
|
using DHT.Server.Data.Settings;
|
||||||
using DHT.Server.Download;
|
using DHT.Server.Download;
|
||||||
using DHT.Utils.Logging;
|
using DHT.Utils.Logging;
|
||||||
using DHT.Utils.Tasks;
|
using DHT.Utils.Tasks;
|
||||||
|
|
||||||
namespace DHT.Desktop.Main.Pages;
|
namespace DHT.Desktop.Main.Pages;
|
||||||
|
|
||||||
sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
|
sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
|
||||||
private static readonly Log Log = Log.ForType<DownloadsPageModel>();
|
private static readonly Log Log = Log.ForType<DownloadsPageModel>();
|
||||||
|
|
||||||
[ObservableProperty(Setter = Access.Private)]
|
[ObservableProperty(Setter = Access.Private)]
|
||||||
@@ -73,14 +74,22 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
|
|||||||
|
|
||||||
RecomputeDownloadStatistics();
|
RecomputeDownloadStatistics();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task Initialize() {
|
||||||
|
await FilterModel.Initialize();
|
||||||
|
|
||||||
|
if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, false)) {
|
||||||
|
await StartDownload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public async ValueTask DisposeAsync() {
|
||||||
finishedItemsSubscription?.Dispose();
|
finishedItemsSubscription?.Dispose();
|
||||||
|
|
||||||
downloadItemCountSubscription.Dispose();
|
downloadItemCountSubscription.Dispose();
|
||||||
downloadStatisticsTask.Dispose();
|
downloadStatisticsTask.Dispose();
|
||||||
|
|
||||||
FilterModel.Dispose();
|
await FilterModel.DisposeAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDownloadCountChanged(long newDownloadCount) {
|
private void OnDownloadCountChanged(long newDownloadCount) {
|
||||||
@@ -91,26 +100,41 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
|
|||||||
IsToggleDownloadButtonEnabled = false;
|
IsToggleDownloadButtonEnabled = false;
|
||||||
|
|
||||||
if (IsDownloading) {
|
if (IsDownloading) {
|
||||||
await state.Downloader.Stop();
|
await StopDownload();
|
||||||
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
|
||||||
|
|
||||||
finishedItemsSubscription?.Dispose();
|
|
||||||
finishedItemsSubscription = null;
|
|
||||||
|
|
||||||
currentDownloadFilter = null;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
await StartDownload();
|
||||||
|
|
||||||
var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
|
|
||||||
finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
|
||||||
|
IsToggleDownloadButtonEnabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task StartDownload() {
|
||||||
|
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
||||||
|
|
||||||
|
var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
|
||||||
|
finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
|
||||||
|
|
||||||
|
OnDownloadStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task StopDownload() {
|
||||||
|
await state.Downloader.Stop();
|
||||||
|
await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
|
||||||
|
|
||||||
|
finishedItemsSubscription?.Dispose();
|
||||||
|
finishedItemsSubscription = null;
|
||||||
|
|
||||||
|
currentDownloadFilter = null;
|
||||||
|
OnDownloadStateChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDownloadStateChanged() {
|
||||||
RecomputeDownloadStatistics();
|
RecomputeDownloadStatistics();
|
||||||
|
|
||||||
OnPropertyChanged(nameof(ToggleDownloadButtonText));
|
OnPropertyChanged(nameof(ToggleDownloadButtonText));
|
||||||
OnPropertyChanged(nameof(IsDownloading));
|
OnPropertyChanged(nameof(IsDownloading));
|
||||||
IsToggleDownloadButtonEnabled = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnItemFinished(DownloadItem item) {
|
private void OnItemFinished(DownloadItem item) {
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
@@ -52,10 +51,7 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
|
|||||||
string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
|
string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
|
||||||
string serverToken = ServerConfiguration.Token;
|
string serverToken = ServerConfiguration.Token;
|
||||||
string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
|
string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
|
||||||
|
SystemUtils.OpenUrl(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
|
||||||
Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
|
|
||||||
UseShellExecute = true
|
|
||||||
});
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
|
await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using DHT.Desktop.Main.Controls;
|
using DHT.Desktop.Main.Controls;
|
||||||
using DHT.Desktop.Main.Pages;
|
using DHT.Desktop.Main.Pages;
|
||||||
@@ -6,7 +7,7 @@ using DHT.Server;
|
|||||||
|
|
||||||
namespace DHT.Desktop.Main.Screens;
|
namespace DHT.Desktop.Main.Screens;
|
||||||
|
|
||||||
sealed class MainContentScreenModel : IDisposable {
|
sealed class MainContentScreenModel : IAsyncDisposable {
|
||||||
public DatabasePage DatabasePage { get; }
|
public DatabasePage DatabasePage { get; }
|
||||||
private DatabasePageModel DatabasePageModel { get; }
|
private DatabasePageModel DatabasePageModel { get; }
|
||||||
|
|
||||||
@@ -70,9 +71,13 @@ sealed class MainContentScreenModel : IDisposable {
|
|||||||
|
|
||||||
StatusBarModel = new StatusBarModel(state);
|
StatusBarModel = new StatusBarModel(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task Initialize() {
|
||||||
|
await DownloadsPageModel.Initialize();
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public async ValueTask DisposeAsync() {
|
||||||
DownloadsPageModel.Dispose();
|
await DownloadsPageModel.DisposeAsync();
|
||||||
ViewerPageModel.Dispose();
|
ViewerPageModel.Dispose();
|
||||||
AdvancedPageModel.Dispose();
|
AdvancedPageModel.Dispose();
|
||||||
StatusBarModel.Dispose();
|
StatusBarModel.Dispose();
|
||||||
|
@@ -22,20 +22,21 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="Button">
|
<Style Selector="Grid#ButtonPanel > Button">
|
||||||
<Setter Property="Margin" Value="5 0" />
|
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||||
</Style>
|
</Style>
|
||||||
</UserControl.Styles>
|
</UserControl.Styles>
|
||||||
|
|
||||||
<Panel Name="RootPanel">
|
<Panel Name="RootPanel">
|
||||||
<StackPanel Margin="42">
|
<StackPanel Margin="42 30">
|
||||||
<TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
|
<TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 25" HorizontalAlignment="Center" />
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
<Grid Name="ButtonPanel" RowDefinitions="Auto,12,Auto,12,Auto" ColumnDefinitions="*,12,*" Margin="12 0" HorizontalAlignment="Stretch">
|
||||||
<Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
|
<Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
|
||||||
<Button Command="{Binding ShowAboutDialog}">About</Button>
|
<Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding CheckUpdates}">Check For Updates</Button>
|
||||||
<Button Command="{Binding Exit}">Exit</Button>
|
<Button Grid.Row="4" Grid.Column="0" Command="{Binding ShowAboutDialog}">About</Button>
|
||||||
</StackPanel>
|
<Button Grid.Row="4" Grid.Column="2" Command="{Binding Exit}">Exit</Button>
|
||||||
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Panel>
|
</Panel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
@@ -1,25 +1,31 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
using DHT.Desktop.Common;
|
using DHT.Desktop.Common;
|
||||||
using DHT.Desktop.Dialogs.Message;
|
using DHT.Desktop.Dialogs.Message;
|
||||||
using DHT.Desktop.Dialogs.Progress;
|
using DHT.Desktop.Dialogs.Progress;
|
||||||
|
using DHT.Server.Data.Settings;
|
||||||
using DHT.Server.Database;
|
using DHT.Server.Database;
|
||||||
using DHT.Server.Database.Sqlite.Schema;
|
using DHT.Server.Database.Sqlite.Schema;
|
||||||
|
using DHT.Utils.Logging;
|
||||||
|
|
||||||
namespace DHT.Desktop.Main.Screens;
|
namespace DHT.Desktop.Main.Screens;
|
||||||
|
|
||||||
sealed partial class WelcomeScreenModel : ObservableObject {
|
sealed partial class WelcomeScreenModel : ObservableObject {
|
||||||
|
private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
|
||||||
|
|
||||||
public string Version => Program.Version;
|
public string Version => Program.Version;
|
||||||
|
|
||||||
[ObservableProperty(Setter = Access.Private)]
|
[ObservableProperty(Setter = Access.Private)]
|
||||||
private bool isOpenOrCreateDatabaseButtonEnabled = true;
|
private bool isOpenOrCreateDatabaseButtonEnabled = true;
|
||||||
|
|
||||||
public event EventHandler<IDatabaseFile>? DatabaseSelected;
|
public event EventHandler<IDatabaseFile>? DatabaseSelected;
|
||||||
|
|
||||||
private readonly Window window;
|
private readonly Window window;
|
||||||
|
|
||||||
private string? dbFilePath;
|
private string? dbFilePath;
|
||||||
@@ -45,20 +51,22 @@ sealed partial class WelcomeScreenModel : ObservableObject {
|
|||||||
|
|
||||||
public async Task OpenOrCreateDatabaseFromPath(string path) {
|
public async Task OpenOrCreateDatabaseFromPath(string path) {
|
||||||
dbFilePath = path;
|
dbFilePath = path;
|
||||||
|
|
||||||
|
bool isNew = !File.Exists(path);
|
||||||
|
|
||||||
var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
|
var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
|
||||||
if (db != null) {
|
if (db == null) {
|
||||||
DatabaseSelected?.Invoke(this, db);
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
DatabaseSelected?.Invoke(this, db);
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
|
private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
|
||||||
private readonly Window window;
|
|
||||||
|
|
||||||
public SchemaUpgradeCallbacks(Window window) {
|
|
||||||
this.window = window;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> CanUpgrade() {
|
public async Task<bool> CanUpgrade() {
|
||||||
return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
|
return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
|
||||||
}
|
}
|
||||||
@@ -71,20 +79,12 @@ sealed partial class WelcomeScreenModel : ObservableObject {
|
|||||||
await doUpgrade(reporter);
|
await doUpgrade(reporter);
|
||||||
await Task.Delay(TimeSpan.FromMilliseconds(600));
|
await Task.Delay(TimeSpan.FromMilliseconds(600));
|
||||||
}
|
}
|
||||||
|
|
||||||
await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
|
await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
|
private sealed class ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) : ISchemaUpgradeCallbacks.IProgressReporter {
|
||||||
private readonly IReadOnlyList<IProgressCallback> callbacks;
|
|
||||||
|
|
||||||
private readonly int versionSteps;
|
|
||||||
private int versionProgress = 0;
|
private int versionProgress = 0;
|
||||||
|
|
||||||
public ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) {
|
|
||||||
this.callbacks = callbacks;
|
|
||||||
this.versionSteps = versionSteps;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task NextVersion() {
|
public async Task NextVersion() {
|
||||||
await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
|
await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
|
||||||
@@ -109,6 +109,53 @@ sealed partial class WelcomeScreenModel : ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task CheckUpdates() {
|
||||||
|
Version? 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
|
||||||
|
});
|
||||||
|
|
||||||
|
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 var latestVersion)) {
|
||||||
|
await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return latestVersion;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (latestVersion == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Program.AssemblyVersion >= latestVersion) {
|
||||||
|
await Dialog.ShowOk(window, "Check Updates", "You are using the latest version.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (await Dialog.ShowYesNo(window, "Check Updates", "A newer version is available: v" + Program.VersionToString(latestVersion) + "\nVisit the official website and close the app?") == DialogResult.YesNo.Yes) {
|
||||||
|
SystemUtils.OpenUrl(Program.Website);
|
||||||
|
Exit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async Task ShowAboutDialog() {
|
public async Task ShowAboutDialog() {
|
||||||
await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
|
await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
|
||||||
}
|
}
|
||||||
|
@@ -9,17 +9,18 @@ namespace DHT.Desktop;
|
|||||||
|
|
||||||
static class Program {
|
static class Program {
|
||||||
public static string Version { get; }
|
public static string Version { get; }
|
||||||
|
public static Version AssemblyVersion { get; }
|
||||||
public static CultureInfo Culture { get; }
|
public static CultureInfo Culture { get; }
|
||||||
public static ResourceLoader Resources { get; }
|
public static ResourceLoader Resources { get; }
|
||||||
public static Arguments Arguments { get; }
|
public static Arguments Arguments { get; }
|
||||||
|
|
||||||
|
public const string Website = "https://dht.chylex.com";
|
||||||
|
|
||||||
static Program() {
|
static Program() {
|
||||||
var assembly = Assembly.GetExecutingAssembly();
|
var assembly = Assembly.GetExecutingAssembly();
|
||||||
|
|
||||||
Version = assembly.GetName().Version?.ToString() ?? "";
|
AssemblyVersion = assembly.GetName().Version ?? new Version(0, 0, 0, 0);
|
||||||
while (Version.EndsWith(".0")) {
|
Version = VersionToString(AssemblyVersion);
|
||||||
Version = Version[..^2];
|
|
||||||
}
|
|
||||||
|
|
||||||
Culture = CultureInfo.CurrentCulture;
|
Culture = CultureInfo.CurrentCulture;
|
||||||
CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
|
CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
|
||||||
@@ -30,6 +31,16 @@ static class Program {
|
|||||||
Resources = new ResourceLoader(assembly);
|
Resources = new ResourceLoader(assembly);
|
||||||
Arguments = new Arguments(Environment.GetCommandLineArgs());
|
Arguments = new Arguments(Environment.GetCommandLineArgs());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string VersionToString(Version version) {
|
||||||
|
string versionStr = version.ToString();
|
||||||
|
|
||||||
|
while (versionStr.EndsWith(".0")) {
|
||||||
|
versionStr = versionStr[..^2];
|
||||||
|
}
|
||||||
|
|
||||||
|
return versionStr;
|
||||||
|
}
|
||||||
|
|
||||||
public static void Main(string[] args) {
|
public static void Main(string[] args) {
|
||||||
if (Arguments.Console && OperatingSystem.IsWindows()) {
|
if (Arguments.Console && OperatingSystem.IsWindows()) {
|
||||||
|
2
app/Resources/Tracker/bootstrap.js
vendored
2
app/Resources/Tracker/bootstrap.js
vendored
@@ -133,6 +133,7 @@
|
|||||||
STATE.onTrackingStateChanged(enabled => {
|
STATE.onTrackingStateChanged(enabled => {
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
GUI.setStatus("Starting");
|
GUI.setStatus("Starting");
|
||||||
|
GUI.createTrackingStyles();
|
||||||
hasJustStarted = true;
|
hasJustStarted = true;
|
||||||
|
|
||||||
if (!starter()) {
|
if (!starter()) {
|
||||||
@@ -142,6 +143,7 @@
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
isSending = false;
|
isSending = false;
|
||||||
|
GUI.deleteTrackingStyles();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -42,14 +42,14 @@ class DISCORD {
|
|||||||
* @type {Object}
|
* @type {Object}
|
||||||
* @property {function(String): ?DiscordGuild} getGuild
|
* @property {function(String): ?DiscordGuild} getGuild
|
||||||
*/
|
*/
|
||||||
static #guildStore = WEBPACK.findModule(WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
|
static #guildStore = WEBPACK.findModule("guildStore", WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {Object}
|
* @type {Object}
|
||||||
* @property {function(String): Boolean} isOptInEnabled
|
* @property {function(String): Boolean} isOptInEnabled
|
||||||
* @property {function(String): Set<String>} getOptedInChannels
|
* @property {function(String): Set<String>} getOptedInChannels
|
||||||
*/
|
*/
|
||||||
static #guildSettings = WEBPACK.findModule(WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
|
static #guildSettings = WEBPACK.findModule("guildSettings", WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {Object}
|
* @type {Object}
|
||||||
@@ -57,7 +57,7 @@ class DISCORD {
|
|||||||
* @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
|
* @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
|
||||||
* @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
|
* @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
|
||||||
*/
|
*/
|
||||||
static #channelStore = WEBPACK.findModule(WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
|
static #channelStore = WEBPACK.findModule("channelStore", WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {function(BigInt, Object): Boolean}
|
* @type {function(BigInt, Object): Boolean}
|
||||||
@@ -85,9 +85,9 @@ class DISCORD {
|
|||||||
static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
|
static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {function(String, String, String=null): void}
|
* @type {function(String, Object, String=null): void}
|
||||||
*/
|
*/
|
||||||
static #transitionToGuild = WEBPACK.findFunction("transitionToGuild", [ "transitionTo" ]);
|
static #transitionToGuildSync = WEBPACK.findFunction("transitionToGuildSync");
|
||||||
|
|
||||||
static isCompatible() {
|
static isCompatible() {
|
||||||
return !!this.#guildStore
|
return !!this.#guildStore
|
||||||
@@ -98,7 +98,7 @@ class DISCORD {
|
|||||||
&& !!this.#jumpToMessage
|
&& !!this.#jumpToMessage
|
||||||
&& !!this.#getCurrentlySelectedChannelId
|
&& !!this.#getCurrentlySelectedChannelId
|
||||||
&& !!this.#selectPrivateChannel
|
&& !!this.#selectPrivateChannel
|
||||||
&& !!this.#transitionToGuild;
|
&& !!this.#transitionToGuildSync;
|
||||||
}
|
}
|
||||||
|
|
||||||
static getMessageOuterElement() {
|
static getMessageOuterElement() {
|
||||||
@@ -117,24 +117,25 @@ class DISCORD {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static getMessagesFromSelectedChannel() {
|
||||||
|
const channelId = this.#getCurrentlySelectedChannelId();
|
||||||
|
return channelId ? this.#getMessages(channelId) : null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls the provided function with a list of messages whenever the currently loaded messages change.
|
* Calls the provided function with a list of messages whenever the currently loaded messages change.
|
||||||
|
* @param callback {function(server: ?DiscordGuild, channel: DiscordChannel, messages: Array<DiscordMessage>, hasMoreBefore: boolean)}
|
||||||
*/
|
*/
|
||||||
static setupMessageCallback(callback) {
|
static setupMessageCallback(callback) {
|
||||||
const previousMessages = new Set();
|
const previousMessages = new Set();
|
||||||
|
|
||||||
const onMessageElementsChanged = force => {
|
const onMessageElementsChanged = force => {
|
||||||
const channelId = this.#getCurrentlySelectedChannelId();
|
const messages = this.getMessagesFromSelectedChannel();
|
||||||
if (!channelId) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const messages = this.#getMessages(channelId);
|
|
||||||
if (!messages || !messages.ready || messages.loadingMore) {
|
if (!messages || !messages.ready || messages.loadingMore) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const channel = this.#channelStore.getChannel(channelId);
|
const channel = this.#channelStore.getChannel(messages.channelId);
|
||||||
if (!channel) {
|
if (!channel) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -244,14 +245,13 @@ class DISCORD {
|
|||||||
.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
|
.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
|
||||||
.sort((a, b) => a.position - b.position);
|
.sort((a, b) => a.position - b.position);
|
||||||
|
|
||||||
debugger;
|
|
||||||
const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
|
const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
|
||||||
|
|
||||||
if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
|
if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.#transitionToGuild(guildId, guildChannels[currentIndex + 1].id);
|
this.#transitionToGuildSync(guildId, {}, guildChannels[currentIndex + 1].id);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
class DOM {
|
class DOM {
|
||||||
/**
|
/**
|
||||||
* Returns a child element by its ID. Parent defaults to the entire document.
|
* Returns a child element by its ID. Parent defaults to the entire document.
|
||||||
|
* @param {string} id
|
||||||
|
* @param {HTMLElement?} [parent]
|
||||||
* @returns {HTMLElement}
|
* @returns {HTMLElement}
|
||||||
*/
|
*/
|
||||||
static id(id, parent) {
|
static id(id, parent) {
|
||||||
@@ -9,6 +11,9 @@ class DOM {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
|
* Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
|
||||||
|
* @param {string} cls
|
||||||
|
* @param {HTMLElement?} [parent]
|
||||||
|
* @returns {HTMLElement}
|
||||||
*/
|
*/
|
||||||
static queryReactClass(cls, parent) {
|
static queryReactClass(cls, parent) {
|
||||||
return (parent || document).querySelector(`[class*="${cls}_"]`);
|
return (parent || document).querySelector(`[class*="${cls}_"]`);
|
||||||
|
@@ -2,14 +2,17 @@
|
|||||||
const GUI = (function() {
|
const GUI = (function() {
|
||||||
let controller = null;
|
let controller = null;
|
||||||
let settings = null;
|
let settings = null;
|
||||||
|
let trackingStyles = null;
|
||||||
|
|
||||||
const stateChangedEvent = () => {
|
const stateChangedEvent = () => {
|
||||||
if (settings) {
|
if (settings) {
|
||||||
settings.ui.cbAutoscroll.checked = SETTINGS.autoscroll;
|
settings.ui.cbAutoscroll.checked = SETTINGS.autoscroll;
|
||||||
|
settings.ui.cbHidePreviewsWhileAutoscrolling.checked = SETTINGS.hidePreviewsWhileAutoscrolling;
|
||||||
settings.ui.optsAfterFirstMsg[SETTINGS.afterFirstMsg].checked = true;
|
settings.ui.optsAfterFirstMsg[SETTINGS.afterFirstMsg].checked = true;
|
||||||
settings.ui.optsAfterSavedMsg[SETTINGS.afterSavedMsg].checked = true;
|
settings.ui.optsAfterSavedMsg[SETTINGS.afterSavedMsg].checked = true;
|
||||||
|
|
||||||
const autoscrollDisabled = !SETTINGS.autoscroll;
|
const autoscrollDisabled = !SETTINGS.autoscroll;
|
||||||
|
settings.ui.cbHidePreviewsWhileAutoscrolling.disabled = autoscrollDisabled;
|
||||||
Object.values(settings.ui.optsAfterFirstMsg).forEach(ele => ele.disabled = autoscrollDisabled);
|
Object.values(settings.ui.optsAfterFirstMsg).forEach(ele => ele.disabled = autoscrollDisabled);
|
||||||
Object.values(settings.ui.optsAfterSavedMsg).forEach(ele => ele.disabled = autoscrollDisabled);
|
Object.values(settings.ui.optsAfterSavedMsg).forEach(ele => ele.disabled = autoscrollDisabled);
|
||||||
}
|
}
|
||||||
@@ -54,6 +57,7 @@ const GUI = (function() {
|
|||||||
|
|
||||||
controller.ui.btnClose.addEventListener("click", () => {
|
controller.ui.btnClose.addEventListener("click", () => {
|
||||||
this.hideController();
|
this.hideController();
|
||||||
|
this.deleteTrackingStyles();
|
||||||
window.DHT_ON_UNLOAD.forEach(f => f());
|
window.DHT_ON_UNLOAD.forEach(f => f());
|
||||||
delete window.DHT_ON_UNLOAD;
|
delete window.DHT_ON_UNLOAD;
|
||||||
delete window.DHT_LOADED;
|
delete window.DHT_LOADED;
|
||||||
@@ -84,6 +88,7 @@ const GUI = (function() {
|
|||||||
const radio = (type, id, label) => "<label><input id='dht-cfg-" + type + "-" + id + "' name='dht-" + type + "' type='radio'> " + label + "</label><br>";
|
const radio = (type, id, label) => "<label><input id='dht-cfg-" + type + "-" + id + "' name='dht-" + type + "' type='radio'> " + label + "</label><br>";
|
||||||
const html = `
|
const html = `
|
||||||
<label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
|
<label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
|
||||||
|
<label><input id='dht-cfg-hide-previews-while-autoscrolling' type='checkbox'> Hide previews to improve browser performance</label><br>
|
||||||
<br>
|
<br>
|
||||||
<label>After reaching the first message in channel...</label><br>
|
<label>After reaching the first message in channel...</label><br>
|
||||||
${radio("afm", "nothing", "Continue Tracking")}
|
${radio("afm", "nothing", "Continue Tracking")}
|
||||||
@@ -93,8 +98,7 @@ ${radio("afm", "switch", "Switch to Next Channel")}
|
|||||||
<label>After reaching a previously saved message...</label><br>
|
<label>After reaching a previously saved message...</label><br>
|
||||||
${radio("asm", "nothing", "Continue Tracking")}
|
${radio("asm", "nothing", "Continue Tracking")}
|
||||||
${radio("asm", "pause", "Pause Tracking")}
|
${radio("asm", "pause", "Pause Tracking")}
|
||||||
${radio("asm", "switch", "Switch to Next Channel")}
|
${radio("asm", "switch", "Switch to Next Channel")}`;
|
||||||
<p id='dht-cfg-note'>It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.</p>`;
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
styles: DOM.createStyle(`/*[CSS-SETTINGS]*/`),
|
styles: DOM.createStyle(`/*[CSS-SETTINGS]*/`),
|
||||||
@@ -107,9 +111,10 @@ ${radio("asm", "switch", "Switch to Next Channel")}
|
|||||||
});
|
});
|
||||||
|
|
||||||
settings.ui = {
|
settings.ui = {
|
||||||
cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
|
/** @type {HTMLInputElement} */ cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
|
||||||
optsAfterFirstMsg: {},
|
/** @type {HTMLInputElement} */ cbHidePreviewsWhileAutoscrolling: DOM.id("dht-cfg-hide-previews-while-autoscrolling"),
|
||||||
optsAfterSavedMsg: {}
|
/** @type {Object.<number, HTMLInputElement>} */ optsAfterFirstMsg: {},
|
||||||
|
/** @type {Object.<number, HTMLInputElement>} */ optsAfterSavedMsg: {}
|
||||||
};
|
};
|
||||||
|
|
||||||
settings.ui.optsAfterFirstMsg[CONSTANTS.AUTOSCROLL_ACTION_NOTHING] = DOM.id("dht-cfg-afm-nothing");
|
settings.ui.optsAfterFirstMsg[CONSTANTS.AUTOSCROLL_ACTION_NOTHING] = DOM.id("dht-cfg-afm-nothing");
|
||||||
@@ -124,6 +129,10 @@ ${radio("asm", "switch", "Switch to Next Channel")}
|
|||||||
SETTINGS.autoscroll = settings.ui.cbAutoscroll.checked;
|
SETTINGS.autoscroll = settings.ui.cbAutoscroll.checked;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
settings.ui.cbHidePreviewsWhileAutoscrolling.addEventListener("change", () => {
|
||||||
|
SETTINGS.hidePreviewsWhileAutoscrolling = settings.ui.cbHidePreviewsWhileAutoscrolling.checked;
|
||||||
|
});
|
||||||
|
|
||||||
Object.keys(settings.ui.optsAfterFirstMsg).forEach(key => {
|
Object.keys(settings.ui.optsAfterFirstMsg).forEach(key => {
|
||||||
settings.ui.optsAfterFirstMsg[key].addEventListener("click", () => {
|
settings.ui.optsAfterFirstMsg[key].addEventListener("click", () => {
|
||||||
SETTINGS.afterFirstMsg = key;
|
SETTINGS.afterFirstMsg = key;
|
||||||
@@ -152,6 +161,29 @@ ${radio("asm", "switch", "Switch to Next Channel")}
|
|||||||
if (controller) {
|
if (controller) {
|
||||||
controller.ui.textStatus.innerText = state;
|
controller.ui.textStatus.innerText = state;
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
createTrackingStyles() {
|
||||||
|
if (trackingStyles) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let style = "";
|
||||||
|
|
||||||
|
if (SETTINGS.autoscroll && SETTINGS.hidePreviewsWhileAutoscrolling) {
|
||||||
|
style += `div[id^="message-accessories-"] { display: none; }`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (style.length > 0) {
|
||||||
|
trackingStyles = DOM.createStyle(style);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
deleteTrackingStyles() {
|
||||||
|
if (trackingStyles) {
|
||||||
|
DOM.removeElement(trackingStyles);
|
||||||
|
trackingStyles = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
@@ -35,17 +35,28 @@ const SETTINGS = (function() {
|
|||||||
obj[name] = value;
|
obj[name] = value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const defaults = {
|
||||||
|
"_autoscroll": true,
|
||||||
|
"_hidePreviewsWhileAutoscrolling": true,
|
||||||
|
"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
|
||||||
|
"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
|
||||||
|
};
|
||||||
|
|
||||||
let loaded = DOM.loadFromCookie("DHT_SETTINGS");
|
let loaded = DOM.loadFromCookie("DHT_SETTINGS");
|
||||||
|
let hasChanged = false;
|
||||||
|
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
loaded = {
|
loaded = defaults;
|
||||||
"_autoscroll": true,
|
|
||||||
"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
|
|
||||||
"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE
|
|
||||||
};
|
|
||||||
|
|
||||||
IS_FIRST_RUN = true;
|
IS_FIRST_RUN = true;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
for (const property in defaults) {
|
||||||
|
if (!(property in loaded)) {
|
||||||
|
loaded[property] = defaults[property];
|
||||||
|
hasChanged = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const root = {
|
const root = {
|
||||||
onSettingsChanged(callback) {
|
onSettingsChanged(callback) {
|
||||||
@@ -54,10 +65,11 @@ const SETTINGS = (function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
defineTriggeringProperty(root, "autoscroll", loaded._autoscroll);
|
defineTriggeringProperty(root, "autoscroll", loaded._autoscroll);
|
||||||
|
defineTriggeringProperty(root, "hidePreviewsWhileAutoscrolling", loaded._hidePreviewsWhileAutoscrolling);
|
||||||
defineTriggeringProperty(root, "afterFirstMsg", loaded._afterFirstMsg);
|
defineTriggeringProperty(root, "afterFirstMsg", loaded._afterFirstMsg);
|
||||||
defineTriggeringProperty(root, "afterSavedMsg", loaded._afterSavedMsg);
|
defineTriggeringProperty(root, "afterSavedMsg", loaded._afterSavedMsg);
|
||||||
|
|
||||||
if (IS_FIRST_RUN) {
|
if (IS_FIRST_RUN || hasChanged) {
|
||||||
saveSettings();
|
saveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -286,7 +286,7 @@ const STATE = (function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (msg.reactions.length > 0) {
|
if (msg.reactions.length > 0) {
|
||||||
obj.reactions = msg.reactions.map(reaction => {
|
obj.reactions = msg.reactions.filter(reaction => reaction.count > 0).map(reaction => {
|
||||||
const emoji = reaction.emoji;
|
const emoji = reaction.emoji;
|
||||||
|
|
||||||
const mapped = {
|
const mapped = {
|
||||||
|
@@ -73,6 +73,7 @@
|
|||||||
/**
|
/**
|
||||||
* @name MessageData
|
* @name MessageData
|
||||||
* @type {Object}
|
* @type {Object}
|
||||||
|
* @property {String} channelId
|
||||||
* @property {Boolean} ready
|
* @property {Boolean} ready
|
||||||
* @property {Boolean} loadingMore
|
* @property {Boolean} loadingMore
|
||||||
* @property {Boolean} hasMoreAfter
|
* @property {Boolean} hasMoreAfter
|
||||||
|
@@ -80,14 +80,19 @@ class WEBPACK {
|
|||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
static findModule(filter) {
|
static findModule(name, filter) {
|
||||||
const modules = this.findModules(filter);
|
const modules = this.findModules(filter);
|
||||||
return modules.length === 1 ? modules[0] : null;
|
if (modules.length === 1) {
|
||||||
|
return modules[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static findFunction(name, additionalRequiredProps) {
|
static findFunction(name, additionalRequiredProps) {
|
||||||
const searchedProps = additionalRequiredProps ? [name, ...additionalRequiredProps] : [name];
|
const searchedProps = additionalRequiredProps ? [name, ...additionalRequiredProps] : [name];
|
||||||
const matchingModule = this.findModule(this.filterByPropsWithPredicate(prop => typeof(prop) === "function", ...searchedProps));
|
const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof(prop) === "function", ...searchedProps));
|
||||||
return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
|
return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -18,11 +18,13 @@
|
|||||||
height: 262px;
|
height: 262px;
|
||||||
margin-left: -400px;
|
margin-left: -400px;
|
||||||
margin-top: -131px;
|
margin-top: -131px;
|
||||||
|
line-height: 120%;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
z-index: 1000002;
|
z-index: 1000002;
|
||||||
}
|
}
|
||||||
|
|
||||||
#dht-cfg-note {
|
#dht-cfg label {
|
||||||
margin-top: 22px;
|
display: inline-block;
|
||||||
|
margin: 1px 0;
|
||||||
}
|
}
|
||||||
|
60
app/Server/Data/Settings/SettingsKey.cs
Normal file
60
app/Server/Data/Settings/SettingsKey.cs
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|
||||||
|
namespace DHT.Server.Data.Settings;
|
||||||
|
|
||||||
|
public static class SettingsKey {
|
||||||
|
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");
|
||||||
|
public static String DownloadsMaximumSizeUnit { get; } = new ("downloads_maximum_size_unit");
|
||||||
|
|
||||||
|
public sealed class String(string key) : SettingsKey<string>(key) {
|
||||||
|
internal override bool FromString(string value, out string result) {
|
||||||
|
result = value;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override string ToString(string value) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class Bool(string key) : SettingsKey<bool>(key) {
|
||||||
|
internal override bool FromString(string value, out bool result) {
|
||||||
|
switch (value) {
|
||||||
|
case "1":
|
||||||
|
result = true;
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case "0":
|
||||||
|
result = false;
|
||||||
|
return true;
|
||||||
|
|
||||||
|
default:
|
||||||
|
result = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override string ToString(bool value) {
|
||||||
|
return value ? "1" : "0";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class UnsignedLong(string key) : SettingsKey<ulong>(key) {
|
||||||
|
internal override bool FromString(string value, out ulong result) {
|
||||||
|
return ulong.TryParse(value, out result);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override string ToString(ulong value) {
|
||||||
|
return value.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract class SettingsKey<T>(string key) {
|
||||||
|
internal string Key => key;
|
||||||
|
|
||||||
|
internal abstract bool FromString(string value, [NotNullWhen(true)] out T result);
|
||||||
|
internal abstract string ToString(T value);
|
||||||
|
}
|
@@ -10,6 +10,7 @@ sealed class DummyDatabaseFile : IDatabaseFile {
|
|||||||
|
|
||||||
public string Path => "";
|
public string Path => "";
|
||||||
|
|
||||||
|
public ISettingsRepository Settings { get; } = new ISettingsRepository.Dummy();
|
||||||
public IUserRepository Users { get; } = new IUserRepository.Dummy();
|
public IUserRepository Users { get; } = new IUserRepository.Dummy();
|
||||||
public IServerRepository Servers { get; } = new IServerRepository.Dummy();
|
public IServerRepository Servers { get; } = new IServerRepository.Dummy();
|
||||||
public IChannelRepository Channels { get; } = new IChannelRepository.Dummy();
|
public IChannelRepository Channels { get; } = new IChannelRepository.Dummy();
|
||||||
|
@@ -7,6 +7,7 @@ namespace DHT.Server.Database;
|
|||||||
public interface IDatabaseFile : IAsyncDisposable {
|
public interface IDatabaseFile : IAsyncDisposable {
|
||||||
string Path { get; }
|
string Path { get; }
|
||||||
|
|
||||||
|
ISettingsRepository Settings { get; }
|
||||||
IUserRepository Users { get; }
|
IUserRepository Users { get; }
|
||||||
IServerRepository Servers { get; }
|
IServerRepository Servers { get; }
|
||||||
IChannelRepository Channels { get; }
|
IChannelRepository Channels { get; }
|
||||||
|
31
app/Server/Database/Repositories/ISettingsRepository.cs
Normal file
31
app/Server/Database/Repositories/ISettingsRepository.cs
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using DHT.Server.Data.Settings;
|
||||||
|
|
||||||
|
namespace DHT.Server.Database.Repositories;
|
||||||
|
|
||||||
|
public interface ISettingsRepository {
|
||||||
|
Task Set<T>(SettingsKey<T> key, T value);
|
||||||
|
|
||||||
|
Task Set(Func<ISetter, Task> setter);
|
||||||
|
|
||||||
|
Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue);
|
||||||
|
|
||||||
|
interface ISetter {
|
||||||
|
Task Set<T>(SettingsKey<T> key, T value);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class Dummy : ISettingsRepository {
|
||||||
|
public Task Set<T>(SettingsKey<T> key, T value) {
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task Set(Func<ISetter, Task> setter) {
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
|
||||||
|
return Task.FromResult(defaultValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -20,7 +20,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
|||||||
|
|
||||||
internal sealed class NewDownloadCollector : IAsyncDisposable {
|
internal sealed class NewDownloadCollector : IAsyncDisposable {
|
||||||
private readonly SqliteDownloadRepository repository;
|
private readonly SqliteDownloadRepository repository;
|
||||||
private bool hasAdded = false;
|
private bool hasChanged = false;
|
||||||
|
|
||||||
private readonly SqliteCommand metadataCmd;
|
private readonly SqliteCommand metadataCmd;
|
||||||
|
|
||||||
@@ -31,7 +31,16 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
|||||||
"""
|
"""
|
||||||
INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
|
INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
|
||||||
VALUES (:normalized_url, :download_url, :status, :type, :size)
|
VALUES (:normalized_url, :download_url, :status, :type, :size)
|
||||||
ON CONFLICT DO NOTHING
|
ON CONFLICT (normalized_url)
|
||||||
|
DO UPDATE SET
|
||||||
|
download_url = excluded.download_url,
|
||||||
|
type = IFNULL(excluded.type, type),
|
||||||
|
size = IFNULL(excluded.size, size)
|
||||||
|
WHERE status != :success
|
||||||
|
AND (download_url != excluded.download_url
|
||||||
|
OR (excluded.type IS NOT NULL AND type IS NOT excluded.type)
|
||||||
|
OR (excluded.size IS NOT NULL AND size IS NOT excluded.size)
|
||||||
|
)
|
||||||
"""
|
"""
|
||||||
);
|
);
|
||||||
metadataCmd.Add(":normalized_url", SqliteType.Text);
|
metadataCmd.Add(":normalized_url", SqliteType.Text);
|
||||||
@@ -39,6 +48,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
|||||||
metadataCmd.Add(":status", SqliteType.Integer);
|
metadataCmd.Add(":status", SqliteType.Integer);
|
||||||
metadataCmd.Add(":type", SqliteType.Text);
|
metadataCmd.Add(":type", SqliteType.Text);
|
||||||
metadataCmd.Add(":size", SqliteType.Integer);
|
metadataCmd.Add(":size", SqliteType.Integer);
|
||||||
|
metadataCmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task Add(Data.Download download) {
|
public async Task Add(Data.Download download) {
|
||||||
@@ -47,11 +57,11 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
|||||||
metadataCmd.Set(":status", (int) download.Status);
|
metadataCmd.Set(":status", (int) download.Status);
|
||||||
metadataCmd.Set(":type", download.Type);
|
metadataCmd.Set(":type", download.Type);
|
||||||
metadataCmd.Set(":size", download.Size);
|
metadataCmd.Set(":size", download.Size);
|
||||||
hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
|
hasChanged |= await metadataCmd.ExecuteNonQueryAsync() > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnCommitted() {
|
public void OnCommitted() {
|
||||||
if (hasAdded) {
|
if (hasChanged) {
|
||||||
repository.UpdateTotalCount();
|
repository.UpdateTotalCount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -90,7 +100,8 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
|||||||
"""
|
"""
|
||||||
INSERT INTO download_blobs (normalized_url, blob)
|
INSERT INTO download_blobs (normalized_url, blob)
|
||||||
VALUES (:normalized_url, ZEROBLOB(:blob_length))
|
VALUES (:normalized_url, ZEROBLOB(:blob_length))
|
||||||
ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
|
ON CONFLICT (normalized_url)
|
||||||
|
DO UPDATE SET blob = excluded.blob
|
||||||
RETURNING rowid
|
RETURNING rowid
|
||||||
"""
|
"""
|
||||||
);
|
);
|
||||||
|
@@ -14,16 +14,8 @@ using Microsoft.Data.Sqlite;
|
|||||||
|
|
||||||
namespace DHT.Server.Database.Sqlite.Repositories;
|
namespace DHT.Server.Database.Sqlite.Repositories;
|
||||||
|
|
||||||
sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository {
|
sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), IMessageRepository {
|
||||||
private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
|
private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
|
||||||
|
|
||||||
private readonly SqliteConnectionPool pool;
|
|
||||||
private readonly SqliteDownloadRepository downloads;
|
|
||||||
|
|
||||||
public SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
|
|
||||||
this.pool = pool;
|
|
||||||
this.downloads = downloads;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task Add(IReadOnlyList<Message> messages) {
|
public async Task Add(IReadOnlyList<Message> messages) {
|
||||||
if (messages.Count == 0) {
|
if (messages.Count == 0) {
|
||||||
@@ -50,25 +42,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
("timestamp", SqliteType.Integer)
|
("timestamp", SqliteType.Integer)
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await using var deleteEditTimestampCmd = DeleteByMessageId(conn, "edit_timestamps");
|
await using var attachmentCmd = conn.Upsert("attachments", [
|
||||||
await using var deleteRepliedToCmd = DeleteByMessageId(conn, "replied_to");
|
|
||||||
|
|
||||||
await using var deleteAttachmentsCmd = DeleteByMessageId(conn, "attachments");
|
|
||||||
await using var deleteEmbedsCmd = DeleteByMessageId(conn, "embeds");
|
|
||||||
await using var deleteReactionsCmd = DeleteByMessageId(conn, "reactions");
|
|
||||||
|
|
||||||
await using var editTimestampCmd = conn.Insert("edit_timestamps", [
|
|
||||||
("message_id", SqliteType.Integer),
|
|
||||||
("edit_timestamp", SqliteType.Integer)
|
|
||||||
]);
|
|
||||||
|
|
||||||
await using var repliedToCmd = conn.Insert("replied_to", [
|
|
||||||
("message_id", SqliteType.Integer),
|
|
||||||
("replied_to_id", SqliteType.Integer)
|
|
||||||
]);
|
|
||||||
|
|
||||||
await using var attachmentCmd = conn.Insert("attachments", [
|
|
||||||
("message_id", SqliteType.Integer),
|
|
||||||
("attachment_id", SqliteType.Integer),
|
("attachment_id", SqliteType.Integer),
|
||||||
("name", SqliteType.Text),
|
("name", SqliteType.Text),
|
||||||
("type", SqliteType.Text),
|
("type", SqliteType.Text),
|
||||||
@@ -79,19 +53,41 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
("height", SqliteType.Integer)
|
("height", SqliteType.Integer)
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await using var embedCmd = conn.Insert("embeds", [
|
await using var deleteMessageEditTimestampCmd = DeleteByMessageId(conn, "message_edit_timestamps");
|
||||||
|
await using var deleteMessageRepliedToCmd = DeleteByMessageId(conn, "message_replied_to");
|
||||||
|
|
||||||
|
await using var deleteMessageAttachmentsCmd = DeleteByMessageId(conn, "message_attachments");
|
||||||
|
await using var deleteMessageEmbedsCmd = DeleteByMessageId(conn, "message_embeds");
|
||||||
|
await using var deleteMessageReactionsCmd = DeleteByMessageId(conn, "message_reactions");
|
||||||
|
|
||||||
|
await using var messageEditTimestampCmd = conn.Insert("message_edit_timestamps", [
|
||||||
|
("message_id", SqliteType.Integer),
|
||||||
|
("edit_timestamp", SqliteType.Integer)
|
||||||
|
]);
|
||||||
|
|
||||||
|
await using var messageRepliedToCmd = conn.Insert("message_replied_to", [
|
||||||
|
("message_id", SqliteType.Integer),
|
||||||
|
("replied_to_id", SqliteType.Integer)
|
||||||
|
]);
|
||||||
|
|
||||||
|
await using var messageAttachmentCmd = conn.Insert("message_attachments", [
|
||||||
|
("message_id", SqliteType.Integer),
|
||||||
|
("attachment_id", SqliteType.Integer)
|
||||||
|
]);
|
||||||
|
|
||||||
|
await using var messageEmbedCmd = conn.Insert("message_embeds", [
|
||||||
("message_id", SqliteType.Integer),
|
("message_id", SqliteType.Integer),
|
||||||
("json", SqliteType.Text)
|
("json", SqliteType.Text)
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await using var reactionCmd = conn.Insert("reactions", [
|
await using var messageReactionCmd = conn.Insert("message_reactions", [
|
||||||
("message_id", SqliteType.Integer),
|
("message_id", SqliteType.Integer),
|
||||||
("emoji_id", SqliteType.Integer),
|
("emoji_id", SqliteType.Integer),
|
||||||
("emoji_name", SqliteType.Text),
|
("emoji_name", SqliteType.Text),
|
||||||
("emoji_flags", SqliteType.Integer),
|
("emoji_flags", SqliteType.Integer),
|
||||||
("count", SqliteType.Integer)
|
("count", SqliteType.Integer)
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
|
await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
|
||||||
|
|
||||||
foreach (var message in messages) {
|
foreach (var message in messages) {
|
||||||
@@ -104,29 +100,30 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
messageCmd.Set(":timestamp", message.Timestamp);
|
messageCmd.Set(":timestamp", message.Timestamp);
|
||||||
await messageCmd.ExecuteNonQueryAsync();
|
await messageCmd.ExecuteNonQueryAsync();
|
||||||
|
|
||||||
await ExecuteDeleteByMessageId(deleteEditTimestampCmd, messageId);
|
await ExecuteDeleteByMessageId(deleteMessageEditTimestampCmd, messageId);
|
||||||
await ExecuteDeleteByMessageId(deleteRepliedToCmd, messageId);
|
await ExecuteDeleteByMessageId(deleteMessageRepliedToCmd, messageId);
|
||||||
|
|
||||||
await ExecuteDeleteByMessageId(deleteAttachmentsCmd, messageId);
|
await ExecuteDeleteByMessageId(deleteMessageAttachmentsCmd, messageId);
|
||||||
await ExecuteDeleteByMessageId(deleteEmbedsCmd, messageId);
|
await ExecuteDeleteByMessageId(deleteMessageEmbedsCmd, messageId);
|
||||||
await ExecuteDeleteByMessageId(deleteReactionsCmd, messageId);
|
await ExecuteDeleteByMessageId(deleteMessageReactionsCmd, messageId);
|
||||||
|
|
||||||
if (message.EditTimestamp is {} timestamp) {
|
if (message.EditTimestamp is {} timestamp) {
|
||||||
editTimestampCmd.Set(":message_id", messageId);
|
messageEditTimestampCmd.Set(":message_id", messageId);
|
||||||
editTimestampCmd.Set(":edit_timestamp", timestamp);
|
messageEditTimestampCmd.Set(":edit_timestamp", timestamp);
|
||||||
await editTimestampCmd.ExecuteNonQueryAsync();
|
await messageEditTimestampCmd.ExecuteNonQueryAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.RepliedToId is {} repliedToId) {
|
if (message.RepliedToId is {} repliedToId) {
|
||||||
repliedToCmd.Set(":message_id", messageId);
|
messageRepliedToCmd.Set(":message_id", messageId);
|
||||||
repliedToCmd.Set(":replied_to_id", repliedToId);
|
messageRepliedToCmd.Set(":replied_to_id", repliedToId);
|
||||||
await repliedToCmd.ExecuteNonQueryAsync();
|
await messageRepliedToCmd.ExecuteNonQueryAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!message.Attachments.IsEmpty) {
|
if (!message.Attachments.IsEmpty) {
|
||||||
foreach (var attachment in message.Attachments) {
|
foreach (var attachment in message.Attachments) {
|
||||||
attachmentCmd.Set(":message_id", messageId);
|
object attachmentId = attachment.Id;
|
||||||
attachmentCmd.Set(":attachment_id", attachment.Id);
|
|
||||||
|
attachmentCmd.Set(":attachment_id", attachmentId);
|
||||||
attachmentCmd.Set(":name", attachment.Name);
|
attachmentCmd.Set(":name", attachment.Name);
|
||||||
attachmentCmd.Set(":type", attachment.Type);
|
attachmentCmd.Set(":type", attachment.Type);
|
||||||
attachmentCmd.Set(":normalized_url", attachment.NormalizedUrl);
|
attachmentCmd.Set(":normalized_url", attachment.NormalizedUrl);
|
||||||
@@ -135,16 +132,20 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
attachmentCmd.Set(":width", attachment.Width);
|
attachmentCmd.Set(":width", attachment.Width);
|
||||||
attachmentCmd.Set(":height", attachment.Height);
|
attachmentCmd.Set(":height", attachment.Height);
|
||||||
await attachmentCmd.ExecuteNonQueryAsync();
|
await attachmentCmd.ExecuteNonQueryAsync();
|
||||||
|
|
||||||
|
messageAttachmentCmd.Set(":message_id", messageId);
|
||||||
|
messageAttachmentCmd.Set(":attachment_id", attachmentId);
|
||||||
|
await messageAttachmentCmd.ExecuteNonQueryAsync();
|
||||||
|
|
||||||
await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
|
await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!message.Embeds.IsEmpty) {
|
if (!message.Embeds.IsEmpty) {
|
||||||
foreach (var embed in message.Embeds) {
|
foreach (var embed in message.Embeds) {
|
||||||
embedCmd.Set(":message_id", messageId);
|
messageEmbedCmd.Set(":message_id", messageId);
|
||||||
embedCmd.Set(":json", embed.Json);
|
messageEmbedCmd.Set(":json", embed.Json);
|
||||||
await embedCmd.ExecuteNonQueryAsync();
|
await messageEmbedCmd.ExecuteNonQueryAsync();
|
||||||
|
|
||||||
if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
|
if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
|
||||||
await downloadCollector.Add(download);
|
await downloadCollector.Add(download);
|
||||||
@@ -154,12 +155,12 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
|
|
||||||
if (!message.Reactions.IsEmpty) {
|
if (!message.Reactions.IsEmpty) {
|
||||||
foreach (var reaction in message.Reactions) {
|
foreach (var reaction in message.Reactions) {
|
||||||
reactionCmd.Set(":message_id", messageId);
|
messageReactionCmd.Set(":message_id", messageId);
|
||||||
reactionCmd.Set(":emoji_id", reaction.EmojiId);
|
messageReactionCmd.Set(":emoji_id", reaction.EmojiId);
|
||||||
reactionCmd.Set(":emoji_name", reaction.EmojiName);
|
messageReactionCmd.Set(":emoji_name", reaction.EmojiName);
|
||||||
reactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
|
messageReactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
|
||||||
reactionCmd.Set(":count", reaction.Count);
|
messageReactionCmd.Set(":count", reaction.Count);
|
||||||
await reactionCmd.ExecuteNonQueryAsync();
|
await messageReactionCmd.ExecuteNonQueryAsync();
|
||||||
|
|
||||||
if (reaction.EmojiId is {} emojiId) {
|
if (reaction.EmojiId is {} emojiId) {
|
||||||
await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
|
await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
|
||||||
@@ -178,7 +179,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
public override Task<long> Count(CancellationToken cancellationToken) {
|
public override Task<long> Count(CancellationToken cancellationToken) {
|
||||||
return Count(filter: null, cancellationToken);
|
return Count(filter: null, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<long> Count(MessageFilter? filter, CancellationToken cancellationToken) {
|
public async Task<long> Count(MessageFilter? filter, CancellationToken cancellationToken) {
|
||||||
await using var conn = await pool.Take();
|
await using var conn = await pool.Take();
|
||||||
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
||||||
@@ -221,7 +222,8 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
"""
|
"""
|
||||||
SELECT attachment_id, name, type, normalized_url, download_url, size, width, height
|
SELECT attachment_id, name, type, normalized_url, download_url, size, width, height
|
||||||
FROM attachments
|
FROM attachments
|
||||||
WHERE message_id = :message_id
|
JOIN message_attachments USING (attachment_id)
|
||||||
|
WHERE message_attachments.message_id = :message_id
|
||||||
""";
|
""";
|
||||||
|
|
||||||
await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
|
await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
|
||||||
@@ -238,7 +240,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
const string EmbedSql =
|
const string EmbedSql =
|
||||||
"""
|
"""
|
||||||
SELECT json
|
SELECT json
|
||||||
FROM embeds
|
FROM message_embeds
|
||||||
WHERE message_id = :message_id
|
WHERE message_id = :message_id
|
||||||
""";
|
""";
|
||||||
|
|
||||||
@@ -249,7 +251,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
const string ReactionSql =
|
const string ReactionSql =
|
||||||
"""
|
"""
|
||||||
SELECT emoji_id, emoji_name, emoji_flags, count
|
SELECT emoji_id, emoji_name, emoji_flags, count
|
||||||
FROM reactions
|
FROM message_reactions
|
||||||
WHERE message_id = :message_id
|
WHERE message_id = :message_id
|
||||||
""";
|
""";
|
||||||
|
|
||||||
@@ -262,10 +264,10 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
|
|
||||||
await using var messageCmd = conn.Command(
|
await using var messageCmd = conn.Command(
|
||||||
$"""
|
$"""
|
||||||
SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, et.edit_timestamp, rt.replied_to_id
|
SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, met.edit_timestamp, mrt.replied_to_id
|
||||||
FROM messages m
|
FROM messages m
|
||||||
LEFT JOIN edit_timestamps et ON m.message_id = et.message_id
|
LEFT JOIN message_edit_timestamps met ON m.message_id = met.message_id
|
||||||
LEFT JOIN replied_to rt ON m.message_id = rt.message_id
|
LEFT JOIN message_replied_to mrt ON m.message_id = mrt.message_id
|
||||||
{filter.GenerateConditions("m").BuildWhereClause()}
|
{filter.GenerateConditions("m").BuildWhereClause()}
|
||||||
"""
|
"""
|
||||||
);
|
);
|
||||||
@@ -292,7 +294,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
|||||||
|
|
||||||
public async IAsyncEnumerable<ulong> GetIds(MessageFilter? filter) {
|
public async IAsyncEnumerable<ulong> GetIds(MessageFilter? filter) {
|
||||||
await using var conn = await pool.Take();
|
await using var conn = await pool.Take();
|
||||||
|
|
||||||
await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateConditions().BuildWhereClause());
|
await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateConditions().BuildWhereClause());
|
||||||
await using var reader = await cmd.ExecuteReaderAsync();
|
await using var reader = await cmd.ExecuteReaderAsync();
|
||||||
|
|
||||||
|
@@ -0,0 +1,58 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using DHT.Server.Data.Settings;
|
||||||
|
using DHT.Server.Database.Repositories;
|
||||||
|
using DHT.Server.Database.Sqlite.Utils;
|
||||||
|
using Microsoft.Data.Sqlite;
|
||||||
|
|
||||||
|
namespace DHT.Server.Database.Sqlite.Repositories;
|
||||||
|
|
||||||
|
sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepository {
|
||||||
|
public Task Set<T>(SettingsKey<T> key, T value) {
|
||||||
|
return Set(setter => setter.Set(key, value));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Set(Func<ISettingsRepository.ISetter, Task> setter) {
|
||||||
|
await using var conn = await pool.Take();
|
||||||
|
await conn.BeginTransactionAsync();
|
||||||
|
|
||||||
|
await using var cmd = conn.Command(
|
||||||
|
"""
|
||||||
|
INSERT INTO metadata (key, value)
|
||||||
|
VALUES (:key, :value)
|
||||||
|
ON CONFLICT (key)
|
||||||
|
DO UPDATE SET value = excluded.value
|
||||||
|
"""
|
||||||
|
);
|
||||||
|
|
||||||
|
cmd.Add(":key", SqliteType.Text);
|
||||||
|
cmd.Add(":value", SqliteType.Text);
|
||||||
|
|
||||||
|
await setter(new Setter(cmd));
|
||||||
|
|
||||||
|
await cmd.ExecuteNonQueryAsync();
|
||||||
|
await conn.CommitTransactionAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class Setter(SqliteCommand cmd) : ISettingsRepository.ISetter {
|
||||||
|
public async Task Set<T>(SettingsKey<T> key, T value) {
|
||||||
|
cmd.Set(":key", key.Key);
|
||||||
|
cmd.Set(":value", key.ToString(value));
|
||||||
|
await cmd.ExecuteNonQueryAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<T?> Get<T>(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");
|
||||||
|
cmd.AddAndSet(":key", SqliteType.Text, key.Key);
|
||||||
|
|
||||||
|
await using var reader = await cmd.ExecuteReaderAsync();
|
||||||
|
value = await reader.ReadAsync() ? reader.GetString(0) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return value != null && key.FromString(value, out var convertedValue) ? convertedValue : defaultValue;
|
||||||
|
}
|
||||||
|
}
|
@@ -8,7 +8,10 @@ sealed class SqliteSchemaUpgradeTo3 : ISchemaUpgrade {
|
|||||||
await reporter.MainWork("Applying schema changes...", 0, 1);
|
await reporter.MainWork("Applying schema changes...", 0, 1);
|
||||||
|
|
||||||
await SqliteSchema.CreateMessageEditTimestampTable(conn);
|
await SqliteSchema.CreateMessageEditTimestampTable(conn);
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE message_edit_timestamps RENAME TO edit_timestamps");
|
||||||
|
|
||||||
await SqliteSchema.CreateMessageRepliedToTable(conn);
|
await SqliteSchema.CreateMessageRepliedToTable(conn);
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE message_replied_to RENAME TO replied_to");
|
||||||
|
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
INSERT INTO edit_timestamps (message_id, edit_timestamp)
|
INSERT INTO edit_timestamps (message_id, edit_timestamp)
|
||||||
|
23
app/Server/Database/Sqlite/Schema/SqliteSchemaUpgradeTo9.cs
Normal file
23
app/Server/Database/Sqlite/Schema/SqliteSchemaUpgradeTo9.cs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
using System.Threading.Tasks;
|
||||||
|
using DHT.Server.Database.Sqlite.Utils;
|
||||||
|
|
||||||
|
namespace DHT.Server.Database.Sqlite.Schema;
|
||||||
|
|
||||||
|
sealed class SqliteSchemaUpgradeTo9 : ISchemaUpgrade {
|
||||||
|
async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
|
||||||
|
await reporter.MainWork("Applying schema changes...", 0, 3);
|
||||||
|
await SqliteSchema.CreateMessageAttachmentsTable(conn);
|
||||||
|
|
||||||
|
await reporter.MainWork("Migrating message attachments...", 1, 3);
|
||||||
|
await conn.ExecuteAsync("INSERT INTO message_attachments (message_id, attachment_id) SELECT message_id, attachment_id FROM attachments a JOIN messages m USING (message_id)");
|
||||||
|
|
||||||
|
await reporter.MainWork("Applying schema changes...", 2, 3);
|
||||||
|
await conn.ExecuteAsync("DROP INDEX attachments_message_ix");
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE attachments DROP COLUMN message_id");
|
||||||
|
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE embeds RENAME TO message_embeds");
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE edit_timestamps RENAME TO message_edit_timestamps");
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE replied_to RENAME TO message_replied_to");
|
||||||
|
await conn.ExecuteAsync("ALTER TABLE reactions RENAME TO message_reactions");
|
||||||
|
}
|
||||||
|
}
|
@@ -39,6 +39,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
|
|||||||
|
|
||||||
public string Path { get; }
|
public string Path { get; }
|
||||||
|
|
||||||
|
public ISettingsRepository Settings => settings;
|
||||||
public IUserRepository Users => users;
|
public IUserRepository Users => users;
|
||||||
public IServerRepository Servers => servers;
|
public IServerRepository Servers => servers;
|
||||||
public IChannelRepository Channels => channels;
|
public IChannelRepository Channels => channels;
|
||||||
@@ -47,6 +48,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
|
|||||||
|
|
||||||
private readonly SqliteConnectionPool pool;
|
private readonly SqliteConnectionPool pool;
|
||||||
|
|
||||||
|
private readonly SqliteSettingsRepository settings;
|
||||||
private readonly SqliteUserRepository users;
|
private readonly SqliteUserRepository users;
|
||||||
private readonly SqliteServerRepository servers;
|
private readonly SqliteServerRepository servers;
|
||||||
private readonly SqliteChannelRepository channels;
|
private readonly SqliteChannelRepository channels;
|
||||||
@@ -58,6 +60,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
|
|||||||
this.pool = pool;
|
this.pool = pool;
|
||||||
|
|
||||||
downloads = new SqliteDownloadRepository(pool);
|
downloads = new SqliteDownloadRepository(pool);
|
||||||
|
settings = new SqliteSettingsRepository(pool);
|
||||||
users = new SqliteUserRepository(pool, downloads);
|
users = new SqliteUserRepository(pool, downloads);
|
||||||
servers = new SqliteServerRepository(pool);
|
servers = new SqliteServerRepository(pool);
|
||||||
channels = new SqliteChannelRepository(pool);
|
channels = new SqliteChannelRepository(pool);
|
||||||
|
@@ -8,7 +8,7 @@ using DHT.Utils.Logging;
|
|||||||
namespace DHT.Server.Database.Sqlite;
|
namespace DHT.Server.Database.Sqlite;
|
||||||
|
|
||||||
sealed class SqliteSchema {
|
sealed class SqliteSchema {
|
||||||
internal const int Version = 8;
|
internal const int Version = 9;
|
||||||
|
|
||||||
private static readonly Log Log = Log.ForType<SqliteSchema>();
|
private static readonly Log Log = Log.ForType<SqliteSchema>();
|
||||||
|
|
||||||
@@ -86,7 +86,6 @@ sealed class SqliteSchema {
|
|||||||
|
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
CREATE TABLE attachments (
|
CREATE TABLE attachments (
|
||||||
message_id INTEGER NOT NULL,
|
|
||||||
attachment_id INTEGER NOT NULL PRIMARY KEY NOT NULL,
|
attachment_id INTEGER NOT NULL PRIMARY KEY NOT NULL,
|
||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
type TEXT,
|
type TEXT,
|
||||||
@@ -99,14 +98,14 @@ sealed class SqliteSchema {
|
|||||||
""");
|
""");
|
||||||
|
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
CREATE TABLE embeds (
|
CREATE TABLE message_embeds (
|
||||||
message_id INTEGER NOT NULL,
|
message_id INTEGER NOT NULL,
|
||||||
json TEXT NOT NULL
|
json TEXT NOT NULL
|
||||||
)
|
)
|
||||||
""");
|
""");
|
||||||
|
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
CREATE TABLE reactions (
|
CREATE TABLE message_reactions (
|
||||||
message_id INTEGER NOT NULL,
|
message_id INTEGER NOT NULL,
|
||||||
emoji_id INTEGER,
|
emoji_id INTEGER,
|
||||||
emoji_name TEXT,
|
emoji_name TEXT,
|
||||||
@@ -118,17 +117,17 @@ sealed class SqliteSchema {
|
|||||||
await CreateMessageEditTimestampTable(conn);
|
await CreateMessageEditTimestampTable(conn);
|
||||||
await CreateMessageRepliedToTable(conn);
|
await CreateMessageRepliedToTable(conn);
|
||||||
await CreateDownloadTables(conn);
|
await CreateDownloadTables(conn);
|
||||||
|
await CreateMessageAttachmentsTable(conn);
|
||||||
|
|
||||||
await conn.ExecuteAsync("CREATE INDEX attachments_message_ix ON attachments(message_id)");
|
await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON message_embeds(message_id)");
|
||||||
await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON embeds(message_id)");
|
await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON message_reactions(message_id)");
|
||||||
await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON reactions(message_id)");
|
|
||||||
|
|
||||||
await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
|
await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
|
internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
CREATE TABLE edit_timestamps (
|
CREATE TABLE message_edit_timestamps (
|
||||||
message_id INTEGER PRIMARY KEY NOT NULL,
|
message_id INTEGER PRIMARY KEY NOT NULL,
|
||||||
edit_timestamp INTEGER NOT NULL
|
edit_timestamp INTEGER NOT NULL
|
||||||
)
|
)
|
||||||
@@ -137,7 +136,7 @@ sealed class SqliteSchema {
|
|||||||
|
|
||||||
internal static async Task CreateMessageRepliedToTable(ISqliteConnection conn) {
|
internal static async Task CreateMessageRepliedToTable(ISqliteConnection conn) {
|
||||||
await conn.ExecuteAsync("""
|
await conn.ExecuteAsync("""
|
||||||
CREATE TABLE replied_to (
|
CREATE TABLE message_replied_to (
|
||||||
message_id INTEGER PRIMARY KEY NOT NULL,
|
message_id INTEGER PRIMARY KEY NOT NULL,
|
||||||
replied_to_id INTEGER NOT NULL
|
replied_to_id INTEGER NOT NULL
|
||||||
)
|
)
|
||||||
@@ -163,6 +162,18 @@ sealed class SqliteSchema {
|
|||||||
)
|
)
|
||||||
""");
|
""");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static async Task CreateMessageAttachmentsTable(ISqliteConnection conn) {
|
||||||
|
await conn.ExecuteAsync("""
|
||||||
|
CREATE TABLE message_attachments (
|
||||||
|
message_id INTEGER NOT NULL,
|
||||||
|
attachment_id INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY (message_id, attachment_id),
|
||||||
|
FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE,
|
||||||
|
FOREIGN KEY (attachment_id) REFERENCES attachments (attachment_id) ON UPDATE CASCADE ON DELETE CASCADE
|
||||||
|
)
|
||||||
|
""");
|
||||||
|
}
|
||||||
|
|
||||||
private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
|
private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
|
||||||
var upgrades = new Dictionary<int, ISchemaUpgrade> {
|
var upgrades = new Dictionary<int, ISchemaUpgrade> {
|
||||||
@@ -173,13 +184,14 @@ sealed class SqliteSchema {
|
|||||||
{ 5, new SqliteSchemaUpgradeTo6() },
|
{ 5, new SqliteSchemaUpgradeTo6() },
|
||||||
{ 6, new SqliteSchemaUpgradeTo7() },
|
{ 6, new SqliteSchemaUpgradeTo7() },
|
||||||
{ 7, new SqliteSchemaUpgradeTo8() },
|
{ 7, new SqliteSchemaUpgradeTo8() },
|
||||||
|
{ 8, new SqliteSchemaUpgradeTo9() },
|
||||||
};
|
};
|
||||||
|
|
||||||
var perf = Log.Start("from version " + dbVersion);
|
var perf = Log.Start("from version " + dbVersion);
|
||||||
|
|
||||||
for (int fromVersion = dbVersion; fromVersion < Version; fromVersion++) {
|
for (int fromVersion = dbVersion; fromVersion < Version; fromVersion++) {
|
||||||
var toVersion = fromVersion + 1;
|
var toVersion = fromVersion + 1;
|
||||||
|
|
||||||
if (upgrades.TryGetValue(fromVersion, out var upgrade)) {
|
if (upgrades.TryGetValue(fromVersion, out var upgrade)) {
|
||||||
await upgrade.Run(conn, reporter);
|
await upgrade.Run(conn, reporter);
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Reactive.Subjects;
|
using System.Reactive.Subjects;
|
||||||
@@ -70,10 +71,15 @@ sealed class DownloaderTask : IAsyncDisposable {
|
|||||||
var client = new HttpClient(new SocketsHttpHandler {
|
var client = new HttpClient(new SocketsHttpHandler {
|
||||||
ConnectTimeout = TimeSpan.FromSeconds(30)
|
ConnectTimeout = TimeSpan.FromSeconds(30)
|
||||||
});
|
});
|
||||||
|
|
||||||
client.Timeout = Timeout.InfiniteTimeSpan;
|
client.Timeout = Timeout.InfiniteTimeSpan;
|
||||||
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
|
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
|
||||||
|
|
||||||
|
string tempFileName = Path.GetTempFileName();
|
||||||
|
log.Debug("Using temporary file: " + tempFileName);
|
||||||
|
|
||||||
|
await using var tempFileStream = new FileStream(tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Read, 4096, FileOptions.DeleteOnClose);
|
||||||
|
|
||||||
while (!cancellationToken.IsCancellationRequested) {
|
while (!cancellationToken.IsCancellationRequested) {
|
||||||
var item = await downloadQueue.Reader.ReadAsync(cancellationToken);
|
var item = await downloadQueue.Reader.ReadAsync(cancellationToken);
|
||||||
log.Debug("Downloading " + item.DownloadUrl + "...");
|
log.Debug("Downloading " + item.DownloadUrl + "...");
|
||||||
@@ -81,15 +87,7 @@ sealed class DownloaderTask : IAsyncDisposable {
|
|||||||
try {
|
try {
|
||||||
var response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, item.DownloadUrl), HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
var response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, item.DownloadUrl), HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
||||||
response.EnsureSuccessStatusCode();
|
response.EnsureSuccessStatusCode();
|
||||||
|
await HandleResponse(response, tempFileStream, item);
|
||||||
if (response.Content.Headers.ContentLength is {} contentLength) {
|
|
||||||
await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
|
|
||||||
await db.Downloads.AddDownload(item.ToSuccess(contentLength), stream);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
|
||||||
log.Error("Download response has no content length: " + item.DownloadUrl);
|
|
||||||
}
|
|
||||||
} catch (OperationCanceledException e) when (e.CancellationToken == cancellationToken) {
|
} catch (OperationCanceledException e) when (e.CancellationToken == cancellationToken) {
|
||||||
// Ignore.
|
// Ignore.
|
||||||
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
||||||
@@ -111,6 +109,27 @@ sealed class DownloaderTask : IAsyncDisposable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task HandleResponse(HttpResponseMessage response, FileStream tempFileStream, DownloadItem item) {
|
||||||
|
if (response.Content.Headers.ContentLength is not {} contentLength) {
|
||||||
|
throw new InvalidOperationException("Download response has no content length: " + item.DownloadUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (tempFileStream.Length != 0) {
|
||||||
|
throw new InvalidOperationException("Temporary file is not empty: " + tempFileStream.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
await using (var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken)) {
|
||||||
|
await responseStream.CopyToAsync(tempFileStream, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
tempFileStream.Seek(0, SeekOrigin.Begin);
|
||||||
|
await db.Downloads.AddDownload(item.ToSuccess(contentLength), tempFileStream);
|
||||||
|
} finally {
|
||||||
|
tempFileStream.SetLength(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async ValueTask DisposeAsync() {
|
public async ValueTask DisposeAsync() {
|
||||||
try {
|
try {
|
||||||
await cancellationTokenSource.CancelAsync();
|
await cancellationTokenSource.CancelAsync();
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
|
||||||
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
61
app/Utils/Tasks/DelayedThrottledTask.cs
Normal file
61
app/Utils/Tasks/DelayedThrottledTask.cs
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Channels;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using DHT.Utils.Logging;
|
||||||
|
|
||||||
|
namespace DHT.Utils.Tasks;
|
||||||
|
|
||||||
|
public sealed class DelayedThrottledTask<T> : IDisposable {
|
||||||
|
private readonly Channel<T> taskChannel = Channel.CreateBounded<T>(new BoundedChannelOptions(capacity: 1) {
|
||||||
|
SingleReader = true,
|
||||||
|
SingleWriter = false,
|
||||||
|
AllowSynchronousContinuations = false,
|
||||||
|
FullMode = BoundedChannelFullMode.DropOldest
|
||||||
|
});
|
||||||
|
|
||||||
|
private readonly CancellationTokenSource cancellationTokenSource = new ();
|
||||||
|
private readonly Log log;
|
||||||
|
private readonly TimeSpan delay;
|
||||||
|
private readonly Func<T, Task> inputProcessor;
|
||||||
|
|
||||||
|
public DelayedThrottledTask(Log log, TimeSpan delay, Func<T, Task> inputProcessor) {
|
||||||
|
this.log = log;
|
||||||
|
this.delay = delay;
|
||||||
|
this.inputProcessor = inputProcessor;
|
||||||
|
|
||||||
|
Task.Run(ReaderTask);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ReaderTask() {
|
||||||
|
var cancellationToken = cancellationTokenSource.Token;
|
||||||
|
|
||||||
|
try {
|
||||||
|
while (await taskChannel.Reader.WaitToReadAsync(cancellationToken)) {
|
||||||
|
await Task.Delay(delay, cancellationToken);
|
||||||
|
|
||||||
|
T input = await taskChannel.Reader.ReadAsync(cancellationToken);
|
||||||
|
try {
|
||||||
|
await inputProcessor(input);
|
||||||
|
} catch (OperationCanceledException) {
|
||||||
|
throw;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.Error("Caught exception in task: " + e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (OperationCanceledException) {
|
||||||
|
// Ignore.
|
||||||
|
} finally {
|
||||||
|
cancellationTokenSource.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Post(T input) {
|
||||||
|
taskChannel.Writer.TryWrite(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
taskChannel.Writer.Complete();
|
||||||
|
cancellationTokenSource.Cancel();
|
||||||
|
}
|
||||||
|
}
|
@@ -8,5 +8,5 @@ using DHT.Utils;
|
|||||||
namespace DHT.Utils;
|
namespace DHT.Utils;
|
||||||
|
|
||||||
static class Version {
|
static class Version {
|
||||||
public const string Tag = "42.1.0.0";
|
public const string Tag = "44.0.0.0";
|
||||||
}
|
}
|
||||||
|
BIN
app/empty.dht
BIN
app/empty.dht
Binary file not shown.
Reference in New Issue
Block a user