diff --git a/server/index.ts b/server/index.ts index b7aa688..bfbb914 100644 --- a/server/index.ts +++ b/server/index.ts @@ -234,7 +234,35 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse): if (url.pathname === '/api/calendar' && method === 'GET') { const config = await readConfig(session!.encryptionKey); - sendJson(response, 200, await getCalendar(config)); + const startParam = url.searchParams.get('start'); + const endParam = url.searchParams.get('end'); + + let start = new Date(); + start.setDate(1); + start.setHours(0, 0, 0, 0); + + let end = new Date(start); + end.setMonth(end.getMonth() + 1); + end.setDate(0); + end.setHours(23, 59, 59, 999); + + if (startParam) { + try { + start = new Date(startParam); + } catch (e) { + // ignore invalid date + } + } + + if (endParam) { + try { + end = new Date(endParam); + } catch (e) { + // ignore invalid date + } + } + + sendJson(response, 200, await getCalendar(config, start, end)); return; } diff --git a/server/lib/services.ts b/server/lib/services.ts index dc0c01c..9b29bd3 100644 --- a/server/lib/services.ts +++ b/server/lib/services.ts @@ -523,9 +523,7 @@ export async function getDownloads(config: AppConfig): Promise { return downloads.sort((a, b) => b.progress - a.progress); } -export async function getCalendar(config: AppConfig): Promise { - const start = startOfToday() - const end = addDays(start, 30) +export async function getCalendar(config: AppConfig, start: Date, end: Date): Promise { const [sonarrResult, radarrResult] = await Promise.allSettled([ getSonarrCalendar(config, start, end), @@ -3196,7 +3194,7 @@ async function getSonarrCalendar(config: AppConfig, start: Date, end: Date): Pro } return fetchJson( - `${config.sonarr.baseUrl}/api/v3/calendar?includeSeries=true&start=${encodeURIComponent(start.toISOString())}&end=${encodeURIComponent(end.toISOString())}`, + `${config.sonarr.baseUrl}/api/v3/calendar?includeSeries=true&unmonitored=true&start=${encodeURIComponent(start.toISOString())}&end=${encodeURIComponent(end.toISOString())}`, { headers: { 'X-Api-Key': config.sonarr.apiKey @@ -3211,7 +3209,7 @@ async function getRadarrCalendar(config: AppConfig, start: Date, end: Date): Pro } return fetchJson( - `${config.radarr.baseUrl}/api/v3/calendar?start=${encodeURIComponent(start.toISOString())}&end=${encodeURIComponent(end.toISOString())}`, + `${config.radarr.baseUrl}/api/v3/calendar?unmonitored=true&start=${encodeURIComponent(start.toISOString())}&end=${encodeURIComponent(end.toISOString())}`, { headers: { 'X-Api-Key': config.radarr.apiKey diff --git a/src/App.tsx b/src/App.tsx index 5bc45a1..cda9978 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -84,8 +84,7 @@ function App() { const [connections, setConnections] = useState([]) const [hubPages, setHubPages] = useState>>({}) const [hubLoading, setHubLoading] = useState(false) - const [calendarItems, setCalendarItems] = useState([]) - const [calendarLoading, setCalendarLoading] = useState(false) + const [searchQuery, setSearchQuery] = useState('') const [searchResults, setSearchResults] = useState([]) const [searchLoading, setSearchLoading] = useState(false) @@ -146,21 +145,7 @@ function App() { } } - async function loadCalendar(options?: { silent?: boolean }) { - if (!options?.silent) { - setCalendarLoading(true) - } - try { - const calendar = await api.getCalendar() - setCalendarItems(calendar.items) - } catch (loadError) { - setError(loadError instanceof Error ? loadError.message : 'Failed to load the calendar.') - } finally { - if (!options?.silent) { - setCalendarLoading(false) - } - } - } + useEffect(() => { let cancelled = false @@ -230,13 +215,7 @@ function App() { } }, [authState, entryStage, route]) - useEffect(() => { - if (authState !== 'app' || entryStage !== 'dashboard' || route !== 'calendar') { - return - } - void loadCalendar() - }, [authState, entryStage, route]) useEffect(() => { if (authState !== 'app' || entryStage !== 'dashboard') { @@ -245,9 +224,7 @@ function App() { const interval = window.setInterval(() => { void refreshBaseData() - if (route === 'calendar') { - void loadCalendar({ silent: true }) - } else if (route !== 'downloads' && route !== 'settings' && route !== 'search') { + if (route !== 'downloads' && route !== 'settings' && route !== 'search' && route !== 'calendar') { void loadHub(route as HubPageResponse['page'], { silent: true }) } }, 30000) @@ -484,7 +461,7 @@ function App() { {error ?

{error}

: null} - {route === 'calendar' ? setSelectedCard({ card, originRect: originRect ?? null })} /> : null} + {route === 'calendar' ? setSelectedCard({ card, originRect: originRect ?? null })} /> : null} {route === 'downloads' ? : null} {route === 'search' ? (