File rename templates & admin torrent approval

Add support for admin-driven interactive torrent selection and a file rename/template feature. Integrates an InteractiveTorrentSearchModal into the pending-approval admin UI, adds an admin approve flow that accepts an admin-selected torrent, and surfaces user/admin-selected torrent details in the UI. Introduces fileRenameEnabled and fileRenameTemplate settings (API + UI), persists them to configuration, and clears related caches. Pass renameConfig through the organize/organizeEbook flows and implement renaming in the FileOrganizer (single/multi-file handling). Enhance path-template utilities with conditional block resolution, filename-template validation, mock filename previews, and a buildRenamedFilename helper. Update tests to cover conditional templates and filename preview behavior.
2026-06-03 04:40:09 +00:00 · 2026-02-25 09:47:57 -05:00
parent 33c2265e56
commit 03f82d4841
13 changed files with 1095 additions and 108 deletions
@@ -13,17 +13,34 @@ import { ActiveDownloadsTable } from './components/ActiveDownloadsTable';
 import { RecentRequestsTable } from './components/RecentRequestsTable';
 import { ToastProvider, useToast } from '@/components/ui/Toast';
 import { ReportedIssuesSection } from './components/ReportedIssuesSection';
+import { InteractiveTorrentSearchModal } from '@/components/requests/InteractiveTorrentSearchModal';
+import { TorrentResult } from '@/lib/utils/ranking-algorithm';
 import { formatDistanceToNow } from 'date-fns';
 import { useState } from 'react';

+interface SelectedTorrentData {
+  title?: string;
+  indexer?: string;
+  size?: number;
+  format?: string;
+  ebookFormat?: string;
+  seeders?: number;
+  infoUrl?: string;
+  source?: string;
+  protocol?: string;
+  score?: number;
+}
+
 interface PendingApprovalRequest {
  id: string;
  createdAt: string;
  type: 'audiobook' | 'ebook';
+  selectedTorrent: SelectedTorrentData | null;
  audiobook: {
    title: string;
    author: string;
    coverArtUrl: string | null;
+    audibleAsin: string | null;
  };
  user: {
    id: string;
@@ -32,9 +49,20 @@ interface PendingApprovalRequest {
  };
 }

+function formatTorrentSize(bytes: number): string {
+  const gb = bytes / (1024 ** 3);
+  const mb = bytes / (1024 ** 2);
+  return gb >= 1 ? `${gb.toFixed(1)} GB` : `${mb.toFixed(0)} MB`;
+}
+
 function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest[] }) {
  const toast = useToast();
  const [loadingStates, setLoadingStates] = useState<Record<string, boolean>>({});
+  const [searchModalRequestId, setSearchModalRequestId] = useState<string | null>(null);
+
+  const searchModalRequest = searchModalRequestId
+    ? requests.find((r) => r.id === searchModalRequestId)
+    : null;

  const handleApproveRequest = async (requestId: string) => {
    setLoadingStates((prev) => ({ ...prev, [requestId]: true }));
@@ -47,7 +75,6 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest

      toast.success('Request approved');

-      // Mutate both pending requests and recent requests caches
      await mutate('/api/admin/requests/pending-approval');
      await mutate('/api/admin/requests/recent');
      await mutate('/api/admin/metrics');
@@ -72,7 +99,6 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest

      toast.success('Request denied');

-      // Mutate pending requests cache
      await mutate('/api/admin/requests/pending-approval');
      await mutate('/api/admin/metrics');
    } catch (error) {
@@ -85,6 +111,26 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest
    }
  };

