mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-11 19:36:28 +00:00
Shared UI - Added HttpClientUtilities offering progressable stream content
Submission wizard - Added upload progress Submission wizard - Close on finish
This commit is contained in:
1 parent
ad4da3032d
commit
a1fd8d5099
10 files changed
+249
-16
No files matched your search
@@ -0,0 +1,119 @@
|
||||
// Heavily based on:
|
||||
// SkyClip
|
||||
// - ProgressableStreamContent.cs
|
||||
// --------------------------------------------------------------------
|
||||
// Author: Jeff Hansen <jeff@jeffijoe.com>
|
||||
// Copyright (C) Jeff Hansen 2015. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Artemis.UI.Shared.Utilities;
|
||||
|
||||
/// <summary>
|
||||
/// Provides HTTP content based on a stream with support for IProgress.
|
||||
/// </summary>
|
||||
public class ProgressableStreamContent : StreamContent
|
||||
{
|
||||
private const int DEFAULT_BUFFER_SIZE = 4096;
|
||||
|
||||
private readonly int _bufferSize;
|
||||
private readonly IProgress<StreamProgress> _progress;
|
||||
private readonly Stream _streamToWrite;
|
||||
private bool _contentConsumed;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ProgressableStreamContent" /> class.
|
||||
/// </summary>
|
||||
/// <param name="streamToWrite">The stream to write.</param>
|
||||
/// <param name="progress">The downloader.</param>
|
||||
public ProgressableStreamContent(Stream streamToWrite, IProgress<StreamProgress> progress) : this(streamToWrite, DEFAULT_BUFFER_SIZE, progress)
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ProgressableStreamContent" /> class.
|
||||
/// </summary>
|
||||
/// <param name="streamToWrite">The stream to write.</param>
|
||||
/// <param name="bufferSize">The buffer size.</param>
|
||||
/// <param name="progress">The downloader.</param>
|
||||
public ProgressableStreamContent(Stream streamToWrite, int bufferSize, IProgress<StreamProgress> progress) : base(streamToWrite, bufferSize)
|
||||
{
|
||||
if (bufferSize <= 0)
|
||||
throw new ArgumentOutOfRangeException(nameof(bufferSize));
|
||||
|
||||
_streamToWrite = streamToWrite;
|
||||
_bufferSize = bufferSize;
|
||||
_progress = progress;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
_streamToWrite.Dispose();
|
||||
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override async Task SerializeToStreamAsync(Stream stream, TransportContext? context)
|
||||
{
|
||||
await SerializeToStreamAsync(stream, context, CancellationToken.None);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override async Task SerializeToStreamAsync(Stream stream, TransportContext? context, CancellationToken cancellationToken)
|
||||
{
|
||||
PrepareContent();
|
||||
|
||||
byte[] buffer = new byte[_bufferSize];
|
||||
long size = _streamToWrite.Length;
|
||||
int uploaded = 0;
|
||||
|
||||
await using (_streamToWrite)
|
||||
{
|
||||
while (!cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
int length = await _streamToWrite.ReadAsync(buffer, cancellationToken);
|
||||
if (length <= 0)
|
||||
break;
|
||||
|
||||
uploaded += length;
|
||||
_progress.Report(new StreamProgress(uploaded, size));
|
||||
await stream.WriteAsync(buffer, 0, length, cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override bool TryComputeLength(out long length)
|
||||
{
|
||||
length = _streamToWrite.Length;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Prepares the content.
|
||||
/// </summary>
|
||||
/// <exception cref="System.InvalidOperationException">The stream has already been read.</exception>
|
||||
private void PrepareContent()
|
||||
{
|
||||
if (_contentConsumed)
|
||||
{
|
||||
// If the content needs to be written to a target stream a 2nd time, then the stream must support
|
||||
// seeking (e.g. a FileStream), otherwise the stream can't be copied a second time to a target
|
||||
// stream (e.g. a NetworkStream).
|
||||
if (_streamToWrite.CanSeek)
|
||||
_streamToWrite.Position = 0;
|
||||
else
|
||||
throw new InvalidOperationException("The stream has already been read.");
|
||||
}
|
||||
|
||||
_contentConsumed = true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
// Heavily based on:
|
||||
// SkyClip
|
||||
// - UploadProgress.cs
|
||||
// --------------------------------------------------------------------
|
||||
// Author: Jeff Hansen <jeff@jeffijoe.com>
|
||||
// Copyright (C) Jeff Hansen 2015. All rights reserved.
|
||||
|
||||
namespace Artemis.UI.Shared.Utilities;
|
||||
|
||||
/// <summary>
|
||||
/// The upload progress.
|
||||
/// </summary>
|
||||
public class StreamProgress
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="StreamProgress" /> class.
|
||||
/// </summary>
|
||||
/// <param name="bytesTransfered">
|
||||
/// The bytes transfered.
|
||||
/// </param>
|
||||
/// <param name="totalBytes">
|
||||
/// The total bytes.
|
||||
/// </param>
|
||||
public StreamProgress(long bytesTransfered, long? totalBytes)
|
||||
{
|
||||
BytesTransfered = bytesTransfered;
|
||||
TotalBytes = totalBytes;
|
||||
if (totalBytes.HasValue)
|
||||
ProgressPercentage = (int) ((float) bytesTransfered / totalBytes.Value * 100);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a <see cref="System.String" /> that represents this instance.
|
||||
/// </summary>
|
||||
/// <returns>
|
||||
/// A <see cref="System.String" /> that represents this instance.
|
||||
/// </returns>
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Format("{0}% ({1} / {2})", ProgressPercentage, BytesTransfered, TotalBytes);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the bytes transfered.
|
||||
/// </summary>
|
||||
public long BytesTransfered { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the progress percentage.
|
||||
/// </summary>
|
||||
public int ProgressPercentage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the total bytes.
|
||||
/// </summary>
|
||||
public long? TotalBytes { get; }
|
||||
}
|
||||
Reference in new issue
Block a user