t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into net6

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-15 20:51:30 +02:00
parent 8459fe8f25 2a2b0c3b57
commit bb8f3fefe6
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareAPI

Submodule MareAPI updated: 1ee130413f...21fe024dfb

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<Authors></Authors>
<Company></Company>
<Version>0.3.3</Version>
<Version>0.3.4</Version>
<Description></Description>
<Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

9
MareSynchronos/WebAPI/ApIController.Functions.Files.cs
View File

@@ -38,7 +38,7 @@ namespace MareSynchronos.WebAPI
await _mareHub!.SendAsync(Api.SendFileDeleteAllFiles);
}
private async Task<string> DownloadFile(int downloadId, string hash, CancellationToken ct)
private async Task<string> DownloadFile(int downloadId, string hash, Uri downloadUri, CancellationToken ct)
{
using WebClient wc = new();
wc.Headers.Add("Authorization", SecretKey);
@@ -58,11 +58,8 @@ namespace MareSynchronos.WebAPI
wc.DownloadProgressChanged += progChanged;
string fileName = Path.GetTempFileName();
var baseUri = new Uri(Regex.Replace(ApiUri, "^ws", "http"), UriKind.Absolute);
var relativeUri = new Uri("cache/" + hash, UriKind.Relative);
var fileUri = new Uri(baseUri, relativeUri);
await wc.DownloadFileTaskAsync(fileUri, fileName);
await wc.DownloadFileTaskAsync(downloadUri, fileName);
CurrentDownloads[downloadId].Single(f => f.Hash == hash).Transferred = CurrentDownloads[downloadId].Single(f => f.Hash == hash).Total;
@@ -96,7 +93,7 @@ namespace MareSynchronos.WebAPI
foreach (var file in CurrentDownloads[currentDownloadId].Where(f => f.CanBeTransferred))
{
var hash = file.Hash;
var tempFile = await DownloadFile(currentDownloadId, hash, ct);
var tempFile = await DownloadFile(currentDownloadId, file.Hash, file.DownloadUri, ct);
if (ct.IsCancellationRequested)
{
File.Delete(tempFile);

3
MareSynchronos/WebAPI/Utils/FileTransfer.cs
View File

@@ -1,4 +1,5 @@
using MareSynchronos.API;
using System;
namespace MareSynchronos.WebAPI.Utils;
@@ -37,7 +38,7 @@ public class DownloadFileTransfer : FileTransfer
{
private DownloadFileDto Dto => (DownloadFileDto)TransferDto;
public DownloadFileTransfer(DownloadFileDto dto) : base(dto) { }
public Uri DownloadUri => new(Dto.Url);
public override long Total
{
set { }