Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Add setting to specify category for manual uploads.

nzbdav-deve183dd97c6bb
diff --git a/backend/Config/ConfigManager.cs b/backend/Config/ConfigManager.cs
index 83a40b83..e17d0ea5 100644
--- a/backend/Config/ConfigManager.cs
+++ b/backend/Config/ConfigManager.cs
@@ -76,6 +76,12 @@ public class ConfigManager
?? "audio,software,tv,movies";
}
+ public string GetManualUploadCategory()
+ {
+ return StringUtil.EmptyToNull(GetConfigValue("api.manual-category"))
+ ?? "uncategorized";
+ }
+
public int GetMaxConnections()
{
return int.Parse(
diff --git a/backend/WebDav/DatabaseStoreWatchFolder.cs b/backend/WebDav/DatabaseStoreWatchFolder.cs
index b4960e29..22b4ce37 100644
--- a/backend/WebDav/DatabaseStoreWatchFolder.cs
+++ b/backend/WebDav/DatabaseStoreWatchFolder.cs
@@ -58,7 +58,7 @@ public class DatabaseStoreWatchFolder(
{
FileName = request.Name,
MimeType = "application/x-nzb",
- Category = "uncategorized",
+ Category = configManager.GetManualUploadCategory(),
Priority = QueueItem.PriorityOption.Normal,
PostProcessing = QueueItem.PostProcessingOption.RepairUnpackDelete,
PauseUntil = DateTime.Now.AddSeconds(3),
diff --git a/frontend/app/clients/backend-client.server.ts b/frontend/app/clients/backend-client.server.ts
index 9e6de450..75b4b67e 100644
--- a/frontend/app/clients/backend-client.server.ts
+++ b/frontend/app/clients/backend-client.server.ts
@@ -94,7 +94,9 @@ class BackendClient {
}
public async addNzb(nzbFile: File): Promise<string> {
- const url = process.env.BACKEND_URL + "/api?mode=addfile&cat=uncategorized&priority=0&pp=0";
+ var config = await this.getConfig(["api.manual-category"]);
+ var category = config.find(item => item.configName === "api.manual-category")?.configValue || "uncategorized";
+ const url = process.env.BACKEND_URL + `/api?mode=addfile&cat=${category}&priority=0&pp=0`;
const apiKey = process.env.FRONTEND_BACKEND_API_KEY || "";
const response = await fetch(url, {
diff --git a/frontend/app/routes/settings/route.tsx b/frontend/app/routes/settings/route.tsx
index 0934e1fd..6334d473 100644
--- a/frontend/app/routes/settings/route.tsx
+++ b/frontend/app/routes/settings/route.tsx
@@ -13,6 +13,7 @@ import { isRepairsSettingsUpdated, isRepairsSettingsValid, RepairsSettings } fro
const defaultConfig = {
"api.key": "",
"api.categories": "",
+ "api.manual-category": "uncategorized",
"api.max-queue-connections": "",
"api.ensure-importable-video": "true",
"api.ensure-article-existence": "false",
diff --git a/frontend/app/routes/settings/sabnzbd/sabnzbd.tsx b/frontend/app/routes/settings/sabnzbd/sabnzbd.tsx
index a720d632..b31feb5e 100644
--- a/frontend/app/routes/settings/sabnzbd/sabnzbd.tsx
+++ b/frontend/app/routes/settings/sabnzbd/sabnzbd.tsx
@@ -50,6 +50,21 @@ export function SabnzbdSettings({ config, setNewConfig }: SabnzbdSettingsProps)
</Form.Text>
</Form.Group>
<hr />
+ <Form.Group>
+ <Form.Label htmlFor="manual-category-input">Manual Upload Category</Form.Label>
+ <Form.Control
+ className={styles.input}
+ type="text"
+ id="manual-category-input"
+ aria-describedby="manual-category-help"
+ value={config["api.manual-category"]}
+ placeholder="uncategorized"
+ onChange={e => setNewConfig({ ...config, "api.manual-category": e.target.value })} />
+ <Form.Text id="manual-category-help" muted>
+ The category to use for manual uploads through the Queue page on the UI.
+ </Form.Text>
+ </Form.Group>
+ <hr />
<Form.Group>
<Form.Label htmlFor="mount-dir-input">Rclone Mount Directory</Form.Label>
<Form.Control
@@ -159,6 +174,7 @@ export function SabnzbdSettings({ config, setNewConfig }: SabnzbdSettingsProps)
export function isSabnzbdSettingsUpdated(config: Record<string, string>, newConfig: Record<string, string>) {
return config["api.key"] !== newConfig["api.key"]
|| config["api.categories"] !== newConfig["api.categories"]
+ || config["api.manual-category"] !== newConfig["api.manual-category"]
|| config["rclone.mount-dir"] !== newConfig["rclone.mount-dir"]
|| config["api.max-queue-connections"] !== newConfig["api.max-queue-connections"]
|| config["api.ensure-importable-video"] !== newConfig["api.ensure-importable-video"]