Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Added UnbufferedMultiSegmentStream.
nzbdav-dev3c08478f21df
diff --git a/backend/Queue/DeobfuscationSteps/2.GetPar2FileDescriptors/GetPar2FileDescriptorsStep.cs b/backend/Queue/DeobfuscationSteps/2.GetPar2FileDescriptors/GetPar2FileDescriptorsStep.csindex 58793408..4653ea3a 100644--- a/backend/Queue/DeobfuscationSteps/2.GetPar2FileDescriptors/GetPar2FileDescriptorsStep.cs+++ b/backend/Queue/DeobfuscationSteps/2.GetPar2FileDescriptors/GetPar2FileDescriptorsStep.cs@@ -28,7 +28,7 @@ public static class GetPar2FileDescriptorsStepvar filesize = par2Index.NzbFile.Segments.Count == 1? par2Index.Header!.PartOffset + par2Index.Header!.PartSize: await usenetClient.GetFileSizeAsync(par2Index.NzbFile, cancellationToken).ConfigureAwait(false);- await using var stream = usenetClient.GetFileStream(segments, filesize, articleBufferSize: 1);+ await using var stream = usenetClient.GetFileStream(segments, filesize, articleBufferSize: 0);await foreach (var fileDescriptor in Par2.ReadFileDescriptions(stream, cancellationToken).ConfigureAwait(false))fileDescriptors.Add(fileDescriptor);return fileDescriptors;diff --git a/backend/Queue/FileProcessors/RarProcessor.cs b/backend/Queue/FileProcessors/RarProcessor.csindex 2fc4207c..bb0860f9 100644--- a/backend/Queue/FileProcessors/RarProcessor.cs+++ b/backend/Queue/FileProcessors/RarProcessor.cs@@ -93,7 +93,7 @@ public class RarProcessor({var filesize = fileInfo.FileSize;filesize ??= await usenetClient.GetFileSizeAsync(fileInfo.NzbFile, ct).ConfigureAwait(false);- return usenetClient.GetFileStream(fileInfo.NzbFile, filesize!.Value, articleBufferSize: 1);+ return usenetClient.GetFileStream(fileInfo.NzbFile, filesize!.Value, articleBufferSize: 0);}public new class Result : BaseProcessor.Resultdiff --git a/backend/Streams/MultiSegmentStream.cs b/backend/Streams/MultiSegmentStream.csindex 25226565..4ca706c3 100644--- a/backend/Streams/MultiSegmentStream.cs+++ b/backend/Streams/MultiSegmentStream.cs@@ -1,4 +1,5 @@-using System.Threading.Channels;+using System.Linq.Expressions;+using System.Threading.Channels;using NzbWebDAV.Clients.Usenet;using NzbWebDAV.Clients.Usenet.Models;using UsenetSharp.Streams;@@ -14,8 +15,14 @@ public class MultiSegmentStream : FastReadOnlyNonSeekableStreamprivate Stream? _stream;private bool _disposed;+ public static Stream Create(Memory<string> segmentIds, INntpClient usenetClient, int articleBufferSize)+ {+ return articleBufferSize == 0+ ? new UnbufferedMultiSegmentStream(segmentIds, usenetClient)+ : new MultiSegmentStream(segmentIds, usenetClient, articleBufferSize);+ }- public MultiSegmentStream(Memory<string> segmentIds, INntpClient usenetClient, int articleBufferSize)+ private MultiSegmentStream(Memory<string> segmentIds, INntpClient usenetClient, int articleBufferSize){_segmentIds = segmentIds;_usenetClient = usenetClient;diff --git a/backend/Streams/MultipartFileStream.cs b/backend/Streams/MultipartFileStream.csindex d0127f87..5878315c 100644--- a/backend/Streams/MultipartFileStream.cs+++ b/backend/Streams/MultipartFileStream.cs@@ -57,7 +57,7 @@ public class MultipartFileStream(MultipartFile multipartFile, INntpClient usenet);var filePart = multipartFile.FileParts[searchResult.FoundIndex];- var stream = usenetClient.GetFileStream(filePart.NzbFile, filePart.PartSize, articleBufferSize: 1);+ var stream = usenetClient.GetFileStream(filePart.NzbFile, filePart.PartSize, articleBufferSize: 0);stream.Seek(_position - searchResult.FoundByteRange.StartInclusive, SeekOrigin.Begin);return stream;}diff --git a/backend/Streams/NzbFileStream.cs b/backend/Streams/NzbFileStream.csindex 2ddbb345..db2e58c0 100644--- a/backend/Streams/NzbFileStream.cs+++ b/backend/Streams/NzbFileStream.cs@@ -15,7 +15,7 @@ public class NzbFileStream({private long _position;private bool _disposed;- private MultiSegmentStream? _innerStream;+ private Stream? _innerStream;public override bool CanSeek => true;public override long Length => fileSize;@@ -67,7 +67,7 @@ public class NzbFileStream().ConfigureAwait(false);}- private async Task<MultiSegmentStream> GetFileStream(long rangeStart, CancellationToken cancellationToken)+ private async Task<Stream> GetFileStream(long rangeStart, CancellationToken cancellationToken){if (rangeStart == 0) return GetMultiSegmentStream(0);var foundSegment = await SeekSegment(rangeStart, cancellationToken).ConfigureAwait(false);@@ -77,10 +77,10 @@ public class NzbFileStream(return stream;}- private MultiSegmentStream GetMultiSegmentStream(int firstSegmentIndex)+ private Stream GetMultiSegmentStream(int firstSegmentIndex){var segmentIds = fileSegmentIds.AsMemory()[firstSegmentIndex..];- return new MultiSegmentStream(segmentIds, usenetClient, articleBufferSize);+ return MultiSegmentStream.Create(segmentIds, usenetClient, articleBufferSize);}protected override void Dispose(bool disposing)diff --git a/backend/Streams/UnbufferedMultiSegmentStream.cs b/backend/Streams/UnbufferedMultiSegmentStream.csnew file mode 100644index 00000000..74fdcee0--- /dev/null+++ b/backend/Streams/UnbufferedMultiSegmentStream.cs@@ -0,0 +1,62 @@+using System.Threading.Channels;+using NzbWebDAV.Clients.Usenet;+using NzbWebDAV.Clients.Usenet.Models;+using UsenetSharp.Streams;++namespace NzbWebDAV.Streams;++public class UnbufferedMultiSegmentStream : FastReadOnlyNonSeekableStream+{+ private readonly Memory<string> _segmentIds;+ private readonly INntpClient _usenetClient;+ private Stream? _stream;+ private int _currentIndex;+ private bool _disposed;+++ public UnbufferedMultiSegmentStream(Memory<string> segmentIds, INntpClient usenetClient)+ {+ _segmentIds = segmentIds;+ _usenetClient = usenetClient;+ }++ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)+ {+ ThrowIfDisposed();++ while (!cancellationToken.IsCancellationRequested)+ {+ // if the stream is null, get the next stream.+ if (_stream == null)+ {+ if (_currentIndex >= _segmentIds.Length) return 0;+ var body = await _usenetClient.DecodedBodyAsync(_segmentIds.Span[_currentIndex++], cancellationToken);+ _stream = body.Stream;+ }++ // read from the stream+ var read = await _stream.ReadAsync(buffer, cancellationToken);+ if (read > 0) return read;++ // if the stream ended, continue to the next stream.+ await _stream.DisposeAsync();+ _stream = null;+ }++ return 0;+ }++ private void ThrowIfDisposed()+ {+ ObjectDisposedException.ThrowIf(_disposed, this);+ }++ protected override void Dispose(bool disposing)+ {+ if (_disposed) return;+ if (!disposing) return;+ _disposed = true;+ _stream?.Dispose();+ base.Dispose();+ }+}\ No newline at end of file