+  const handleApproveWithTorrent = async (requestId: string, torrent: TorrentResult) => {
+    await fetchJSON(`/api/admin/requests/${requestId}/approve`, {
+      method: 'POST',
+      body: JSON.stringify({ action: 'approve', selectedTorrent: torrent }),
+    });
+
+    toast.success('Request approved and download started');
+
+    await mutate('/api/admin/requests/pending-approval');
+    await mutate('/api/admin/requests/recent');
+    await mutate('/api/admin/metrics');
+  };
+
+  const LoadingSpinner = () => (
+    <svg className="animate-spin h-4 w-4" fill="none" viewBox="0 0 24 24">
+      <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+      <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
+    </svg>
+  );
+
  return (
    <div className="mb-8">
      {/* Section Header */}
@@ -116,6 +162,9 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest
      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
        {requests.map((request) => {
          const isLoading = loadingStates[request.id] || false;
+          const torrent = request.selectedTorrent;
+          const displayFormat = torrent?.format || torrent?.ebookFormat;
+          const isAnnasArchive = torrent?.source === 'annas_archive';

          return (
            <div
@@ -205,89 +254,107 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest
                </div>
              </div>

+              {/* Pre-Selected Release */}
+              {torrent && torrent.title && (
+                <div className="mx-4 mb-3 px-3 py-2.5 bg-gray-50 dark:bg-gray-900/60 rounded-lg border border-gray-200 dark:border-gray-700/60">
+                  <div className="flex items-center gap-1.5 mb-1">
+                    <svg className="w-3 h-3 text-gray-400 dark:text-gray-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1" />
+                    </svg>
+                    <span className="text-[10px] font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500">
+                      User-Selected Release
+                    </span>
+                  </div>
+                  {torrent.infoUrl ? (
+                    <a
+                      href={torrent.infoUrl}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-xs font-medium text-blue-600 dark:text-blue-400 hover:text-blue-700 dark:hover:text-blue-300 transition-colors line-clamp-2 leading-snug"
+                      title={torrent.title}
+                    >
+                      {torrent.title}
+                    </a>
+                  ) : (
+                    <p className="text-xs font-medium text-gray-700 dark:text-gray-300 line-clamp-2 leading-snug" title={torrent.title}>
+                      {torrent.title}
+                    </p>
+                  )}
+                  <div className="flex items-center gap-1 mt-1.5 text-[11px] text-gray-500 dark:text-gray-400 flex-wrap">
+                    {isAnnasArchive ? (
+                      <span className="text-orange-600 dark:text-orange-400 font-medium">Anna&apos;s Archive</span>
+                    ) : torrent.indexer ? (
+                      <span>{torrent.indexer}</span>
+                    ) : null}
+                    {torrent.size && torrent.size > 0 ? (
+                      <>
+                        <span className="text-gray-300 dark:text-gray-600 select-none">&middot;</span>
+                        <span>{formatTorrentSize(torrent.size)}</span>
+                      </>
+                    ) : null}
+                    {displayFormat ? (
+                      <>
+                        <span className="text-gray-300 dark:text-gray-600 select-none">&middot;</span>
+                        <span className="px-1 py-px text-[10px] font-semibold uppercase tracking-wide rounded bg-purple-100 dark:bg-purple-500/15 text-purple-700 dark:text-purple-300">
+                          {displayFormat}
+                        </span>
+                      </>
+                    ) : null}
+                    {torrent.protocol === 'usenet' ? (
+                      <>
+                        <span className="text-gray-300 dark:text-gray-600 select-none">&middot;</span>
+                        <span className="text-sky-600 dark:text-sky-400 font-medium">NZB</span>
+                      </>
+                    ) : torrent.seeders !== undefined && torrent.seeders !== null ? (
+                      <>
+                        <span className="text-gray-300 dark:text-gray-600 select-none">&middot;</span>
+                        <span className="text-emerald-600 dark:text-emerald-400">{torrent.seeders} seeds</span>
+                      </>
+                    ) : null}
+                    {torrent.score !== undefined && torrent.score !== null ? (
+                      <>
+                        <span className="text-gray-300 dark:text-gray-600 select-none">&middot;</span>
+                        <span className="font-medium">Score {Math.round(torrent.score)}</span>
+                      </>
+                    ) : null}
+                  </div>
+                </div>
+              )}
+
              {/* Action Buttons */}
              <div className="border-t border-amber-200 dark:border-amber-800 bg-gray-50 dark:bg-gray-900/50 px-4 py-3 flex gap-2">
                <button
                  onClick={() => handleApproveRequest(request.id)}
                  disabled={isLoading}
-                  className="flex-1 inline-flex items-center justify-center gap-2 px-3 py-2 bg-green-600 hover:bg-green-700 disabled:bg-green-400 disabled:cursor-not-allowed text-white text-sm font-medium rounded-lg transition-colors"
+                  className="flex-1 inline-flex items-center justify-center gap-1.5 px-3 py-2 bg-green-600 hover:bg-green-700 disabled:bg-green-400 disabled:cursor-not-allowed text-white text-sm font-medium rounded-lg transition-colors"
                >
-                  {isLoading ? (
-                    <svg
-                      className="animate-spin h-4 w-4"
-                      fill="none"
-                      viewBox="0 0 24 24"
-                    >
-                      <circle
-                        className="opacity-25"
-                        cx="12"
-                        cy="12"
-                        r="10"
-                        stroke="currentColor"
-                        strokeWidth="4"
-                      />
-                      <path
-                        className="opacity-75"
-                        fill="currentColor"
-                        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                      />
-                    </svg>
-                  ) : (
-                    <svg
-                      className="w-4 h-4"
-                      fill="none"
-                      stroke="currentColor"
-                      viewBox="0 0 24 24"
-                    >
-                      <path
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                        strokeWidth={2}
-                        d="M5 13l4 4L19 7"
-                      />
+                  {isLoading ? <LoadingSpinner /> : (
+                    <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
                    </svg>
                  )}
                  <span>Approve</span>
                </button>

+                <button
+                  onClick={() => setSearchModalRequestId(request.id)}
+                  disabled={isLoading}
+                  className="flex-1 inline-flex items-center justify-center gap-1.5 px-3 py-2 bg-blue-600 hover:bg-blue-700 disabled:bg-blue-400 disabled:cursor-not-allowed text-white text-sm font-medium rounded-lg transition-colors"
+                >
+                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                  </svg>
+                  <span>Search</span>
+                </button>
+
                <button
                  onClick={() => handleDenyRequest(request.id)}
                  disabled={isLoading}
-                  className="flex-1 inline-flex items-center justify-center gap-2 px-3 py-2 bg-red-600 hover:bg-red-700 disabled:bg-red-400 disabled:cursor-not-allowed text-white text-sm font-medium rounded-lg transition-colors"
+                  className="flex-1 inline-flex items-center justify-center gap-1.5 px-3 py-2 bg-red-600 hover:bg-red-700 disabled:bg-red-400 disabled:cursor-not-allowed text-white text-sm font-medium rounded-lg transition-colors"
                >
-                  {isLoading ? (
-                    <svg
-                      className="animate-spin h-4 w-4"
-                      fill="none"
-                      viewBox="0 0 24 24"
-                    >
-                      <circle
-                        className="opacity-25"
-                        cx="12"
-                        cy="12"
-                        r="10"
-                        stroke="currentColor"
-                        strokeWidth="4"
-                      />
-                      <path
-                        className="opacity-75"
-                        fill="currentColor"
-                        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                      />
-                    </svg>
-                  ) : (
-                    <svg
-                      className="w-4 h-4"
-                      fill="none"
-                      stroke="currentColor"
-                      viewBox="0 0 24 24"
-                    >
-                      <path
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                        strokeWidth={2}
-                        d="M6 18L18 6M6 6l12 12"
-                      />
+                  {isLoading ? <LoadingSpinner /> : (
+                    <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
                    </svg>
                  )}
                  <span>Deny</span>
@@ -297,6 +364,26 @@ function PendingApprovalSection({ requests }: { requests: PendingApprovalRequest
          );
        })}
      </div>
+
+      {/* Interactive Search Modal */}
+      {searchModalRequest && (
+        <InteractiveTorrentSearchModal
+          isOpen={!!searchModalRequestId}
+          onClose={() => setSearchModalRequestId(null)}
+          requestId={searchModalRequest.id}
+          audiobook={{
+            title: searchModalRequest.audiobook.title,
+            author: searchModalRequest.audiobook.author,
+          }}
+          searchMode={searchModalRequest.type === 'ebook' ? 'ebook' : 'audiobook'}
+          onConfirm={async (torrent) => {
+            await handleApproveWithTorrent(searchModalRequest.id, torrent);
+          }}
+          onSuccess={() => {
+            setSearchModalRequestId(null);
+          }}
+        />
+      )}
    </div>
  );
 }
@@ -100,6 +100,8 @@ export interface PathsSettings {
  ebookPathTemplate?: string;
  metadataTaggingEnabled: boolean;
  chapterMergingEnabled: boolean;
+  fileRenameEnabled: boolean;
+  fileRenameTemplate?: string;
 }

 /**
@@ -10,7 +10,7 @@ import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { usePathsSettings } from './usePathsSettings';
 import type { PathsSettings } from '../../lib/types';
-import { validateTemplate, generateMockPreviews } from '@/lib/utils/path-template.util';
+import { validateTemplate, generateMockPreviews, validateFilenameTemplate, generateMockFilenamePreviews } from '@/lib/utils/path-template.util';

 interface PathsTabProps {
  paths: PathsSettings;
@@ -24,6 +24,13 @@ interface TemplatePreview {
  previewPaths?: string[];
 }

+interface FilenamePreview {
+  isValid: boolean;
+  error?: string;
+  single?: string[];
+  multi?: string[];
+}
+
 export function PathsTab({ paths, onChange, onValidationChange }: PathsTabProps) {
  const { testing, testResult, updatePath, testPaths } = usePathsSettings({
    paths,
@@ -73,6 +80,34 @@ export function PathsTab({ paths, onChange, onValidationChange }: PathsTabProps)
    }
  }, [paths.ebookPathTemplate]);

+  // Live preview state for filename template
+  const [filenamePreview, setFilenamePreview] = useState<FilenamePreview | null>(null);
+
+  // Update filename live preview whenever template changes
+  useEffect(() => {
+    if (!paths.fileRenameEnabled) {
+      setFilenamePreview(null);
+      return;
+    }
+
+    const template = paths.fileRenameTemplate || '{title}';
+    const validation = validateFilenameTemplate(template);
+
+    if (validation.valid) {
+      const previews = generateMockFilenamePreviews(template);
+      setFilenamePreview({
+        isValid: true,
+        single: previews.single,
+        multi: previews.multi,
+      });
+    } else {
+      setFilenamePreview({
+        isValid: false,
+        error: validation.error,
+      });
+    }
+  }, [paths.fileRenameTemplate, paths.fileRenameEnabled]);
+
  const audiobookTemplate = paths.audiobookPathTemplate || '{author}/{title} {asin}';
  const ebookTemplate = paths.ebookPathTemplate || '{author}/{title} {asin}';
  const ebookMatchesAudiobook = ebookTemplate === audiobookTemplate;
@@ -218,6 +253,83 @@ export function PathsTab({ paths, onChange, onValidationChange }: PathsTabProps)
        )}
      </div>

+      {/* File Rename Toggle */}
+      <div className="bg-gray-50 dark:bg-gray-800 rounded-lg p-4 border border-gray-200 dark:border-gray-700">
+        <div className="flex items-start gap-4">
+          <input
+            type="checkbox"
+            id="file-rename-settings"
+            checked={paths.fileRenameEnabled}
+            onChange={(e) => updatePath('fileRenameEnabled', e.target.checked)}
+            className="mt-1 h-5 w-5 rounded border-gray-300 text-blue-600 focus:ring-blue-500"
+          />
+          <div className="flex-1">
+            <label
+              htmlFor="file-rename-settings"
+              className="block text-sm font-medium text-gray-900 dark:text-gray-100 cursor-pointer"
+            >
+              Rename files during organization
+            </label>
+            <p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
+              Rename audio and ebook files using a custom naming template when organizing into the media
+              library. When multiple files exist (e.g. chapterized MP3s), an index number is appended.
+            </p>
+          </div>
+        </div>
+
+        {/* File Naming Template (shown when enabled) */}
+        {paths.fileRenameEnabled && (
+          <div className="mt-4 pl-9">
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              File Naming Template
+            </label>
+            <Input
+              type="text"
+              value={paths.fileRenameTemplate || '{title}'}
+              onChange={(e) => updatePath('fileRenameTemplate', e.target.value)}
+              placeholder="{title}"
+              className="font-mono"
+            />
+            <p className="text-sm text-gray-500 dark:text-gray-400 mt-1">
+              Uses the same variables as the organization template. Do not include the file extension.
+            </p>
+
+            {/* Filename Validation Error */}
+            {filenamePreview && !filenamePreview.isValid && (
+              <div className="mt-3 p-3 rounded-lg text-sm flex items-start gap-2 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 text-red-800 dark:text-red-200">
+                <span className="flex-shrink-0 mt-0.5">✗</span>
+                <div className="flex-1">
+                  <span>{filenamePreview.error || 'Invalid filename template'}</span>
+                </div>
+              </div>
+            )}
+
+            {/* Filename Preview */}
+            {filenamePreview && filenamePreview.isValid && (
+              <div className="mt-3 bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg p-4">
+                <h4 className="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-2">
+                  Single File
+                </h4>
+                <div className="space-y-1.5 text-sm font-mono text-gray-700 dark:text-gray-300">
+                  {filenamePreview.single?.map((preview, index) => (
+                    <div key={index} className="text-xs">{preview}</div>
+                  ))}
+                </div>
+
+                <h4 className="text-sm font-semibold text-gray-900 dark:text-gray-100 mt-3 mb-2">
+                  Multiple Files (chapterized)
+                </h4>
+                <div className="space-y-1.5 text-sm font-mono text-gray-700 dark:text-gray-300">
+                  {filenamePreview.multi?.map((preview, index) => (
+                    <div key={index} className="text-xs">{preview}</div>
+                  ))}
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+
      {/* Variable Reference Panel (shared for both templates) */}
      <div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4">
        <h3 className="text-sm font-semibold text-blue-900 dark:text-blue-100 mb-3">
@@ -255,6 +367,27 @@ export function PathsTab({ paths, onChange, onValidationChange }: PathsTabProps)
        </div>
      </div>

+      {/* Conditional Syntax Help */}
+      <div className="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-lg p-4">
+        <h3 className="text-sm font-semibold text-amber-900 dark:text-amber-100 mb-2">
+          Conditional Syntax
+        </h3>
+        <p className="text-sm text-gray-600 dark:text-gray-400 mb-2">
+          Wrap text around a variable in <code className="text-amber-700 dark:text-amber-300 font-mono">{'{ }'}</code> to
+          include that text only when the variable has a value. If the variable is empty, the entire block is removed.
+        </p>
+        <div className="text-sm font-mono bg-white dark:bg-gray-900 rounded px-3 py-2 border border-amber-100 dark:border-amber-900">
+          <div className="text-gray-700 dark:text-gray-300">
+            <code className="text-amber-700 dark:text-amber-300">{'{Book seriesPart - }'}</code>
+          </div>
+          <div className="text-xs text-gray-500 dark:text-gray-400 mt-1">
+            With value: <span className="text-green-700 dark:text-green-400">Book 1 - </span>
+            &nbsp;&bull;&nbsp;
+            Without value: <span className="text-red-700 dark:text-red-400">(removed)</span>
+          </div>
+        </div>
+      </div>
+
      {/* Metadata Tagging Toggle */}
      <div className="bg-gray-50 dark:bg-gray-800 rounded-lg p-4 border border-gray-200 dark:border-gray-700">
        <div className="flex items-start gap-4">
@@ -14,6 +14,7 @@ const logger = RMABLogger.create('API.Admin.Requests.Approve');

 const ApprovalActionSchema = z.object({
  action: z.enum(['approve', 'deny']),
+  selectedTorrent: z.any().optional(),
 });

 /**
@@ -37,8 +38,8 @@ export async function POST(
        const { id } = await params;
        const body = await request.json();

-        // Validate action
-        const { action } = ApprovalActionSchema.parse(body);
+        // Validate action and optional admin-selected torrent
+        const { action, selectedTorrent: adminSelectedTorrent } = ApprovalActionSchema.parse(body);

        // Fetch the request
        const existingRequest = await prisma.request.findUnique({
@@ -78,12 +79,15 @@ export async function POST(
          const jobQueue = getJobQueueService();
          const isEbookRequest = existingRequest.type === 'ebook';

-          // Check if request has a pre-selected torrent (from interactive search)
-          if (existingRequest.selectedTorrent) {
-            const selectedTorrent = existingRequest.selectedTorrent as any;
+          // Use admin-provided torrent (from admin interactive search) or fall back to user's pre-selected torrent
+          const effectiveTorrent = adminSelectedTorrent || existingRequest.selectedTorrent;

-            // User pre-selected a specific torrent - download that torrent directly
-            logger.info(`Request ${id} has pre-selected torrent, starting download`, {
+          if (effectiveTorrent) {
+            const selectedTorrent = effectiveTorrent as any;
+            const torrentSource = adminSelectedTorrent ? 'admin' : 'user';
+
+            // Download the selected torrent directly
+            logger.info(`Request ${id} has ${torrentSource}-selected torrent, starting download`, {
              requestId: id,
              userId: existingRequest.userId,
              adminId: req.user.sub,
@@ -167,17 +171,20 @@ export async function POST(
              logger.error('Failed to queue notification', { error: error instanceof Error ? error.message : String(error) });
            });

-            logger.info(`Request ${id} approved by admin ${req.user.sub}, downloading pre-selected torrent`, {
+            logger.info(`Request ${id} approved by admin ${req.user.sub}, downloading ${torrentSource}-selected torrent`, {
              requestId: id,
              userId: updatedRequest.userId,
              audiobookTitle: existingRequest.audiobook.title,
              adminId: req.user.sub,
              type: existingRequest.type,
+              torrentSource,
            });

            return NextResponse.json({
              success: true,
-              message: 'Request approved and download started with pre-selected torrent',
+              message: adminSelectedTorrent
+                ? 'Request approved and download started with admin-selected torrent'
+                : 'Request approved and download started with pre-selected torrent',
              request: updatedRequest,
            });
          } else {
@@ -15,7 +15,7 @@ export async function PUT(request: NextRequest) {
  return requireAuth(request, async (req: AuthenticatedRequest) => {
    return requireAdmin(req, async () => {
      try {
-        const { downloadDir, mediaDir, audiobookPathTemplate, ebookPathTemplate, metadataTaggingEnabled, chapterMergingEnabled } = await request.json();
+        const { downloadDir, mediaDir, audiobookPathTemplate, ebookPathTemplate, metadataTaggingEnabled, chapterMergingEnabled, fileRenameEnabled, fileRenameTemplate } = await request.json();

        if (!downloadDir || !mediaDir) {
          return NextResponse.json(
@@ -97,6 +97,32 @@ export async function PUT(request: NextRequest) {
          },
        });

+        // Update file rename setting
+        await prisma.configuration.upsert({
+          where: { key: 'file_rename_enabled' },
+          update: { value: String(fileRenameEnabled ?? false) },
+          create: {
+            key: 'file_rename_enabled',
+            value: String(fileRenameEnabled ?? false),
+            category: 'automation',
+            description: 'Rename audio and ebook files using a custom naming template during organization',
+          },
+        });
+
+        // Update file rename template
+        if (fileRenameTemplate !== undefined) {
+          await prisma.configuration.upsert({
+            where: { key: 'file_rename_template' },
+            update: { value: fileRenameTemplate },
+            create: {
+              key: 'file_rename_template',
+              value: fileRenameTemplate,
+              category: 'automation',
+              description: 'Template for renaming audio and ebook files during organization',
+            },
+          });
+        }
+
        logger.info('Paths settings updated');

        // Clear config cache for all updated keys so services get fresh values
@@ -107,6 +133,8 @@ export async function PUT(request: NextRequest) {
        configService.clearCache('ebook_path_template');
        configService.clearCache('metadata_tagging_enabled');
        configService.clearCache('chapter_merging_enabled');
+        configService.clearCache('file_rename_enabled');
+        configService.clearCache('file_rename_template');

        // Invalidate all download client singletons to force reload of download_dir
        const { invalidateDownloadClientManager } = await import('@/lib/services/download-client-manager.service');
@@ -128,6 +128,8 @@ export async function GET(request: NextRequest) {
        ebookPathTemplate: configMap.get('ebook_path_template') || configMap.get('audiobook_path_template') || '{author}/{title} {asin}',
        metadataTaggingEnabled: configMap.get('metadata_tagging_enabled') === 'true',
        chapterMergingEnabled: configMap.get('chapter_merging_enabled') === 'true',
+        fileRenameEnabled: configMap.get('file_rename_enabled') === 'true',
+        fileRenameTemplate: configMap.get('file_rename_template') || '{title}',
      },
      ebook: {
        // New granular source toggles (with migration from legacy ebook_sidecar_enabled)
@@ -67,8 +67,8 @@ export async function POST(
        );
      }

-      // Check if request is awaiting approval
-      if (requestRecord.status === 'awaiting_approval') {
+      // Check if request is awaiting approval (admins can still search to override the user's selection)
+      if (requestRecord.status === 'awaiting_approval' && req.user.role !== 'admin') {
        return NextResponse.json(
          { error: 'AwaitingApproval', message: 'This request is awaiting admin approval. You cannot search for torrents until it is approved.' },
          { status: 403 }