mirror of
https://github.com/chylex/Discord-History-Tracker.git
synced 2024-11-25 05:42:45 +01:00
Compare commits
4 Commits
ebdabb3dd2
...
f5abc8bebb
| Author | SHA1 | Date | |
|---|---|---|---|
f5abc8bebb
|
|||
|
a268060d03
|
|||
|
89476d8f58
|
|||
|
1e40a8595f
|
@ -13,10 +13,10 @@
|
||||
<CssCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</CssCodeStyleSettings>
|
||||
<DB2CodeStyleSettings version="7">
|
||||
<DB2CodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</DB2CodeStyleSettings>
|
||||
<DerbyCodeStyleSettings version="7">
|
||||
<DerbyCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</DerbyCodeStyleSettings>
|
||||
<GoCodeStyleSettings>
|
||||
@ -26,10 +26,10 @@
|
||||
<option name="WRAP_FUNC_PARAMS" value="5" />
|
||||
<option name="WRAP_FUNC_RESULT" value="5" />
|
||||
</GoCodeStyleSettings>
|
||||
<H2CodeStyleSettings version="7">
|
||||
<H2CodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</H2CodeStyleSettings>
|
||||
<HSQLCodeStyleSettings version="7">
|
||||
<HSQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</HSQLCodeStyleSettings>
|
||||
<HTMLCodeStyleSettings>
|
||||
@ -85,10 +85,10 @@
|
||||
<LessCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</LessCodeStyleSettings>
|
||||
<MSSQLCodeStyleSettings version="7">
|
||||
<MSSQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</MSSQLCodeStyleSettings>
|
||||
<MySQLCodeStyleSettings version="7">
|
||||
<MySQLCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</MySQLCodeStyleSettings>
|
||||
<Objective-C>
|
||||
@ -98,7 +98,7 @@
|
||||
<option name="SPACE_BEFORE_INIT_LIST" value="true" />
|
||||
<option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
|
||||
</Objective-C>
|
||||
<OracleCodeStyleSettings version="7">
|
||||
<OracleCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</OracleCodeStyleSettings>
|
||||
<PHPCodeStyleSettings>
|
||||
@ -116,7 +116,7 @@
|
||||
<option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
|
||||
<option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
|
||||
</PHPCodeStyleSettings>
|
||||
<PostgresCodeStyleSettings version="7">
|
||||
<PostgresCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</PostgresCodeStyleSettings>
|
||||
<Properties>
|
||||
@ -143,7 +143,7 @@
|
||||
<option name="INDENT_WHEN_CASES" value="true" />
|
||||
<option name="CHAIN_CALLS_ALIGNMENT" value="2" />
|
||||
</Ruby>
|
||||
<SQLiteCodeStyleSettings version="7">
|
||||
<SQLiteCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</SQLiteCodeStyleSettings>
|
||||
<ScssCodeStyleSettings>
|
||||
@ -152,7 +152,7 @@
|
||||
<Shell_Script>
|
||||
<option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
|
||||
</Shell_Script>
|
||||
<SqlCodeStyleSettings version="7">
|
||||
<SqlCodeStyleSettings version="6">
|
||||
<option name="KEYWORD_CASE" value="2" />
|
||||
<option name="TYPE_CASE" value="2" />
|
||||
<option name="CUSTOM_TYPE_CASE" value="2" />
|
||||
@ -179,7 +179,7 @@
|
||||
<option name="IMP_LOOP_LOOP_INDENT" value="false" />
|
||||
<option name="EXPR_CASE_WHEN_WRAP" value="false" />
|
||||
</SqlCodeStyleSettings>
|
||||
<SybaseCodeStyleSettings version="7">
|
||||
<SybaseCodeStyleSettings version="6">
|
||||
<option name="USE_GENERIC_STYLE" value="true" />
|
||||
</SybaseCodeStyleSettings>
|
||||
<TypeScriptCodeStyleSettings version="0">
|
||||
|
||||
@ -15,7 +15,6 @@ sealed class Arguments {
|
||||
public string? DatabaseFile { get; }
|
||||
public ushort? ServerPort { get; }
|
||||
public string? ServerToken { get; }
|
||||
public byte? ConcurrentDownloads { get; }
|
||||
|
||||
public Arguments(IReadOnlyList<string> args) {
|
||||
for (int i = FirstArgument; i < args.Count; i++) {
|
||||
@ -51,11 +50,11 @@ sealed class Arguments {
|
||||
continue;
|
||||
|
||||
case "-port": {
|
||||
if (!ushort.TryParse(value, out var port)) {
|
||||
Log.Warn("Invalid port number: " + value);
|
||||
if (ushort.TryParse(value, out var port)) {
|
||||
ServerPort = port;
|
||||
}
|
||||
else {
|
||||
ServerPort = port;
|
||||
Log.Warn("Invalid port number: " + value);
|
||||
}
|
||||
|
||||
continue;
|
||||
@ -65,20 +64,6 @@ sealed class Arguments {
|
||||
ServerToken = value;
|
||||
continue;
|
||||
|
||||
case "-concurrentdownloads":
|
||||
if (!ulong.TryParse(value, out var concurrentDownloads) || concurrentDownloads == 0) {
|
||||
Log.Warn("Invalid concurrent downloads count: " + value);
|
||||
}
|
||||
else if (concurrentDownloads > 10) {
|
||||
Log.Warn("Limiting concurrent downloads to 10");
|
||||
ConcurrentDownloads = 10;
|
||||
}
|
||||
else {
|
||||
ConcurrentDownloads = (byte) concurrentDownloads;
|
||||
}
|
||||
|
||||
continue;
|
||||
|
||||
default:
|
||||
Log.Warn("Unknown command line argument: " + key);
|
||||
break;
|
||||
|
||||
@ -30,7 +30,6 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
||||
private MainContentScreenModel? mainContentScreenModel;
|
||||
|
||||
private readonly Window window;
|
||||
private readonly int? concurrentDownloads;
|
||||
|
||||
private State? state;
|
||||
|
||||
@ -74,8 +73,6 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
||||
if (args.ServerToken != null) {
|
||||
ServerConfiguration.Token = args.ServerToken;
|
||||
}
|
||||
|
||||
concurrentDownloads = args.ConcurrentDownloads;
|
||||
}
|
||||
|
||||
private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
|
||||
@ -83,7 +80,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
|
||||
|
||||
await DisposeState();
|
||||
|
||||
state = new State(db, concurrentDownloads);
|
||||
state = new State(db);
|
||||
|
||||
try {
|
||||
await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
|
||||
|
||||
@ -10,8 +10,7 @@ using DHT.Server;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Service;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages {
|
||||
sealed class DebugPageModel {
|
||||
public string GenerateChannels { get; set; } = "0";
|
||||
public string GenerateUsers { get; set; } = "0";
|
||||
@ -160,9 +159,9 @@ sealed class DebugPageModel {
|
||||
return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
namespace DHT.Desktop.Main.Pages;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages {
|
||||
sealed class DebugPageModel {
|
||||
public string GenerateChannels { get; set; } = "0";
|
||||
public string GenerateUsers { get; set; } = "0";
|
||||
@ -170,4 +169,5 @@ sealed class DebugPageModel {
|
||||
|
||||
public void OnClickAddRandomDataToDatabase() {}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -60,7 +60,7 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
|
||||
string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
|
||||
string serverToken = ServerConfiguration.Token;
|
||||
|
||||
Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken)) {
|
||||
Process.Start(new ProcessStartInfo(serverUrl + "/viewer?token=" + HttpUtility.UrlEncode(serverToken)) {
|
||||
UseShellExecute = true
|
||||
});
|
||||
} catch (Exception e) {
|
||||
|
||||
@ -48,16 +48,6 @@ const STATE = (function() {
|
||||
});
|
||||
};
|
||||
|
||||
const getDate = function(date) {
|
||||
if (date instanceof Date) {
|
||||
return date;
|
||||
}
|
||||
else {
|
||||
// noinspection JSUnresolvedReference
|
||||
return date.toDate();
|
||||
}
|
||||
};
|
||||
|
||||
const trackingStateChangedListeners = [];
|
||||
let isTracking = false;
|
||||
|
||||
@ -79,8 +69,8 @@ const STATE = (function() {
|
||||
* @property {String} channel_id
|
||||
* @property {DiscordUser} author
|
||||
* @property {String} content
|
||||
* @property {Date} timestamp
|
||||
* @property {Date|null} editedTimestamp
|
||||
* @property {Timestamp} timestamp
|
||||
* @property {Timestamp|null} editedTimestamp
|
||||
* @property {DiscordAttachment[]} attachments
|
||||
* @property {Object[]} embeds
|
||||
* @property {DiscordMessageReaction[]} [reactions]
|
||||
@ -116,6 +106,11 @@ const STATE = (function() {
|
||||
* @property {Boolean} animated
|
||||
*/
|
||||
|
||||
/**
|
||||
* @name Timestamp
|
||||
* @property {Function} toDate
|
||||
*/
|
||||
|
||||
return {
|
||||
setup(port, token) {
|
||||
serverPort = port;
|
||||
@ -228,12 +223,12 @@ const STATE = (function() {
|
||||
sender: msg.author.id,
|
||||
channel: msg.channel_id,
|
||||
text: msg.content,
|
||||
timestamp: getDate(msg.timestamp).getTime()
|
||||
timestamp: msg.timestamp.toDate().getTime()
|
||||
};
|
||||
|
||||
if (msg.editedTimestamp !== null) {
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
obj.editTimestamp = getDate(msg.editedTimestamp).getTime();
|
||||
obj.editTimestamp = msg.editedTimestamp.toDate().getTime();
|
||||
}
|
||||
|
||||
if (msg.messageReference !== null) {
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
<link rel="stylesheet" href="styles/modal.css">
|
||||
|
||||
<script type="text/javascript">
|
||||
window.DHT_SERVER_URL = location.protocol + "//" + location.host + location.pathname;
|
||||
window.DHT_SERVER_TOKEN = new URLSearchParams(location.search).get("token");
|
||||
</script>
|
||||
<script type="module" src="scripts/bootstrap.mjs"></script>
|
||||
@ -69,9 +70,7 @@
|
||||
</div>
|
||||
|
||||
<div id="app">
|
||||
<div id="channels">
|
||||
<div class="loading"></div>
|
||||
</div>
|
||||
<div id="channels"></div>
|
||||
<div id="messages"></div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -36,25 +36,10 @@ document.addEventListener("DOMContentLoaded", () => {
|
||||
gui.scrollMessagesToTop();
|
||||
});
|
||||
|
||||
async function loadData() {
|
||||
try {
|
||||
const response = await fetch("/get-viewer-data?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN), {
|
||||
method: "GET",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
credentials: "omit",
|
||||
redirect: "error",
|
||||
});
|
||||
|
||||
const json = await response.json();
|
||||
state.uploadFile(json);
|
||||
state.uploadFile(JSON.parse(window.DHT_EMBEDDED));
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Could not load data, see console for details.");
|
||||
document.querySelector("#channels > div.loading").remove();
|
||||
alert("Could not parse embedded file, see console for details.");
|
||||
}
|
||||
}
|
||||
|
||||
loadData();
|
||||
});
|
||||
|
||||
@ -41,14 +41,17 @@ export default (function() {
|
||||
let templateReaction;
|
||||
let templateReactionCustom;
|
||||
|
||||
const fileUrlProcessor = function(serverToken) {
|
||||
if (typeof serverToken === "string") {
|
||||
return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
|
||||
const fileUrlProcessor = function(serverUrl, serverToken) {
|
||||
if (typeof serverUrl === "string" && typeof serverToken === "string") {
|
||||
return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
|
||||
}
|
||||
else {
|
||||
return url => url;
|
||||
}
|
||||
}(window.DHT_SERVER_TOKEN);
|
||||
}(
|
||||
window["DHT_SERVER_URL"],
|
||||
window["DHT_SERVER_TOKEN"]
|
||||
);
|
||||
|
||||
const getEmoji = function(name, id, extension) {
|
||||
const tag = ":" + name + ":";
|
||||
@ -113,14 +116,14 @@ export default (function() {
|
||||
return {
|
||||
setup() {
|
||||
templateChannelServer = new template([
|
||||
"<div class='channel' data-channel='{id}'>",
|
||||
"<div data-channel='{id}'>",
|
||||
"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
|
||||
"<span class='server'>{server.name} ({server.type})</span>",
|
||||
"</div>"
|
||||
].join(""));
|
||||
|
||||
templateChannelPrivate = new template([
|
||||
"<div class='channel' data-channel='{id}'>",
|
||||
"<div data-channel='{id}'>",
|
||||
"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
|
||||
"<span class='server'>({server.type})</span>",
|
||||
"</div>"
|
||||
@ -161,12 +164,12 @@ export default (function() {
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedImage = new template([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedImageWithSize = new template([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
|
||||
@ -3,24 +3,18 @@
|
||||
min-width: 215px;
|
||||
max-width: 300px;
|
||||
overflow-y: auto;
|
||||
color: #eee;
|
||||
background-color: #1c1e22;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
#channels > div.loading {
|
||||
margin: 0 auto;
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
}
|
||||
|
||||
#channels > div.channel {
|
||||
#channels > div {
|
||||
cursor: pointer;
|
||||
padding: 10px 12px;
|
||||
color: #eee;
|
||||
font-size: 15px;
|
||||
border-bottom: 1px solid #333333;
|
||||
}
|
||||
|
||||
#channels > div.channel:hover, #channels > div.channel.active {
|
||||
#channels > div:hover, #channels > div.active {
|
||||
background-color: #282b30;
|
||||
}
|
||||
|
||||
|
||||
@ -11,20 +11,3 @@ body {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.loading {
|
||||
position: relative;
|
||||
--loading-backdrop: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
.loading::after {
|
||||
content: "";
|
||||
background: var(--loading-backdrop)
|
||||
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
|
||||
no-repeat center center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@ -107,11 +107,23 @@
|
||||
}
|
||||
|
||||
.message .thumbnail {
|
||||
--loading-backdrop: rgba(0, 0, 0, 0.75);
|
||||
position: relative;
|
||||
max-width: calc(100% - 20px);
|
||||
max-height: 320px;
|
||||
}
|
||||
|
||||
.message .thumbnail.loading::after {
|
||||
content: "";
|
||||
background: rgba(0, 0, 0, 0.75)
|
||||
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
|
||||
no-repeat center center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.message .thumbnail img {
|
||||
width: auto;
|
||||
max-width: 100%;
|
||||
|
||||
3
app/Server/Data/DownloadWithData.cs
Normal file
3
app/Server/Data/DownloadWithData.cs
Normal file
@ -0,0 +1,3 @@
|
||||
namespace DHT.Server.Data;
|
||||
|
||||
public readonly record struct DownloadWithData(Download Download, byte[]? Data);
|
||||
@ -26,9 +26,7 @@ public static class DatabaseExtensions {
|
||||
await target.Messages.Add(batchedMessages);
|
||||
|
||||
await foreach (var download in source.Downloads.Get()) {
|
||||
if (download.Status != DownloadStatus.Success || !await source.Downloads.GetDownloadData(download.NormalizedUrl, stream => target.Downloads.AddDownload(download, stream))) {
|
||||
await target.Downloads.AddDownload(download, stream: null);
|
||||
}
|
||||
await target.Downloads.AddDownload(await source.Downloads.HydrateWithData(download));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ using DHT.Utils.Logging;
|
||||
|
||||
namespace DHT.Server.Database.Export;
|
||||
|
||||
static class ViewerJsonExport {
|
||||
public static class ViewerJsonExport {
|
||||
private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
|
||||
|
||||
public static async Task Generate(Stream stream, IDatabaseFile db, MessageFilter? filter = null) {
|
||||
|
||||
@ -161,7 +161,7 @@ public static class LegacyArchiveImport {
|
||||
|
||||
var messagesObj = data.HasKey(channelIdStr) ? data.RequireObject(channelIdStr, DataPath) : (JsonElement?) null;
|
||||
if (messagesObj == null) {
|
||||
return [];
|
||||
return Array.Empty<Message>();
|
||||
}
|
||||
|
||||
return messagesObj.Value.EnumerateObject().Select(item => {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Data;
|
||||
using DHT.Server.Data.Aggregations;
|
||||
using DHT.Server.Data.Filters;
|
||||
using DHT.Server.Download;
|
||||
@ -14,7 +14,7 @@ namespace DHT.Server.Database.Repositories;
|
||||
public interface IDownloadRepository {
|
||||
IObservable<long> TotalCount { get; }
|
||||
|
||||
Task AddDownload(Data.Download item, Stream? stream);
|
||||
Task AddDownload(DownloadWithData item);
|
||||
|
||||
Task<long> Count(DownloadItemFilter filter, CancellationToken cancellationToken = default);
|
||||
|
||||
@ -22,9 +22,9 @@ public interface IDownloadRepository {
|
||||
|
||||
IAsyncEnumerable<Data.Download> Get();
|
||||
|
||||
Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
|
||||
Task<DownloadWithData> HydrateWithData(Data.Download download);
|
||||
|
||||
Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor);
|
||||
Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl);
|
||||
|
||||
IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken = default);
|
||||
|
||||
@ -35,7 +35,7 @@ public interface IDownloadRepository {
|
||||
internal sealed class Dummy : IDownloadRepository {
|
||||
public IObservable<long> TotalCount { get; } = Observable.Return(0L);
|
||||
|
||||
public Task AddDownload(Data.Download item, Stream? stream) {
|
||||
public Task AddDownload(DownloadWithData item) {
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@ -51,12 +51,12 @@ public interface IDownloadRepository {
|
||||
return AsyncEnumerable.Empty<Data.Download>();
|
||||
}
|
||||
|
||||
public Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor) {
|
||||
return Task.FromResult(false);
|
||||
public Task<DownloadWithData> HydrateWithData(Data.Download download) {
|
||||
return Task.FromResult(new DownloadWithData(download, Data: null));
|
||||
}
|
||||
|
||||
public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
|
||||
return Task.FromResult(false);
|
||||
public Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl) {
|
||||
return Task.FromResult<DownloadWithData?>(null);
|
||||
}
|
||||
|
||||
public IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken) {
|
||||
|
||||
@ -19,9 +19,9 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
|
||||
}
|
||||
|
||||
public async Task Add(IReadOnlyList<Channel> channels) {
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using (var tx = await conn.BeginTransactionAsync()) {
|
||||
await using var cmd = conn.Upsert("channels", [
|
||||
("id", SqliteType.Integer),
|
||||
("server", SqliteType.Integer),
|
||||
@ -43,7 +43,7 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
|
||||
await cmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
|
||||
UpdateTotalCount();
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@ -15,9 +14,15 @@ using Microsoft.Data.Sqlite;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Repositories;
|
||||
|
||||
sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRepository(Log), IDownloadRepository {
|
||||
sealed class SqliteDownloadRepository : BaseSqliteRepository, IDownloadRepository {
|
||||
private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
|
||||
|
||||
private readonly SqliteConnectionPool pool;
|
||||
|
||||
public SqliteDownloadRepository(SqliteConnectionPool pool) : base(Log) {
|
||||
this.pool = pool;
|
||||
}
|
||||
|
||||
internal sealed class NewDownloadCollector : IAsyncDisposable {
|
||||
private readonly SqliteDownloadRepository repository;
|
||||
private bool hasAdded = false;
|
||||
@ -61,9 +66,11 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
}
|
||||
}
|
||||
|
||||
public async Task AddDownload(Data.Download item, Stream? stream) {
|
||||
public async Task AddDownload(DownloadWithData item) {
|
||||
var (download, data) = item;
|
||||
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
var tx = await conn.BeginTransactionAsync();
|
||||
|
||||
await using var metadataCmd = conn.Upsert("download_metadata", [
|
||||
("normalized_url", SqliteType.Text),
|
||||
@ -73,37 +80,30 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
("size", SqliteType.Integer),
|
||||
]);
|
||||
|
||||
metadataCmd.Set(":normalized_url", item.NormalizedUrl);
|
||||
metadataCmd.Set(":download_url", item.DownloadUrl);
|
||||
metadataCmd.Set(":status", (int) item.Status);
|
||||
metadataCmd.Set(":type", item.Type);
|
||||
metadataCmd.Set(":size", item.Size);
|
||||
metadataCmd.Set(":normalized_url", download.NormalizedUrl);
|
||||
metadataCmd.Set(":download_url", download.DownloadUrl);
|
||||
metadataCmd.Set(":status", (int) download.Status);
|
||||
metadataCmd.Set(":type", download.Type);
|
||||
metadataCmd.Set(":size", download.Size);
|
||||
await metadataCmd.ExecuteNonQueryAsync();
|
||||
|
||||
if (stream == null) {
|
||||
if (data == null) {
|
||||
await using var deleteBlobCmd = conn.Command("DELETE FROM download_blobs WHERE normalized_url = :normalized_url");
|
||||
deleteBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
|
||||
deleteBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, download.NormalizedUrl);
|
||||
await deleteBlobCmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
else {
|
||||
await using var upsertBlobCmd = conn.Command(
|
||||
"""
|
||||
INSERT INTO download_blobs (normalized_url, blob)
|
||||
VALUES (:normalized_url, ZEROBLOB(:blob_length))
|
||||
ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
|
||||
RETURNING rowid
|
||||
"""
|
||||
);
|
||||
await using var upsertBlobCmd = conn.Upsert("download_blobs", [
|
||||
("normalized_url", SqliteType.Text),
|
||||
("blob", SqliteType.Blob)
|
||||
]);
|
||||
|
||||
upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
|
||||
upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
|
||||
long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
|
||||
|
||||
await using var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid);
|
||||
await stream.CopyToAsync(blob);
|
||||
upsertBlobCmd.Set(":normalized_url", download.NormalizedUrl);
|
||||
upsertBlobCmd.Set(":blob", data);
|
||||
await upsertBlobCmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
|
||||
UpdateTotalCount();
|
||||
@ -187,35 +187,24 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor) {
|
||||
public async Task<DownloadWithData> HydrateWithData(Data.Download download) {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command("SELECT rowid FROM download_blobs WHERE normalized_url = :normalized_url");
|
||||
cmd.AddAndSet(":normalized_url", SqliteType.Text, normalizedUrl);
|
||||
await using var cmd = conn.Command("SELECT blob FROM download_blobs WHERE normalized_url = :url");
|
||||
cmd.AddAndSet(":url", SqliteType.Text, download.NormalizedUrl);
|
||||
|
||||
long rowid;
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
var data = await reader.ReadAsync() && !reader.IsDBNull(0) ? (byte[]) reader["blob"] : null;
|
||||
|
||||
await using (var reader = await cmd.ExecuteReaderAsync()) {
|
||||
if (!await reader.ReadAsync()) {
|
||||
return false;
|
||||
return new DownloadWithData(download, data);
|
||||
}
|
||||
|
||||
rowid = reader.GetInt64(0);
|
||||
}
|
||||
|
||||
await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
|
||||
await dataProcessor(blob);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
|
||||
public async Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl) {
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using var cmd = conn.Command(
|
||||
"""
|
||||
SELECT dm.download_url, dm.type, db.rowid FROM download_metadata dm
|
||||
SELECT dm.download_url, dm.type, db.blob FROM download_metadata dm
|
||||
JOIN download_blobs db ON dm.normalized_url = db.normalized_url
|
||||
WHERE dm.normalized_url = :normalized_url AND dm.status = :success IS NOT NULL
|
||||
"""
|
||||
@ -224,25 +213,19 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
|
||||
cmd.AddAndSet(":normalized_url", SqliteType.Text, normalizedUrl);
|
||||
cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
|
||||
|
||||
string downloadUrl;
|
||||
string? type;
|
||||
long rowid;
|
||||
await using var reader = await cmd.ExecuteReaderAsync();
|
||||
|
||||
await using (var reader = await cmd.ExecuteReaderAsync()) {
|
||||
if (!await reader.ReadAsync()) {
|
||||
return false;
|
||||
return null;
|
||||
}
|
||||
|
||||
downloadUrl = reader.GetString(0);
|
||||
type = reader.IsDBNull(1) ? null : reader.GetString(1);
|
||||
rowid = reader.GetInt64(2);
|
||||
}
|
||||
var downloadUrl = reader.GetString(0);
|
||||
var type = reader.IsDBNull(1) ? null : reader.GetString(1);
|
||||
var data = (byte[]) reader[2];
|
||||
var size = (ulong) data.LongLength;
|
||||
var download = new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, size);
|
||||
|
||||
await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
|
||||
await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob);
|
||||
}
|
||||
|
||||
return true;
|
||||
return new DownloadWithData(download, data);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
|
||||
|
||||
@ -39,7 +39,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
}
|
||||
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
await using var tx = await conn.BeginTransactionAsync();
|
||||
|
||||
await using var messageCmd = conn.Upsert("messages", [
|
||||
("message_id", SqliteType.Integer),
|
||||
@ -167,7 +167,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
}
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
downloadCollector.OnCommitted();
|
||||
}
|
||||
|
||||
@ -183,11 +183,11 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
|
||||
}
|
||||
|
||||
private sealed class MessageToManyCommand<T> : IAsyncDisposable {
|
||||
private sealed class MesageToManyCommand<T> : IAsyncDisposable {
|
||||
private readonly SqliteCommand cmd;
|
||||
private readonly Func<SqliteDataReader, T> readItem;
|
||||
|
||||
public MessageToManyCommand(ISqliteConnection conn, string sql, Func<SqliteDataReader, T> readItem) {
|
||||
public MesageToManyCommand(ISqliteConnection conn, string sql, Func<SqliteDataReader, T> readItem) {
|
||||
this.cmd = conn.Command(sql);
|
||||
this.cmd.Add(":message_id", SqliteType.Integer);
|
||||
|
||||
@ -223,7 +223,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
WHERE message_id = :message_id
|
||||
""";
|
||||
|
||||
await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
|
||||
await using var attachmentCmd = new MesageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
|
||||
Id = reader.GetUint64(0),
|
||||
Name = reader.GetString(1),
|
||||
Type = reader.IsDBNull(2) ? null : reader.GetString(2),
|
||||
@ -241,7 +241,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
WHERE message_id = :message_id
|
||||
""";
|
||||
|
||||
await using var embedCmd = new MessageToManyCommand<Embed>(conn, EmbedSql, static reader => new Embed {
|
||||
await using var embedCmd = new MesageToManyCommand<Embed>(conn, EmbedSql, static reader => new Embed {
|
||||
Json = reader.GetString(0)
|
||||
});
|
||||
|
||||
@ -252,7 +252,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
|
||||
WHERE message_id = :message_id
|
||||
""";
|
||||
|
||||
await using var reactionsCmd = new MessageToManyCommand<Reaction>(conn, ReactionSql, static reader => new Reaction {
|
||||
await using var reactionsCmd = new MesageToManyCommand<Reaction>(conn, ReactionSql, static reader => new Reaction {
|
||||
EmojiId = reader.IsDBNull(0) ? null : reader.GetUint64(0),
|
||||
EmojiName = reader.IsDBNull(1) ? null : reader.GetString(1),
|
||||
EmojiFlags = (EmojiFlags) reader.GetInt16(2),
|
||||
|
||||
@ -19,9 +19,9 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
|
||||
}
|
||||
|
||||
public async Task Add(IReadOnlyList<Data.Server> servers) {
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
await using var conn = await pool.Take();
|
||||
|
||||
await using (var tx = await conn.BeginTransactionAsync()) {
|
||||
await using var cmd = conn.Upsert("servers", [
|
||||
("id", SqliteType.Integer),
|
||||
("name", SqliteType.Text),
|
||||
@ -35,7 +35,7 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
|
||||
await cmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
|
||||
UpdateTotalCount();
|
||||
|
||||
@ -23,7 +23,7 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
|
||||
|
||||
public async Task Add(IReadOnlyList<User> users) {
|
||||
await using (var conn = await pool.Take()) {
|
||||
await conn.BeginTransactionAsync();
|
||||
await using var tx = await conn.BeginTransactionAsync();
|
||||
|
||||
await using var cmd = conn.Upsert("users", [
|
||||
("id", SqliteType.Integer),
|
||||
@ -46,7 +46,7 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
|
||||
}
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
downloadCollector.OnCommitted();
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Data.Common;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database.Sqlite.Utils;
|
||||
using DHT.Server.Download;
|
||||
@ -38,7 +39,7 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
}
|
||||
}
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
await using var tx = await conn.BeginTransactionAsync();
|
||||
|
||||
int totalUrls = normalizedUrls.Count;
|
||||
int processedUrls = -1;
|
||||
@ -60,7 +61,7 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
|
||||
await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
|
||||
private async Task NormalizeDownloadUrls(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
|
||||
@ -83,8 +84,10 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
}
|
||||
|
||||
await conn.ExecuteAsync("PRAGMA cache_size = -20000");
|
||||
await conn.BeginTransactionAsync();
|
||||
|
||||
DbTransaction tx;
|
||||
|
||||
await using (tx = await conn.BeginTransactionAsync()) {
|
||||
await reporter.SubWork("Deleting duplicates...", 0, 0);
|
||||
|
||||
await using (var deleteCmd = conn.Delete("downloads", ("url", SqliteType.Text))) {
|
||||
@ -94,12 +97,13 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
}
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
|
||||
int totalUrls = normalizedUrlsToOriginalUrls.Count;
|
||||
int processedUrls = -1;
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
tx = await conn.BeginTransactionAsync();
|
||||
|
||||
await using (var updateCmd = conn.Command("UPDATE downloads SET download_url = :download_url, url = :normalized_url WHERE url = :download_url")) {
|
||||
updateCmd.Add(":normalized_url", SqliteType.Text);
|
||||
@ -111,10 +115,11 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
|
||||
// Not proper way of dealing with transactions, but it avoids a long commit at the end.
|
||||
// Schema upgrades are already non-atomic anyways, so this doesn't make it worse.
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
await tx.DisposeAsync();
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
conn.AssignActiveTransaction(updateCmd);
|
||||
tx = await conn.BeginTransactionAsync();
|
||||
updateCmd.Transaction = (SqliteTransaction) tx;
|
||||
}
|
||||
|
||||
updateCmd.Set(":normalized_url", normalizedUrl);
|
||||
@ -125,7 +130,8 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
|
||||
|
||||
await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
await tx.DisposeAsync();
|
||||
|
||||
await conn.ExecuteAsync("PRAGMA cache_size = -2000");
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
|
||||
|
||||
await reporter.SubWork("Processing downloaded files...", 0, totalFiles);
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
var tx = await conn.BeginTransactionAsync();
|
||||
|
||||
await using (var insertCmd = conn.Command("INSERT INTO download_blobs (normalized_url, blob) SELECT normalized_url, blob FROM downloads WHERE normalized_url = :normalized_url"))
|
||||
await using (var deleteCmd = conn.Command("DELETE FROM downloads WHERE normalized_url = :normalized_url")) {
|
||||
@ -50,11 +50,12 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
|
||||
|
||||
// Not proper way of dealing with transactions, but it avoids a long commit at the end.
|
||||
// Schema upgrades are already non-atomic anyways, so this doesn't make it worse.
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
await tx.DisposeAsync();
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
conn.AssignActiveTransaction(insertCmd);
|
||||
conn.AssignActiveTransaction(deleteCmd);
|
||||
tx = await conn.BeginTransactionAsync();
|
||||
insertCmd.Transaction = (SqliteTransaction) tx;
|
||||
deleteCmd.Transaction = (SqliteTransaction) tx;
|
||||
}
|
||||
|
||||
insertCmd.Set(":normalized_url", url);
|
||||
@ -67,7 +68,8 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
|
||||
|
||||
await reporter.SubWork("Processing downloaded files...", totalFiles, totalFiles);
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
await tx.DisposeAsync();
|
||||
}
|
||||
|
||||
private async Task<List<string>> GetDownloadedFileUrls(ISqliteConnection conn) {
|
||||
@ -109,8 +111,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
|
||||
await insertCmd.ExecuteNonQueryAsync();
|
||||
}
|
||||
|
||||
await conn.BeginTransactionAsync();
|
||||
|
||||
await using (var tx = await conn.BeginTransactionAsync()) {
|
||||
await using var insertCmd = conn.Command("INSERT OR IGNORE INTO download_metadata (normalized_url, download_url, status, type, size) VALUES (:normalized_url, :download_url, :status, :type, :size)");
|
||||
insertCmd.Add(":normalized_url", SqliteType.Text);
|
||||
insertCmd.Add(":download_url", SqliteType.Text);
|
||||
@ -148,6 +149,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
|
||||
}
|
||||
}
|
||||
|
||||
await conn.CommitTransactionAsync();
|
||||
await tx.CommitAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,15 +1,8 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Data.Sqlite;
|
||||
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
interface ISqliteConnection : IAsyncDisposable {
|
||||
SqliteConnection InnerConnection { get; }
|
||||
|
||||
Task BeginTransactionAsync();
|
||||
Task CommitTransactionAsync();
|
||||
Task RollbackTransactionAsync();
|
||||
|
||||
void AssignActiveTransaction(SqliteCommand command);
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.Common;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Utils.Collections;
|
||||
@ -74,48 +73,17 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
|
||||
disposalTokenSource.Dispose();
|
||||
}
|
||||
|
||||
private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnection conn) : ISqliteConnection {
|
||||
public SqliteConnection InnerConnection { get; } = conn;
|
||||
private sealed class PooledConnection : ISqliteConnection {
|
||||
public SqliteConnection InnerConnection { get; }
|
||||
|
||||
private DbTransaction? activeTransaction;
|
||||
private readonly SqliteConnectionPool pool;
|
||||
|
||||
public async Task BeginTransactionAsync() {
|
||||
if (activeTransaction != null) {
|
||||
throw new InvalidOperationException("A transaction is already active.");
|
||||
}
|
||||
|
||||
activeTransaction = await InnerConnection.BeginTransactionAsync();
|
||||
}
|
||||
|
||||
public async Task CommitTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to commit.");
|
||||
}
|
||||
|
||||
await activeTransaction.CommitAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public async Task RollbackTransactionAsync() {
|
||||
if (activeTransaction == null) {
|
||||
throw new InvalidOperationException("No active transaction to rollback.");
|
||||
}
|
||||
|
||||
await activeTransaction.RollbackAsync();
|
||||
await activeTransaction.DisposeAsync();
|
||||
activeTransaction = null;
|
||||
}
|
||||
|
||||
public void AssignActiveTransaction(SqliteCommand command) {
|
||||
command.Transaction = (SqliteTransaction?) activeTransaction;
|
||||
public PooledConnection(SqliteConnectionPool pool, SqliteConnection conn) {
|
||||
this.pool = pool;
|
||||
this.InnerConnection = conn;
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync() {
|
||||
if (activeTransaction != null) {
|
||||
await RollbackTransactionAsync();
|
||||
}
|
||||
|
||||
await pool.Return(this);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Data.Common;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@ -8,6 +9,10 @@ using Microsoft.Data.Sqlite;
|
||||
namespace DHT.Server.Database.Sqlite.Utils;
|
||||
|
||||
static class SqliteExtensions {
|
||||
public static ValueTask<DbTransaction> BeginTransactionAsync(this ISqliteConnection conn) {
|
||||
return conn.InnerConnection.BeginTransactionAsync();
|
||||
}
|
||||
|
||||
public static SqliteCommand Command(this ISqliteConnection conn, [LanguageInjection("sql")] string sql) {
|
||||
var cmd = conn.InnerConnection.CreateCommand();
|
||||
cmd.CommandText = sql;
|
||||
@ -26,10 +31,6 @@ static class SqliteExtensions {
|
||||
return await reader.ReadAsync(cancellationToken) ? readFunction(reader) : readFunction(null);
|
||||
}
|
||||
|
||||
public static async Task<long> ExecuteLongScalarAsync(this SqliteCommand command) {
|
||||
return (long) (await command.ExecuteScalarAsync())!;
|
||||
}
|
||||
|
||||
public static SqliteCommand Insert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
|
||||
string columnNames = string.Join(',', columns.Select(static c => c.Name));
|
||||
string columnParams = string.Join(',', columns.Select(static c => ':' + c.Name));
|
||||
|
||||
@ -10,12 +10,13 @@ public readonly struct DownloadItem {
|
||||
public string? Type { get; init; }
|
||||
public ulong? Size { get; init; }
|
||||
|
||||
internal Data.Download ToSuccess(long size) {
|
||||
return new Data.Download(NormalizedUrl, DownloadUrl, DownloadStatus.Success, Type, (ulong) Math.Max(size, 0));
|
||||
internal DownloadWithData ToSuccess(byte[] data) {
|
||||
var size = (ulong) Math.Max(data.LongLength, 0);
|
||||
return new DownloadWithData(new Data.Download(NormalizedUrl, DownloadUrl, DownloadStatus.Success, Type, size), data);
|
||||
}
|
||||
|
||||
internal Data.Download ToFailure(HttpStatusCode? statusCode = null) {
|
||||
internal DownloadWithData ToFailure(HttpStatusCode? statusCode = null) {
|
||||
var status = statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError;
|
||||
return new Data.Download(NormalizedUrl, DownloadUrl, status, Type, Size);
|
||||
return new DownloadWithData(new Data.Download(NormalizedUrl, DownloadUrl, status, Type, Size), Data: null);
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,18 +11,16 @@ public sealed class Downloader {
|
||||
public bool IsDownloading => current != null;
|
||||
|
||||
private readonly IDatabaseFile db;
|
||||
private readonly int? concurrentDownloads;
|
||||
private readonly SemaphoreSlim semaphore = new (1, 1);
|
||||
|
||||
internal Downloader(IDatabaseFile db, int? concurrentDownloads) {
|
||||
internal Downloader(IDatabaseFile db) {
|
||||
this.db = db;
|
||||
this.concurrentDownloads = concurrentDownloads;
|
||||
}
|
||||
|
||||
public async Task<IObservable<DownloadItem>> Start(DownloadItemFilter filter) {
|
||||
await semaphore.WaitAsync();
|
||||
try {
|
||||
current ??= new DownloaderTask(db, filter, concurrentDownloads);
|
||||
current ??= new DownloaderTask(db, filter);
|
||||
return current.FinishedItems;
|
||||
} finally {
|
||||
semaphore.Release();
|
||||
|
||||
@ -15,14 +15,10 @@ namespace DHT.Server.Download;
|
||||
sealed class DownloaderTask : IAsyncDisposable {
|
||||
private static readonly Log Log = Log.ForType<DownloaderTask>();
|
||||
|
||||
private const int DefaultConcurrentDownloads = 4;
|
||||
private const int DownloadTasks = 4;
|
||||
private const int QueueSize = 25;
|
||||
private const string UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
|
||||
|
||||
private static int GetDownloadTaskCount(int? concurrentDownloads) {
|
||||
return Math.Max(1, concurrentDownloads ?? DefaultConcurrentDownloads);
|
||||
}
|
||||
|
||||
private readonly Channel<DownloadItem> downloadQueue = Channel.CreateBounded<DownloadItem>(new BoundedChannelOptions(QueueSize) {
|
||||
SingleReader = false,
|
||||
SingleWriter = true,
|
||||
@ -42,12 +38,12 @@ sealed class DownloaderTask : IAsyncDisposable {
|
||||
|
||||
public IObservable<DownloadItem> FinishedItems => finishedItemPublisher;
|
||||
|
||||
internal DownloaderTask(IDatabaseFile db, DownloadItemFilter filter, int? concurrentDownloads) {
|
||||
internal DownloaderTask(IDatabaseFile db, DownloadItemFilter filter) {
|
||||
this.db = db;
|
||||
this.filter = filter;
|
||||
this.cancellationToken = cancellationTokenSource.Token;
|
||||
this.queueWriterTask = Task.Run(RunQueueWriterTask);
|
||||
this.downloadTasks = Enumerable.Range(1, GetDownloadTaskCount(concurrentDownloads)).Select(taskIndex => Task.Run(() => RunDownloadTask(taskIndex))).ToArray();
|
||||
this.downloadTasks = Enumerable.Range(1, DownloadTasks).Select(taskIndex => Task.Run(() => RunDownloadTask(taskIndex))).ToArray();
|
||||
}
|
||||
|
||||
private async Task RunQueueWriterTask() {
|
||||
@ -67,39 +63,24 @@ sealed class DownloaderTask : IAsyncDisposable {
|
||||
private async Task RunDownloadTask(int taskIndex) {
|
||||
var log = Log.ForType<DownloaderTask>("Task " + taskIndex);
|
||||
|
||||
var client = new HttpClient(new SocketsHttpHandler {
|
||||
ConnectTimeout = TimeSpan.FromSeconds(30)
|
||||
});
|
||||
|
||||
client.Timeout = Timeout.InfiniteTimeSpan;
|
||||
var client = new HttpClient();
|
||||
client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
|
||||
client.Timeout = TimeSpan.FromSeconds(30);
|
||||
|
||||
while (!cancellationToken.IsCancellationRequested) {
|
||||
var item = await downloadQueue.Reader.ReadAsync(cancellationToken);
|
||||
log.Debug("Downloading " + item.DownloadUrl + "...");
|
||||
|
||||
try {
|
||||
var response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, item.DownloadUrl), HttpCompletionOption.ResponseHeadersRead, cancellationToken);
|
||||
response.EnsureSuccessStatusCode();
|
||||
|
||||
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) {
|
||||
var downloadedBytes = await client.GetByteArrayAsync(item.DownloadUrl, cancellationToken);
|
||||
await db.Downloads.AddDownload(item.ToSuccess(downloadedBytes));
|
||||
} catch (OperationCanceledException) {
|
||||
// Ignore.
|
||||
} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
|
||||
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
||||
log.Error("Download timed out: " + item.DownloadUrl);
|
||||
} catch (HttpRequestException e) {
|
||||
await db.Downloads.AddDownload(item.ToFailure(e.StatusCode), stream: null);
|
||||
await db.Downloads.AddDownload(item.ToFailure(e.StatusCode));
|
||||
log.Error(e);
|
||||
} catch (Exception e) {
|
||||
await db.Downloads.AddDownload(item.ToFailure(), stream: null);
|
||||
await db.Downloads.AddDownload(item.ToFailure());
|
||||
log.Error(e);
|
||||
} finally {
|
||||
try {
|
||||
|
||||
@ -9,37 +9,37 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
abstract class BaseEndpoint(IDatabaseFile db) {
|
||||
abstract class BaseEndpoint {
|
||||
private static readonly Log Log = Log.ForType<BaseEndpoint>();
|
||||
|
||||
protected IDatabaseFile Db { get; } = db;
|
||||
protected IDatabaseFile Db { get; }
|
||||
|
||||
protected BaseEndpoint(IDatabaseFile db) {
|
||||
this.Db = db;
|
||||
}
|
||||
|
||||
public async Task Handle(HttpContext ctx) {
|
||||
var response = ctx.Response;
|
||||
|
||||
try {
|
||||
response.StatusCode = (int) HttpStatusCode.OK;
|
||||
await Respond(ctx.Request, response);
|
||||
var output = await Respond(ctx);
|
||||
await output.WriteTo(response);
|
||||
} catch (HttpException e) {
|
||||
Log.Error(e);
|
||||
response.StatusCode = (int) e.StatusCode;
|
||||
if (response.HasStarted) {
|
||||
Log.Warn("Response has already started, cannot write status message: " + e.Message);
|
||||
}
|
||||
else {
|
||||
await response.WriteAsync(e.Message);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.Error(e);
|
||||
response.StatusCode = (int) HttpStatusCode.InternalServerError;
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract Task Respond(HttpRequest request, HttpResponse response);
|
||||
protected abstract Task<IHttpOutput> Respond(HttpContext ctx);
|
||||
|
||||
protected static async Task<JsonElement> ReadJson(HttpRequest request) {
|
||||
protected static async Task<JsonElement> ReadJson(HttpContext ctx) {
|
||||
try {
|
||||
return await request.ReadFromJsonAsync(JsonElementContext.Default.JsonElement);
|
||||
return await ctx.Request.ReadFromJsonAsync(JsonElementContext.Default.JsonElement);
|
||||
} catch (JsonException) {
|
||||
throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
|
||||
}
|
||||
|
||||
@ -7,13 +7,18 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
|
||||
sealed class GetDownloadedFileEndpoint : BaseEndpoint {
|
||||
public GetDownloadedFileEndpoint(IDatabaseFile db) : base(db) {}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
string url = WebUtility.UrlDecode((string) ctx.Request.RouteValues["url"]!);
|
||||
string normalizedUrl = DiscordCdn.NormalizeUrl(url);
|
||||
|
||||
if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, (download, stream) => response.WriteStreamAsync(download.Type, download.Size, stream))) {
|
||||
response.Redirect(url, permanent: false);
|
||||
if (await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl) is { Download: {} download, Data: {} data }) {
|
||||
return new HttpOutput.File(download.Type, data);
|
||||
}
|
||||
else {
|
||||
return new HttpOutput.Redirect(url, permanent: false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using System.Net.Mime;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using DHT.Server.Database;
|
||||
@ -9,17 +9,25 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
sealed class GetTrackingScriptEndpoint : BaseEndpoint {
|
||||
private readonly ServerParameters serverParameters;
|
||||
private readonly ResourceLoader resources;
|
||||
|
||||
public GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : base(db) {
|
||||
this.serverParameters = parameters;
|
||||
this.resources = resources;
|
||||
}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
|
||||
string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
|
||||
.Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
|
||||
string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + serverParameters.Port + ";")
|
||||
.Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(serverParameters.Token))
|
||||
.Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
|
||||
.Replace("/*[CSS-CONTROLLER]*/", await resources.ReadTextAsync("Tracker/styles/controller.css"))
|
||||
.Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
|
||||
.Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");
|
||||
.Replace("/*[DEBUGGER]*/", ctx.Request.Query.ContainsKey("debug") ? "debugger;" : "");
|
||||
|
||||
response.Headers.Append("X-DHT", "1");
|
||||
await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script);
|
||||
ctx.Response.Headers.Append("X-DHT", "1");
|
||||
return new HttpOutput.File("text/javascript", Encoding.UTF8.GetBytes(script));
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,14 +8,18 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
sealed class TrackChannelEndpoint : BaseEndpoint {
|
||||
public TrackChannelEndpoint(IDatabaseFile db) : base(db) {}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
var root = await ReadJson(ctx);
|
||||
var server = ReadServer(root.RequireObject("server"), "server");
|
||||
var channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
|
||||
|
||||
await Db.Servers.Add([server]);
|
||||
await Db.Channels.Add([channel]);
|
||||
|
||||
return HttpOutput.None;
|
||||
}
|
||||
|
||||
private static Data.Server ReadServer(JsonElement json, string path) => new () {
|
||||
|
||||
@ -15,12 +15,14 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
sealed class TrackMessagesEndpoint : BaseEndpoint {
|
||||
private const string HasNewMessages = "1";
|
||||
private const string NoNewMessages = "0";
|
||||
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
public TrackMessagesEndpoint(IDatabaseFile db) : base(db) {}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
var root = await ReadJson(ctx);
|
||||
|
||||
if (root.ValueKind != JsonValueKind.Array) {
|
||||
throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
|
||||
@ -41,7 +43,7 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
|
||||
await Db.Messages.Add(messages);
|
||||
|
||||
await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages);
|
||||
return new HttpOutput.Text(anyNewMessages ? HasNewMessages : NoNewMessages);
|
||||
}
|
||||
|
||||
private static Message ReadMessage(JsonElement json, string path) => new () {
|
||||
|
||||
@ -8,9 +8,11 @@ using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
var root = await ReadJson(request);
|
||||
sealed class TrackUsersEndpoint : BaseEndpoint {
|
||||
public TrackUsersEndpoint(IDatabaseFile db) : base(db) {}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
var root = await ReadJson(ctx);
|
||||
|
||||
if (root.ValueKind != JsonValueKind.Array) {
|
||||
throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
|
||||
@ -24,6 +26,8 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
|
||||
}
|
||||
|
||||
await Db.Users.Add(users);
|
||||
|
||||
return HttpOutput.None;
|
||||
}
|
||||
|
||||
private static User ReadUser(JsonElement json, string path) => new () {
|
||||
|
||||
@ -10,14 +10,19 @@ using Microsoft.AspNetCore.StaticFiles;
|
||||
|
||||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEndpoint(db) {
|
||||
sealed class ViewerEndpoint : BaseEndpoint {
|
||||
private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
|
||||
|
||||
private readonly ResourceLoader resources;
|
||||
private readonly Dictionary<string, byte[]?> cache = new ();
|
||||
private readonly SemaphoreSlim cacheSemaphore = new (1);
|
||||
|
||||
protected override async Task Respond(HttpRequest request, HttpResponse response) {
|
||||
string path = (string?) request.RouteValues["path"] ?? "index.html";
|
||||
public ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : base(db) {
|
||||
this.resources = resources;
|
||||
}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
string path = (string?) ctx.Request.RouteValues["path"] ?? "index.html";
|
||||
string resourcePath = "Viewer/" + path;
|
||||
|
||||
byte[]? resourceBytes;
|
||||
@ -36,7 +41,7 @@ sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEn
|
||||
}
|
||||
else {
|
||||
var contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
|
||||
await response.WriteFileAsync(contentType, resourceBytes);
|
||||
return new HttpOutput.File(contentType, resourceBytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -50,7 +50,6 @@ sealed class Startup {
|
||||
app.UseRouting();
|
||||
app.UseEndpoints(endpoints => {
|
||||
endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters, resources).Handle);
|
||||
endpoints.MapGet("/get-viewer-data", new GetViewerDataEndpoint(db).Handle);
|
||||
endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
|
||||
|
||||
@ -6,12 +6,18 @@ using DHT.Server.Service;
|
||||
|
||||
namespace DHT.Server;
|
||||
|
||||
public sealed class State(IDatabaseFile db, int? concurrentDownloads) : IAsyncDisposable {
|
||||
public static State Dummy { get; } = new (DummyDatabaseFile.Instance, null);
|
||||
public sealed class State : IAsyncDisposable {
|
||||
public static State Dummy { get; } = new (DummyDatabaseFile.Instance);
|
||||
|
||||
public IDatabaseFile Db { get; } = db;
|
||||
public Downloader Downloader { get; } = new (db, concurrentDownloads);
|
||||
public ServerManager Server { get; } = new (db);
|
||||
public IDatabaseFile Db { get; }
|
||||
public Downloader Downloader { get; }
|
||||
public ServerManager Server { get; }
|
||||
|
||||
public State(IDatabaseFile db) {
|
||||
Db = db;
|
||||
Downloader = new Downloader(db);
|
||||
Server = new ServerManager(db);
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync() {
|
||||
await Downloader.Stop();
|
||||
|
||||
@ -8,7 +8,7 @@ public static class LinqExtensions {
|
||||
HashSet<TKey>? seenKeys = null;
|
||||
|
||||
foreach (var item in collection) {
|
||||
seenKeys ??= [];
|
||||
seenKeys ??= new HashSet<TKey>();
|
||||
|
||||
if (seenKeys.Add(getKeyFromItem(item))) {
|
||||
yield return item;
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
using System.IO;
|
||||
using System.Net.Mime;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Utils.Http;
|
||||
|
||||
public static class HttpExtensions {
|
||||
public static Task WriteTextAsync(this HttpResponse response, string text) {
|
||||
return WriteTextAsync(response, MediaTypeNames.Text.Plain, text);
|
||||
}
|
||||
|
||||
public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text) {
|
||||
response.ContentType = contentType;
|
||||
await response.StartAsync();
|
||||
await response.WriteAsync(text, Encoding.UTF8);
|
||||
}
|
||||
|
||||
public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes) {
|
||||
response.ContentType = contentType ?? string.Empty;
|
||||
response.ContentLength = bytes.Length;
|
||||
await response.StartAsync();
|
||||
await response.Body.WriteAsync(bytes);
|
||||
}
|
||||
|
||||
public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source) {
|
||||
response.ContentType = contentType ?? string.Empty;
|
||||
response.ContentLength = (long?) contentLength;
|
||||
await response.StartAsync();
|
||||
await source.CopyToAsync(response.Body);
|
||||
}
|
||||
}
|
||||
35
app/Utils/Http/HttpOutput.cs
Normal file
35
app/Utils/Http/HttpOutput.cs
Normal file
@ -0,0 +1,35 @@
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Utils.Http;
|
||||
|
||||
public static class HttpOutput {
|
||||
public static IHttpOutput None { get; } = new NoneImpl();
|
||||
|
||||
private sealed class NoneImpl : IHttpOutput {
|
||||
public Task WriteTo(HttpResponse response) {
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class Text(string text) : IHttpOutput {
|
||||
public Task WriteTo(HttpResponse response) {
|
||||
return response.WriteAsync(text, Encoding.UTF8);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class File(string? contentType, byte[] bytes) : IHttpOutput {
|
||||
public async Task WriteTo(HttpResponse response) {
|
||||
response.ContentType = contentType ?? string.Empty;
|
||||
await response.Body.WriteAsync(bytes);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class Redirect(string url, bool permanent) : IHttpOutput {
|
||||
public Task WriteTo(HttpResponse response) {
|
||||
response.Redirect(url, permanent);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
8
app/Utils/Http/IHttpOutput.cs
Normal file
8
app/Utils/Http/IHttpOutput.cs
Normal file
@ -0,0 +1,8 @@
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace DHT.Utils.Http;
|
||||
|
||||
public interface IHttpOutput {
|
||||
Task WriteTo(HttpResponse response);
|
||||
}
|
||||
@ -8,5 +8,5 @@ using DHT.Utils;
|
||||
namespace DHT.Utils;
|
||||
|
||||
static class Version {
|
||||
public const string Tag = "41.2.0.0";
|
||||
public const string Tag = "41.0.0.0";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user