Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Added dropzone for uploading nzb files.
nzbdav-deve563469cde39
diff --git a/frontend/app/routes/queue/components/page-table/page-table.module.css b/frontend/app/routes/queue/components/page-table/page-table.module.cssindex 5faf9b89..f91dc3f1 100644--- a/frontend/app/routes/queue/components/page-table/page-table.module.css+++ b/frontend/app/routes/queue/components/page-table/page-table.module.css@@ -87,6 +87,10 @@.removing {opacity: 20%;}++ .uploading {+ background: rgba(128, 150, 255, 0.1);+ }}.table:not(:has(+ .footer)) tbody tr:last-child td {diff --git a/frontend/app/routes/queue/components/page-table/page-table.tsx b/frontend/app/routes/queue/components/page-table/page-table.tsxindex 79c77ab9..9c92a508 100644--- a/frontend/app/routes/queue/components/page-table/page-table.tsx+++ b/frontend/app/routes/queue/components/page-table/page-table.tsx@@ -5,6 +5,7 @@ import { TriCheckbox, type TriCheckboxState } from "../tri-checkbox/tri-checkboximport { Truncate } from "../truncate/truncate";import { StatusBadge } from "../status-badge/status-badge";import { formatFileSize } from "~/utils/file-size";+import { classNames } from "~/utils/styling";export type PageTableProps = {children?: ReactNode,@@ -42,6 +43,7 @@ export function PageTable({ children, headerCheckboxState, onHeaderCheckboxChang}export type PageRowProps = {+ isUploading?: boolean,isSelected: boolean,isRemoving: boolean,name: string,@@ -54,8 +56,13 @@ export type PageRowProps = {onRowSelectionChanged: (isSelected: boolean) => void}export function PageRow(props: PageRowProps) {+ const rowStyles = [+ props.isRemoving && styles.removing,+ props.isUploading && styles.uploading+ ];+return (- <tr className={props.isRemoving ? styles.removing : undefined}>+ <tr className={classNames(rowStyles)}><td><TriCheckbox state={props.isSelected} onChange={props.onRowSelectionChanged}><Truncate>{props.name}</Truncate>diff --git a/frontend/app/routes/queue/components/queue-table/queue-table.tsx b/frontend/app/routes/queue/components/queue-table/queue-table.tsxindex 263a101f..07f4206d 100644--- a/frontend/app/routes/queue/components/queue-table/queue-table.tsx+++ b/frontend/app/routes/queue/components/queue-table/queue-table.tsx@@ -136,6 +136,7 @@ export function QueueRow({ slot, onIsSelectedChanged, onIsRemovingChanged, onRemreturn (<><PageRow+ isUploading={!!slot.isUploading}isSelected={!!slot.isSelected}isRemoving={!!slot.isRemoving}name={slot.filename}diff --git a/frontend/app/routes/queue/route.module.css b/frontend/app/routes/queue/route.module.cssindex 20f8059d..1feaf271 100644--- a/frontend/app/routes/queue/route.module.css+++ b/frontend/app/routes/queue/route.module.css@@ -14,6 +14,7 @@display: flex;gap: 10px;align-items: baseline;+h3 {margin: 0;}@@ -29,4 +30,23 @@.listItem {margin-top: 5px}+}++.dropzone {+ position: relative;+}++.activeDropzone {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ background-color: rgba(0, 123, 255, 0.1);+ outline: 2px dashed #007bff;+ display: flex;+ align-items: center;+ justify-content: center;+ pointer-events: none;+ border-radius: 4px;}\ No newline at end of filediff --git a/frontend/app/routes/queue/route.module.css.d.ts b/frontend/app/routes/queue/route.module.css.d.tsindex 322292e4..3673e907 100644--- a/frontend/app/routes/queue/route.module.css.d.ts+++ b/frontend/app/routes/queue/route.module.css.d.ts@@ -5,6 +5,8 @@ declare const styles: {readonly "alert": string;readonly "list": string;readonly "listItem": string;+ readonly "dropzone": string;+ readonly "activeDropzone": string;};export = styles;diff --git a/frontend/app/routes/queue/route.tsx b/frontend/app/routes/queue/route.tsxindex c6e06b3d..5a7b82ec 100644--- a/frontend/app/routes/queue/route.tsx+++ b/frontend/app/routes/queue/route.tsx@@ -1,15 +1,13 @@-import { Link, redirect } from "react-router";+import { Link } from "react-router";import type { Route } from "./+types/route";import styles from "./route.module.css"import { Alert } from 'react-bootstrap';import { backendClient, type HistorySlot, type QueueSlot } from "~/clients/backend-client.server";import { HistoryTable } from "./components/history-table/history-table";import { QueueTable } from "./components/queue-table/queue-table";-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useState, useRef } from "react";import { receiveMessage } from "~/utils/websocket-util";-import { isAuthenticated } from "~/auth/authentication.server";-import { PageSection } from "./components/page-section/page-section";-import { EmptyQueue } from "./components/empty-queue/empty-queue";+import { useDropzone } from 'react-dropzone';const topicNames = {queueItemStatus: 'qs',@@ -45,11 +43,15 @@ export async function loader({ request }: Route.LoaderArgs) {export default function Queue(props: Route.ComponentProps) {const [queueSlots, setQueueSlots] = useState<PresentationQueueSlot[]>(props.loaderData.queueSlots);const [historySlots, setHistorySlots] = useState<PresentationHistorySlot[]>(props.loaderData.historySlots);+ const [uploadingFiles, setUploadingFiles] = useState<UploadingFile[]>([]);+ const uploadQueueRef = useRef<UploadingFile[]>([]);+ const isUploadingRef = useRef(false);const disableLiveView = queueSlots.length == maxItems || historySlots.length == maxItems;- const error = props.actionData?.error;+ const combinedQueueSlots = [...uploadingFiles.map(file => file.queueSlot), ...queueSlots];// queue eventsconst onAddQueueSlot = useCallback((queueSlot: QueueSlot) => {+ setUploadingFiles(files => files.filter(f => f.queueSlot.filename !== queueSlot.filename));setQueueSlots(slots => [...slots, queueSlot]);}, [setQueueSlots]);@@ -133,14 +135,121 @@ export default function Queue(props: Route.ComponentProps) {return connect();}, [onWebsocketMessage, disableLiveView]);+ // upload processing+ const processUploadQueue = useCallback(async () => {+ if (isUploadingRef.current || uploadQueueRef.current.length === 0) return;++ isUploadingRef.current = true;+ const fileToUpload = uploadQueueRef.current[0];++ setUploadingFiles(files => files.map(f =>+ f.queueSlot.nzo_id === fileToUpload.queueSlot.nzo_id+ ? { ...f, queueSlot: { ...f.queueSlot, status: 'uploading' } }+ : f+ ));++ try {+ const xhr = new XMLHttpRequest();+ const formData = new FormData();+ formData.append('nzbFile', fileToUpload.file, fileToUpload.file.name);++ xhr.responseType = 'json';+ xhr.upload.addEventListener('progress', (e) => {+ if (e.lengthComputable) {+ const progress = Math.round((e.loaded / e.total) * 100);+ setUploadingFiles(files => files.map(f =>+ f.queueSlot.nzo_id === fileToUpload.queueSlot.nzo_id+ ? {+ ...f,+ queueSlot: {+ ...f.queueSlot,+ percentage: progress.toString(),+ true_percentage: progress.toString()+ }+ }+ : f+ ));+ }+ });++ var response: any = await new Promise<void>((resolve, reject) => {+ xhr.addEventListener('load', () => {+ if (xhr.status >= 200 && xhr.status < 300) {+ resolve(xhr.response);+ } else {+ const errorMessage = xhr.response.error || `Upload failed with status ${xhr.status}`;+ reject(new Error(errorMessage));+ }+ });+ xhr.addEventListener('error', () => reject(new Error('Upload failed')));+ xhr.addEventListener('abort', () => reject(new Error('Upload aborted')));++ xhr.open('POST', '/api?mode=addfile&cat=uncategorized&priority=0&pp=0');+ xhr.send(formData);+ });++ if (response.status == false) {+ throw new Error(response.error);+ }++ } catch (error) {+ setUploadingFiles(files => files.map(f =>+ f.queueSlot.nzo_id === fileToUpload.queueSlot.nzo_id ? {+ ...f,+ queueSlot: {+ ...f.queueSlot,+ status: 'upload failed',+ error: error instanceof Error ? error.message : 'Upload failed'+ }+ } : f+ ));+ }++ uploadQueueRef.current = uploadQueueRef.current.filter(x => x !== fileToUpload);+ isUploadingRef.current = false;++ if (uploadQueueRef.current.length > 0) {+ processUploadQueue();+ }+ }, []);++ // trigger upload processing when files are added+ useEffect(() => {+ processUploadQueue();+ }, [uploadingFiles, processUploadQueue]);++ // dropzone+ const onDrop = useCallback((acceptedFiles: File[]) => {+ const newFiles: UploadingFile[] = acceptedFiles.map(file => ({+ file,+ queueSlot: {+ isUploading: true,+ nzo_id: `upload-${Date.now()}-${Math.random()}`,+ priority: 'Normal',+ filename: file.name,+ cat: 'uncategorized',+ percentage: "0",+ true_percentage: "0",+ status: "pending",+ mb: (file.size / (1024 * 1024)).toFixed(2),+ mbleft: (file.size / (1024 * 1024)).toFixed(2),+ }+ }));++ setUploadingFiles(files => [...files, ...newFiles]);+ uploadQueueRef.current = [...uploadQueueRef.current, ...newFiles];+ }, []);++ const dropzone = useDropzone({+ accept: { 'application/x-nzb': ['.nzb'] },+ onDrop,+ noClick: true,+ noKeyboard: true,+ });++ // viewreturn (<div className={styles.container}>- {/* error message */}- {error &&- <Alert variant="danger">- {error}- </Alert>- }{/* warning */}{disableLiveView &&@@ -164,10 +273,12 @@ export default function Queue(props: Route.ComponentProps) {}{/* queue */}- <div style={{ minHeight: '383.59px', marginBottom: '50px' }}>+ <div className={styles.dropzone} {...dropzone.getRootProps()}>+ {dropzone.isDragActive && <div className={styles.activeDropzone} />}+ <input {...dropzone.getInputProps()} /><QueueTable- queueSlots={queueSlots}- totalQueueCount={props.loaderData.totalQueueCount}+ queueSlots={combinedQueueSlots}+ totalQueueCount={props.loaderData.totalQueueCount + uploadingFiles.length}onIsSelectedChanged={onSelectQueueSlots}onIsRemovingChanged={onRemovingQueueSlots}onRemoved={onRemoveQueueSlots}@@ -188,32 +299,19 @@ export default function Queue(props: Route.ComponentProps) {);}-export async function action({ request }: Route.ActionArgs) {- // ensure user is logged in- if (!await isAuthenticated(request)) return redirect("/login");-- try {- const formData = await request.formData();- const nzbFile = formData.get("nzbFile");- if (nzbFile instanceof File) {- await backendClient.addNzb(nzbFile);- } else {- return { error: "Error uploading nzb." }- }- } catch (error) {- if (error instanceof Error) {- return { error: error.message };- }- throw error;- }-}-export type PresentationHistorySlot = HistorySlot & {isSelected?: boolean,isRemoving?: boolean,}export type PresentationQueueSlot = QueueSlot & {+ isUploading?: boolean,isSelected?: boolean,isRemoving?: boolean,+ error?: string,+}++export type UploadingFile = {+ file: File,+ queueSlot: PresentationQueueSlot,}\ No newline at end of filediff --git a/frontend/app/utils/styling.ts b/frontend/app/utils/styling.tsindex fdd6b30f..1f095ebf 100644--- a/frontend/app/utils/styling.ts+++ b/frontend/app/utils/styling.ts@@ -2,4 +2,8 @@ export function className(classNames: (string | false | null | undefined)[]) {return {className: classNames.filter(Boolean).join(' ')}+}++export function classNames(classNames: (string | false | null | undefined)[]) {+ return classNames.filter(Boolean).join(' ')}\ No newline at end of file