Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Populated ReleaseDate column for new DavItems.
nzbdav-dev46b3cf71b23e
diff --git a/backend/Database/Models/DavItem.cs b/backend/Database/Models/DavItem.csindex ced0e966..069ed10a 100644--- a/backend/Database/Models/DavItem.cs+++ b/backend/Database/Models/DavItem.cs@@ -24,7 +24,8 @@ public class DavItemDavItem parent,string name,long? fileSize,- ItemType type+ ItemType type,+ DateTimeOffset? releaseDate){return new DavItem()@@ -36,7 +37,8 @@ public class DavItemName = name,FileSize = fileSize,Type = type,- Path = System.IO.Path.Join(parent.Path, name)+ Path = System.IO.Path.Join(parent.Path, name),+ ReleaseDate = releaseDate};}diff --git a/backend/Queue/DeobfuscationSteps/1.FetchFirstSegment/FetchFirstSegmentsStep.cs b/backend/Queue/DeobfuscationSteps/1.FetchFirstSegment/FetchFirstSegmentsStep.csindex dc0091e3..264ceda8 100644--- a/backend/Queue/DeobfuscationSteps/1.FetchFirstSegment/FetchFirstSegmentsStep.cs+++ b/backend/Queue/DeobfuscationSteps/1.FetchFirstSegment/FetchFirstSegmentsStep.cs@@ -62,7 +62,8 @@ public static class FetchFirstSegmentsStepNzbFile = nzbFile,First16KB = first16KB,Header = stream.Header,- MissingFirstSegment = false+ MissingFirstSegment = false,+ ReleaseDate = stream.ArticleHeaders!.Date};}catch (UsenetArticleNotFoundException)@@ -72,7 +73,8 @@ public static class FetchFirstSegmentsStepNzbFile = nzbFile,First16KB = null,Header = null,- MissingFirstSegment = true+ MissingFirstSegment = true,+ ReleaseDate = DateTimeOffset.UtcNow};}}@@ -83,5 +85,6 @@ public static class FetchFirstSegmentsSteppublic required YencHeader? Header { get; init; }public required byte[]? First16KB { get; init; }public required bool MissingFirstSegment { get; init; }+ public required DateTimeOffset ReleaseDate { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/DeobfuscationSteps/3.GetFileInfos/GetFileInfosStep.cs b/backend/Queue/DeobfuscationSteps/3.GetFileInfos/GetFileInfosStep.csindex 8ccf3ebd..fab5ea3a 100644--- a/backend/Queue/DeobfuscationSteps/3.GetFileInfos/GetFileInfosStep.cs+++ b/backend/Queue/DeobfuscationSteps/3.GetFileInfos/GetFileInfosStep.cs@@ -58,6 +58,7 @@ public static class GetFileInfosStep{NzbFile = file.NzbFile,FileName = filename,+ ReleaseDate = file.ReleaseDate,FileSize = (long?)fileDesc?.FileLength};}@@ -76,6 +77,7 @@ public static class GetFileInfosStep{public required NzbFile NzbFile { get; init; }public required string FileName { get; init; }+ public required DateTimeOffset ReleaseDate { get; init; }public long? FileSize { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/FileAggregators/BaseAggregator.cs b/backend/Queue/FileAggregators/BaseAggregator.csindex aa660b4e..280913d9 100644--- a/backend/Queue/FileAggregators/BaseAggregator.cs+++ b/backend/Queue/FileAggregators/BaseAggregator.cs@@ -38,7 +38,8 @@ public abstract class BaseAggregatorparent: parentDirectory,name: directoryName,fileSize: null,- type: DavItem.ItemType.Directory+ type: DavItem.ItemType.Directory,+ releaseDate: null);_directoryCache.Add(pathKey, directory);DBClient.Ctx.Items.Add(directory);diff --git a/backend/Queue/FileAggregators/FileAggregator.cs b/backend/Queue/FileAggregators/FileAggregator.csindex aa84d6f7..0cbce2de 100644--- a/backend/Queue/FileAggregators/FileAggregator.cs+++ b/backend/Queue/FileAggregators/FileAggregator.cs@@ -22,7 +22,8 @@ public class FileAggregator(DavDatabaseClient dbClient, DavItem mountDirectory)parent: mountDirectory,name: result.FileName,fileSize: result.FileSize,- type: DavItem.ItemType.NzbFile+ type: DavItem.ItemType.NzbFile,+ releaseDate: result.ReleaseDate);var davNzbFile = new DavNzbFile()diff --git a/backend/Queue/FileAggregators/MultipartMkvAggregator.cs b/backend/Queue/FileAggregators/MultipartMkvAggregator.csindex b41d6ed7..ffade990 100644--- a/backend/Queue/FileAggregators/MultipartMkvAggregator.cs+++ b/backend/Queue/FileAggregators/MultipartMkvAggregator.cs@@ -31,7 +31,8 @@ public class MultipartMkvAggregator(DavDatabaseClient dbClient, DavItem mountDirparent: parentDirectory,name: name,fileSize: fileParts.Sum(x => x.ByteCount),- type: DavItem.ItemType.RarFile+ type: DavItem.ItemType.RarFile,+ releaseDate: multipartMkvFile.ReleaseDate);var davRarFile = new DavRarFile()diff --git a/backend/Queue/FileAggregators/RarAggregator.cs b/backend/Queue/FileAggregators/RarAggregator.csindex 8adc8090..6f2c0146 100644--- a/backend/Queue/FileAggregators/RarAggregator.cs+++ b/backend/Queue/FileAggregators/RarAggregator.cs@@ -58,7 +58,8 @@ public class RarAggregator(DavDatabaseClient dbClient, DavItem mountDirectory) :parent: parentDirectory,name: name,fileSize: rarParts.Sum(x => x.ByteCount),- type: DavItem.ItemType.RarFile+ type: DavItem.ItemType.RarFile,+ releaseDate: archiveParts.First().ReleaseDate);var davRarFile = new DavRarFile()diff --git a/backend/Queue/FileAggregators/SevenZipAggregator.cs b/backend/Queue/FileAggregators/SevenZipAggregator.csindex 383ea414..d7959503 100644--- a/backend/Queue/FileAggregators/SevenZipAggregator.cs+++ b/backend/Queue/FileAggregators/SevenZipAggregator.cs@@ -39,7 +39,8 @@ public class SevenZipAggregator(DavDatabaseClient dbClient, DavItem mountDirectoparent: parentDirectory,name: name,fileSize: sevenZipParts.Sum(x => x.ByteCount),- type: DavItem.ItemType.RarFile+ type: DavItem.ItemType.RarFile,+ releaseDate: sevenZipFile.ReleaseDate);var davRarFile = new DavRarFile()diff --git a/backend/Queue/FileProcessors/FileProcessor.cs b/backend/Queue/FileProcessors/FileProcessor.csindex 643d27ee..094faae9 100644--- a/backend/Queue/FileProcessors/FileProcessor.cs+++ b/backend/Queue/FileProcessors/FileProcessor.cs@@ -22,6 +22,7 @@ public class FileProcessor(NzbFile = fileInfo.NzbFile,FileName = fileInfo.FileName,FileSize = fileInfo.FileSize ?? await usenet.GetFileSizeAsync(fileInfo.NzbFile, ct),+ ReleaseDate = fileInfo.ReleaseDate,};}@@ -36,8 +37,9 @@ public class FileProcessor(public new class Result : BaseProcessor.Result{- public NzbFile NzbFile { get; init; } = null!;- public string FileName { get; init; } = null!;- public long FileSize { get; init; }+ public required NzbFile NzbFile { get; init; }+ public required string FileName { get; init; }+ public required long FileSize { get; init; }+ public required DateTimeOffset ReleaseDate { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/FileProcessors/MultipartMkvProcessor.cs b/backend/Queue/FileProcessors/MultipartMkvProcessor.csindex 7bfd176c..f4166dfd 100644--- a/backend/Queue/FileProcessors/MultipartMkvProcessor.cs+++ b/backend/Queue/FileProcessors/MultipartMkvProcessor.cs@@ -43,7 +43,8 @@ public class MultipartMkvProcessor : BaseProcessorreturn new Result{Filename = GetBaseName(sortedFileInfos.First().FileName),- Parts = fileParts+ Parts = fileParts,+ ReleaseDate = sortedFileInfos.First().ReleaseDate,};}@@ -62,6 +63,7 @@ public class MultipartMkvProcessor : BaseProcessorpublic new class Result : BaseProcessor.Result{public required string Filename { get; init; }- public List<DavRarFile.RarPart> Parts { get; init; } = [];+ public required List<DavRarFile.RarPart> Parts { get; init; } = [];+ public required DateTimeOffset ReleaseDate { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/FileProcessors/RarProcessor.cs b/backend/Queue/FileProcessors/RarProcessor.csindex 9b015d3a..c21f408f 100644--- a/backend/Queue/FileProcessors/RarProcessor.cs+++ b/backend/Queue/FileProcessors/RarProcessor.cs@@ -37,6 +37,7 @@ public class RarProcessor(Offset = x.GetDataStartPosition(),ByteCount = x.GetAdditionalDataSize(),}).ToArray(),+ ReleaseDate = fileInfo.ReleaseDate,};}catch (CryptographicException ex)@@ -103,17 +104,18 @@ public class RarProcessor(public new class Result : BaseProcessor.Result{- public NzbFile NzbFile { get; init; } = null!;- public long PartSize { get; init; }- public string ArchiveName { get; init; } = null!;- public int PartNumber { get; init; }- public StoredFileSegment[] StoredFileSegments { get; init; } = [];+ 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 StoredFileSegment[] StoredFileSegments { get; init; }+ public required DateTimeOffset ReleaseDate { get; init; }}public class StoredFileSegment{- public string PathWithinArchive { get; init; } = null!;- public long Offset { get; init; }- public long ByteCount { get; init; }+ public required string PathWithinArchive { get; init; }+ public required long Offset { get; init; }+ public required long ByteCount { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/FileProcessors/SevenZipProcessor.cs b/backend/Queue/FileProcessors/SevenZipProcessor.csindex 34689e5d..34cac129 100644--- a/backend/Queue/FileProcessors/SevenZipProcessor.cs+++ b/backend/Queue/FileProcessors/SevenZipProcessor.cs@@ -45,8 +45,9 @@ public class SevenZipProcessor : BaseProcessorSevenZipFiles = sevenZipEntries.Select(x => new SevenZipFile(){PathWithinArchive = x.PathWithinArchive,- Parts = GetSevenZipParts(x, multipartFile)- }).ToList()+ Parts = GetSevenZipParts(x, multipartFile),+ ReleaseDate = _fileInfos.First().ReleaseDate,+ }).ToList(),};}@@ -124,12 +125,13 @@ public class SevenZipProcessor : BaseProcessorpublic new class Result : BaseProcessor.Result{- public List<SevenZipFile> SevenZipFiles { get; init; } = [];+ public required List<SevenZipFile> SevenZipFiles { get; init; }}public class SevenZipFile{public required string PathWithinArchive { get; init; }- public List<DavRarFile.RarPart> Parts { get; init; } = [];+ public required List<DavRarFile.RarPart> Parts { get; init; }+ public required DateTimeOffset ReleaseDate { get; init; }}}\ No newline at end of filediff --git a/backend/Queue/QueueItemProcessor.cs b/backend/Queue/QueueItemProcessor.csindex e828881e..2df63411 100644--- a/backend/Queue/QueueItemProcessor.cs+++ b/backend/Queue/QueueItemProcessor.cs@@ -228,7 +228,8 @@ public class QueueItemProcessor(parent: DavItem.ContentFolder,name: queueItem.Category,fileSize: null,- type: DavItem.ItemType.Directory+ type: DavItem.ItemType.Directory,+ releaseDate: null);dbClient.Ctx.Items.Add(categoryFolder);return categoryFolder;@@ -241,7 +242,8 @@ public class QueueItemProcessor(parent: categoryFolder,name: queueItem.JobName,fileSize: null,- type: DavItem.ItemType.Directory+ type: DavItem.ItemType.Directory,+ releaseDate: null);dbClient.Ctx.Items.Add(mountFolder);return mountFolder;