danvics/rdt-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge f66d1fe197 into 371a13e060

Browse source
This commit is contained in:
Cucumberrbob 2025-11-15 17:15:38 -07:00 committed by GitHub
commit 4ab87e10b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 100 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/RdtClient.Data/Enums/DownloadClient.cs
View file

@ -15,4 +15,7 @@ public enum DownloadClient
[Description("Synology DownloadStation")]
DownloadStation,
[Description("Strm Downloader")]
Strm
}

43
server/RdtClient.Service.Test/Services/Downloaders/StrmDownloaderTest.cs Normal file
View file

@ -0,0 +1,43 @@
using System.IO.Abstractions;
using System.IO.Abstractions.TestingHelpers;
using Moq;
using RdtClient.Service.Services.Downloaders;
namespace RdtClient.Service.Test.Services.Downloaders;
public class StrmDownloaderTest
{
[Fact]
public async Task Download_WhenFileCreatedSuccesfully_RaisesDownloadCompleteEvent()
{
var mockFileSystem = new MockFileSystem();
var strmDownloader = new StrmDownloader("http://example.com/video.mp4", "video.mp4", mockFileSystem);
await Assert.RaisesAsync<DownloadCompleteEventArgs>(a => strmDownloader.DownloadComplete += a,
a => strmDownloader.DownloadComplete -= a,
strmDownloader.Download);
Assert.True(mockFileSystem.FileExists("video.mp4.strm"));
Assert.Equal(await mockFileSystem.File.ReadAllTextAsync("video.mp4.strm"), "http://example.com/video.mp4");
}
[Fact]
public async Task Download_WhenErrorCreatingFile_RaisesDownloadCompleteEventWithError()
{
// Arrange
var mockFileSystem = new Mock<IFileSystem>();
mockFileSystem.Setup(fs => fs.File.WriteAllTextAsync(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>()))
.ThrowsAsync(new IOException("File write error"));
var strmDownloader = new StrmDownloader("http://example.com/video.mp4", "video.mp4", mockFileSystem.Object);
// Act & Assert
var raisedEvent = await Assert.RaisesAsync<DownloadCompleteEventArgs>(
a => strmDownloader.DownloadComplete += a,
a => strmDownloader.DownloadComplete -= a,
strmDownloader.Download);
Assert.NotNull(raisedEvent);
Assert.False(String.IsNullOrWhiteSpace(raisedEvent.Arguments.Error));
}
}

6
server/RdtClient.Service/Services/DownloadClient.cs
View file

@ -1,4 +1,5 @@
using RdtClient.Data.Enums;
using System.IO.Abstractions;
using RdtClient.Data.Enums;
using RdtClient.Data.Models.Data;
using RdtClient.Service.Helpers;
using RdtClient.Service.Services.Downloaders;
@ -6,7 +7,7 @@ using RdtClient.Service.Services.TorrentClients;
namespace RdtClient.Service.Services;
public class DownloadClient(Download download, Torrent torrent, String destinationPath, String? category)
public class DownloadClient(Download download, Torrent torrent, String destinationPath, String? category, IFileSystem fileSystem)
{
private static Int64 _totalBytesDownloadedThisSession;
private static readonly Lock TotalBytesDownloadedLock = new();
@ -69,6 +70,7 @@ public class DownloadClient(Download download, Torrent torrent, String destinati
Data.Enums.DownloadClient.Aria2c => new Aria2cDownloader(download.RemoteId, download.Link, filePath, downloadPath, category),
Data.Enums.DownloadClient.Symlink => new SymlinkDownloader(download.Link, filePath, downloadPath, torrent.ClientKind),
Data.Enums.DownloadClient.DownloadStation => await DownloadStationDownloader.Init(download.RemoteId, download.Link, filePath, downloadPath, category),
Data.Enums.DownloadClient.Strm => new StrmDownloader(download.Link, filePath, fileSystem),
_ => throw new($"Unknown download client {Type}")
};

44
server/RdtClient.Service/Services/Downloaders/StrmDownloader.cs Normal file
View file

@ -0,0 +1,44 @@
using System.IO.Abstractions;
namespace RdtClient.Service.Services.Downloaders;
public class StrmDownloader(String downloadLink, String filePath, IFileSystem fileSystem) : IDownloader
{
public event EventHandler<DownloadCompleteEventArgs>? DownloadComplete;
public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
public async Task<String> Download()
{
try
{
await fileSystem.File.WriteAllTextAsync(filePath + ".strm", downloadLink);
DownloadComplete?.Invoke(this, new());
}
catch (Exception ex)
{
DownloadComplete?.Invoke(this,
new()
{
Error = ex.Message
});
}
return Guid.NewGuid().ToString();
}
public Task Cancel()
{
return Task.CompletedTask;
}
public Task Pause()
{
return Task.CompletedTask;
}
public Task Resume()
{
return Task.CompletedTask;
}
}

5
server/RdtClient.Service/Services/TorrentRunner.cs
View file

@ -7,11 +7,12 @@ using RdtClient.Service.Helpers;
using RdtClient.Service.Services.Downloaders;
using System.Collections.Concurrent;
using System.Diagnostics;
using System.IO.Abstractions;
using System.Text.Json;
namespace RdtClient.Service.Services;
public class TorrentRunner(ILogger<TorrentRunner> logger, Torrents torrents, Downloads downloads)
public class TorrentRunner(ILogger<TorrentRunner> logger, Torrents torrents, Downloads downloads, IFileSystem fileSystem)
{
public static readonly ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients = new();
public static readonly ConcurrentDictionary<Guid, UnpackClient> ActiveUnpackClients = new();
@ -487,7 +488,7 @@ public class TorrentRunner(ILogger<TorrentRunner> logger, Torrents torrents, Dow
Log($"Setting download path to {downloadPath}", download, torrent);
// Start the download process
var downloadClient = new DownloadClient(download, torrent, downloadPath, torrent.Category);
var downloadClient = new DownloadClient(download, torrent, downloadPath, torrent.Category, fileSystem);
if (ActiveDownloadClients.TryAdd(download.DownloadId, downloadClient))
{

5
server/RdtClient.Web/Controllers/SettingsController.cs
View file

@ -1,4 +1,5 @@
using System.Diagnostics;
using System.IO.Abstractions;
using System.Reflection;
using Aria2NET;
using Microsoft.AspNetCore.Authorization;
@ -14,7 +15,7 @@ namespace RdtClient.Web.Controllers;
[Authorize(Policy = "AuthSetting")]
[Route("Api/Settings")]
public class SettingsController(Settings settings, Torrents torrents) : Controller
public class SettingsController(Settings settings, Torrents torrents, IFileSystem fileSystem) : Controller
{
[HttpGet]
[Route("")]
@ -108,7 +109,7 @@ public class SettingsController(Settings settings, Torrents torrents) : Controll
}
};
var downloadClient = new DownloadClient(download, download.Torrent, downloadPath, null);
var downloadClient = new DownloadClient(download, download.Torrent, downloadPath, null, fileSystem);
await downloadClient.Start();