Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Fixed bug determining rar part numbers.
nzbdav-dev79664144a670
diff --git a/backend/Queue/FileAggregators/RarAggregator.cs b/backend/Queue/FileAggregators/RarAggregator.csindex 7aeff8d3..90e77d36 100644--- a/backend/Queue/FileAggregators/RarAggregator.cs+++ b/backend/Queue/FileAggregators/RarAggregator.cs@@ -1,4 +1,5 @@-using NzbWebDAV.Database;+using System.Diagnostics.CodeAnalysis;+using NzbWebDAV.Database;using NzbWebDAV.Database.Models;using NzbWebDAV.Extensions;using NzbWebDAV.Models;@@ -17,7 +18,6 @@ public class RarAggregator(DavDatabaseClient dbClient, DavItem mountDirectory, bvar fileSegments = processorResults.OfType<RarProcessor.Result>().SelectMany(x => x.StoredFileSegments)- .OrderBy(x => x.PartNumber).ToList();ProcessArchive(fileSegments);@@ -37,7 +37,7 @@ public class RarAggregator(DavDatabaseClient dbClient, DavItem mountDirectory, bforeach (var archiveFile in archiveFiles){var pathWithinArchive = archiveFile.Key;- var fileParts = archiveFile.Value.ToArray();+ var fileParts = SortByPartNumber(archiveFile.Value);var aesParams = fileParts.Select(x => x.AesParams).FirstOrDefault(x => x != null);var fileSize = aesParams?.DecodedSize ?? fileParts.Sum(x => x.ByteRangeWithinPart.Count);var parentDirectory = EnsureExtractPath(pathWithinArchive);@@ -77,4 +77,41 @@ public class RarAggregator(DavDatabaseClient dbClient, DavItem mountDirectory, bdbClient.Ctx.MultipartFiles.Add(davMultipartFile);}}++ private static RarProcessor.StoredFileSegment[] SortByPartNumber(+ List<RarProcessor.StoredFileSegment> storedFileSegments)+ {+ // Find delta between part number from headers and filenames.+ var delta = storedFileSegments+ .Select(x => x.PartNumber)+ .Where(x => x is { PartNumberFromHeader: >= 0, PartNumberFromFilename: >= 0 })+ .Select(x => x.PartNumberFromHeader - x.PartNumberFromFilename)+ .GroupBy(x => x)+ .MaxBy(x => x.Count())?.Key;++ // Ensure there are no duplicate part numbers.+ var allPartNumbers = storedFileSegments.Select(x => GetNormalizedPartNumber(x.PartNumber, delta));+ ValidatePartNumbers(allPartNumbers);++ // Sort by part numbers and return.+ return storedFileSegments+ .OrderBy(x => GetNormalizedPartNumber(x.PartNumber, delta))+ .ToArray();+ }++ [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]+ private static void ValidatePartNumbers(IEnumerable<int> partNumbers)+ {+ var count = partNumbers.Count();+ var uniqueCount = partNumbers.Distinct().Count();+ if (count != uniqueCount)+ throw new InvalidFormatException("Rar archive has duplicate volume numbers.");+ }++ private static int GetNormalizedPartNumber(RarProcessor.PartNumber partNumber, int? delta)+ {+ if (partNumber.PartNumberFromHeader >= 0) return partNumber.PartNumberFromHeader!.Value;+ if (partNumber.PartNumberFromFilename >= 0) return partNumber.PartNumberFromFilename!.Value + (delta ?? 0);+ return -1;+ }}\ No newline at end of filediff --git a/backend/Queue/FileProcessors/RarProcessor.cs b/backend/Queue/FileProcessors/RarProcessor.csindex bb0860f9..7f77348d 100644--- a/backend/Queue/FileProcessors/RarProcessor.cs+++ b/backend/Queue/FileProcessors/RarProcessor.cs@@ -52,25 +52,18 @@ public class RarProcessor(return sansExtension;}- private int GetPartNumber(List<IRarHeader> rarHeaders)+ private PartNumber GetPartNumber(List<IRarHeader> rarHeaders){- // read from archive-header if possible- var partNumberFromHeaders = GetPartNumberFromHeaders(rarHeaders);- if (partNumberFromHeaders != null) return partNumberFromHeaders!.Value;-- // handle the `.partXXX.rar` format- var partMatch = Regex.Match(fileInfo.FileName, @"\.part(\d+)\.rar$", RegexOptions.IgnoreCase);- if (partMatch.Success) return int.Parse(partMatch.Groups[1].Value);+ var partNumber = new PartNumber()+ {+ PartNumberFromHeader = GetPartNumberFromHeaders(rarHeaders),+ PartNumberFromFilename = GetPartNumberFromFilename(fileInfo.FileName),+ };- // handle the `.rXXX` format- var rMatch = Regex.Match(fileInfo.FileName, @"\.r(\d+)$", RegexOptions.IgnoreCase);- if (rMatch.Success) return int.Parse(rMatch.Groups[1].Value);+ if (partNumber.PartNumberFromHeader == null && partNumber.PartNumberFromFilename == null)+ throw new Exception("Could not determine part number for RAR file.");- // handle the `.rar` format.- if (fileInfo.FileName.EndsWith(".rar", StringComparison.OrdinalIgnoreCase)) return -1;-- // we were unable to determine the part number.- throw new Exception("Could not determine part number for RAR file.");+ return partNumber;}private static int? GetPartNumberFromHeaders(List<IRarHeader> headers)@@ -80,12 +73,32 @@ public class RarProcessor(var archiveHeader = headers.FirstOrDefault(x => x.HeaderType is HeaderType.Archive);var archiveVolumeNumber = archiveHeader?.GetVolumeNumber();if (archiveVolumeNumber != null) return archiveVolumeNumber!.Value;- if (archiveHeader?.GetIsFirstVolume() == true) return -1;var endHeader = headers.FirstOrDefault(x => x.HeaderType == HeaderType.EndArchive);var endVolumeNumber = endHeader?.GetVolumeNumber();if (endVolumeNumber != null) return endVolumeNumber!.Value;+ if (archiveHeader?.GetIsFirstVolume() == true) return -1;+ return null;+ }++ private static int? GetPartNumberFromFilename(string filename)+ {+ // handle the `.partXXX.rar` format+ var partMatch = Regex.Match(filename, @"\.part(\d+)\.rar$", RegexOptions.IgnoreCase);+ if (partMatch.Success)+ return int.Parse(partMatch.Groups[1].Value);++ // handle the `.rXXX` format+ var rMatch = Regex.Match(filename, @"\.r(\d+)$", RegexOptions.IgnoreCase);+ if (rMatch.Success)+ return int.Parse(rMatch.Groups[1].Value);++ // handle the `.rar` format.+ if (filename.EndsWith(".rar", StringComparison.OrdinalIgnoreCase))+ return -1;++ // could not determine from filenamereturn null;}@@ -106,11 +119,17 @@ public class RarProcessor(public required NzbFile NzbFile { get; init; }public required long PartSize { get; init; }public required string ArchiveName { get; init; }- public required int PartNumber { get; init; }+ public required PartNumber PartNumber { get; init; }public required DateTimeOffset ReleaseDate { get; init; }public required string PathWithinArchive { get; init; }public required LongRange ByteRangeWithinPart { get; init; }public required AesParams? AesParams { get; init; }}++ public record PartNumber+ {+ public int? PartNumberFromHeader { get; init; }+ public int? PartNumberFromFilename { get; init; }+ }}\ No newline at end of file