0.12.0-19 Final Build
Deploy Docs to GitHub Pages / Build Documentation (push) Has been cancelled
Deploy Docs to GitHub Pages / Deploy to GitHub Pages (push) Has been cancelled

This commit is contained in:
michael committed 2026-04-07 19:12:40 +00:00
1 parent ccad7ec9f4
commit 43702b0138
39 files changed
+2829 -460

No files matched your search

+44 -28
View File
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import { Outlet, Routes, Route, useLocation, useNavigate } from 'react-router-dom';
import { Navigate, Outlet, Routes, Route, useLocation, useNavigate } from 'react-router-dom';
import { Button } from 'primereact/button';
import { ProgressBar } from 'primereact/progressbar';
import { Tag } from 'primereact/tag';
@@ -7,12 +7,14 @@ import { Toast } from 'primereact/toast';
import { ConfirmDialog } from 'primereact/confirmdialog';
import { api } from './api/client';
import { useWebSocket } from './hooks/useWebSocket';
import DashboardPage from './pages/DashboardPage';
import RipperPage from './pages/RipperPage';
import SettingsPage from './pages/SettingsPage';
import HistoryPage from './pages/HistoryPage';
import DatabasePage from './pages/DatabasePage';
import DownloadsPage from './pages/DownloadsPage';
import ConverterPage from './pages/ConverterPage';
import JobsInboxPage from './pages/JobsInboxPage';
import AudiobooksPage from './pages/AudiobooksPage';
function normalizeJobId(value) {
const parsed = Number(value);
@@ -123,11 +125,11 @@ function App() {
const [lastDiscEvent, setLastDiscEvent] = useState(null);
const [expertMode, setExpertMode] = useState(false);
const [audiobookUpload, setAudiobookUpload] = useState(() => createInitialAudiobookUploadState());
const [dashboardJobsRefreshToken, setDashboardJobsRefreshToken] = useState(0);
const [ripperJobsRefreshToken, setRipperJobsRefreshToken] = useState(0);
const [historyJobsRefreshToken, setHistoryJobsRefreshToken] = useState(0);
const [downloadsRefreshToken, setDownloadsRefreshToken] = useState(0);
const [downloadSummary, setDownloadSummary] = useState(null);
const [pendingDashboardJobId, setPendingDashboardJobId] = useState(null);
const [pendingRipperJobId, setPendingRipperJobId] = useState(null);
const location = useLocation();
const navigate = useNavigate();
const globalToastRef = useRef(null);
@@ -135,7 +137,7 @@ function App() {
// When a virtual CD drive is removed (CD encode/rip finished or failed),
// or when a CD drive transitions away from an active job, force both
// Dashboard and History to re-fetch so jobs leave the live list reliably.
// Ripper and History to re-fetch so jobs leave the live list reliably.
useEffect(() => {
const current = pipeline?.cdDrives || {};
const prev = prevCdDrivesRef.current;
@@ -167,7 +169,7 @@ function App() {
}
if (shouldRefresh) {
setDashboardJobsRefreshToken((t) => t + 1);
setRipperJobsRefreshToken((t) => t + 1);
setHistoryJobsRefreshToken((t) => t + 1);
}
prevCdDrivesRef.current = current;
@@ -235,10 +237,10 @@ function App() {
const uploadedJobId = normalizeJobId(response?.result?.jobId);
await refreshPipeline().catch(() => null);
setDashboardJobsRefreshToken((prev) => prev + 1);
setRipperJobsRefreshToken((prev) => prev + 1);
setHistoryJobsRefreshToken((prev) => prev + 1);
if (uploadedJobId) {
setPendingDashboardJobId(uploadedJobId);
setPendingRipperJobId(uploadedJobId);
}
setAudiobookUpload((prev) => ({
@@ -268,12 +270,12 @@ function App() {
}
};
const handleDashboardJobFocusConsumed = (jobId) => {
const handleRipperJobFocusConsumed = (jobId) => {
const normalizedJobId = normalizeJobId(jobId);
if (!normalizedJobId) {
return;
}
setPendingDashboardJobId((prev) => (
setPendingRipperJobId((prev) => (
normalizeJobId(prev) === normalizedJobId ? null : prev
));
};
@@ -525,8 +527,10 @@ function App() {
});
const nav = [
{ label: 'Dashboard', path: '/' },
{ label: 'Jobs', path: '/jobs' },
{ label: 'Ripper', path: '/ripper' },
{ label: 'Converter', path: '/converter' },
{ label: 'Audiobooks', path: '/audiobooks' },
{ label: 'Settings', path: '/settings' },
{ label: 'Historie', path: '/history' },
{ label: 'Downloads', path: '/downloads' },
@@ -543,8 +547,14 @@ function App() {
: (uploadLoadedBytes > 0 ? `${formatBytes(uploadLoadedBytes)} hochgeladen` : null);
const canDismissUploadBanner = uploadPhase === 'completed' || uploadPhase === 'error';
const hasUploadedJob = Boolean(normalizeJobId(audiobookUpload?.jobId));
const isDashboardRoute = location.pathname === '/';
const isAudiobooksRoute = location.pathname === '/audiobooks';
const downloadIndicator = getDownloadIndicatorMeta(downloadSummary);
const isNavActive = (path) => {
if (path === '/ripper') {
return location.pathname === '/' || location.pathname === '/ripper';
}
return location.pathname === path;
};
return (
<div className="app-shell">
@@ -570,8 +580,8 @@ function App() {
key={item.path}
label={item.label}
onClick={() => navigate(item.path)}
className={location.pathname === item.path ? 'nav-btn nav-btn-active' : 'nav-btn'}
outlined={location.pathname !== item.path}
className={isNavActive(item.path) ? 'nav-btn nav-btn-active' : 'nav-btn'}
outlined={!isNavActive(item.path)}
/>
))}
</div>
@@ -603,18 +613,14 @@ function App() {
</div>
<div className="app-upload-banner-actions">
{hasUploadedJob && !isDashboardRoute ? (
{hasUploadedJob && !isAudiobooksRoute ? (
<Button
label="Zum Dashboard"
label="Zu Audiobooks"
icon="pi pi-arrow-right"
severity="secondary"
outlined
onClick={() => {
const targetJobId = normalizeJobId(audiobookUpload?.jobId);
if (targetJobId) {
setPendingDashboardJobId(targetJobId);
}
navigate('/');
navigate('/audiobooks');
}}
/>
) : null}
@@ -637,27 +643,37 @@ function App() {
<Route
path="/"
element={
<DashboardPage
<RipperPage
pipeline={pipeline}
hardwareMonitoring={hardwareMonitoring}
lastDiscEvent={lastDiscEvent}
refreshPipeline={refreshPipeline}
audiobookUpload={audiobookUpload}
onAudiobookUpload={handleAudiobookUpload}
jobsRefreshToken={dashboardJobsRefreshToken}
pendingExpandedJobId={pendingDashboardJobId}
onPendingExpandedJobHandled={handleDashboardJobFocusConsumed}
jobsRefreshToken={ripperJobsRefreshToken}
pendingExpandedJobId={pendingRipperJobId}
onPendingExpandedJobHandled={handleRipperJobFocusConsumed}
downloadSummary={downloadSummary}
>
<Outlet />
</DashboardPage>
</RipperPage>
}
>
<Route index element={<Navigate to="jobs" replace />} />
<Route path="ripper" element={null} />
<Route path="settings" element={<SettingsPage />} />
<Route path="history" element={<HistoryPage refreshToken={historyJobsRefreshToken} />} />
<Route path="downloads" element={<DownloadsPage refreshToken={downloadsRefreshToken} />} />
<Route path="database" element={<DatabasePage />} />
<Route path="jobs" element={<JobsInboxPage />} />
<Route path="converter" element={<ConverterPage />} />
<Route
path="audiobooks"
element={
<AudiobooksPage
audiobookUpload={audiobookUpload}
onAudiobookUpload={handleAudiobookUpload}
/>
}
/>
</Route>
</Routes>
</main>