Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Added support for nzbname param within AddUrl api (#128)
nzbdav-devd639852bfa69
diff --git a/backend/Api/SabControllers/AddFile/AddFileRequest.cs b/backend/Api/SabControllers/AddFile/AddFileRequest.csindex d02366fc..fc481f84 100644--- a/backend/Api/SabControllers/AddFile/AddFileRequest.cs+++ b/backend/Api/SabControllers/AddFile/AddFileRequest.cs@@ -7,7 +7,7 @@ namespace NzbWebDAV.Api.SabControllers.AddFile;public class AddFileRequest(){public string FileName { get; init; }- public string MimeType { get; init; }+ public string? MimeType { get; init; }public string NzbFileContents { get; init; }public string Category { get; init; }public QueueItem.PriorityOption Priority { get; init; }diff --git a/backend/Api/SabControllers/AddUrl/AddUrlRequest.cs b/backend/Api/SabControllers/AddUrl/AddUrlRequest.csindex f5cbdbf9..ec540a60 100644--- a/backend/Api/SabControllers/AddUrl/AddUrlRequest.cs+++ b/backend/Api/SabControllers/AddUrl/AddUrlRequest.cs@@ -13,7 +13,8 @@ public class AddUrlRequest() : AddFileRequestpublic static async Task<AddUrlRequest> New(HttpContext context){var nzbUrl = context.GetQueryParam("name");- var nzbFile = await GetNzbFile(nzbUrl);+ var nzbName = context.GetQueryParam("nzbname");+ var nzbFile = await GetNzbFile(nzbUrl, nzbName);return new AddUrlRequest(){FileName = nzbFile.FileName,@@ -26,7 +27,7 @@ public class AddUrlRequest() : AddFileRequest};}- private static async Task<NzbFileResponse> GetNzbFile(string? url)+ private static async Task<NzbFileResponse> GetNzbFile(string? url, string? nzbName){try{@@ -43,14 +44,16 @@ public class AddUrlRequest() : AddFileRequest// read the content typevar contentType = response.Content.Headers.ContentType?.MediaType;- if (string.IsNullOrEmpty(contentType))- throw new Exception("Missing Content-Type header.");- // read the filename- var contentDisposition = response.Content.Headers.ContentDisposition;- var fileName = contentDisposition?.FileName?.Trim('"');- if (string.IsNullOrEmpty(fileName))- throw new Exception("Filename could not be determined from Content-Disposition header.");+ // determine the filename+ var fileName = AddNzbExtension(nzbName);+ if (fileName == null)+ {+ var contentDisposition = response.Content.Headers.ContentDisposition;+ fileName = contentDisposition?.FileName?.Trim('"');+ if (string.IsNullOrEmpty(fileName))+ throw new Exception("Filename could not be determined from Content-Disposition header.");+ }// read the file contentsvar fileContents = await response.Content.ReadAsStringAsync();@@ -71,10 +74,17 @@ public class AddUrlRequest() : AddFileRequest}}+ private static string? AddNzbExtension(string? nzbName)+ {+ return nzbName == null ? null+ : nzbName.ToLower().EndsWith("nzb") ? nzbName+ : $"{nzbName}.nzb";+ }+private class NzbFileResponse{public required string FileName { get; init; }- public required string ContentType { get; init; }+ public required string? ContentType { get; init; }public required string FileContents { get; init; }}}\ No newline at end of file