Refactor: Deduplicate download assembly logic into DownloadBuilder service
- Created server/services/DownloadBuilder.js with buildUserDownloads function - Added private helpers: buildSeriesMapFromRecords, buildMoviesMapFromRecords, matchSabSlots, matchSabHistory, matchTorrents, getSlotStatusAndSpeed - Updated server/routes/dashboard.js to use buildUserDownloads in /user-downloads and SSE /stream - Removed ~500 lines of duplicated download-assembly logic - All unit tests passing (DownloadBuilder: 14, DownloadAssembler: 73, TagMatcher: 26)
This commit is contained in:
+50
-684
@@ -12,6 +12,7 @@ const downloadClientRegistry = require('../utils/downloadClients');
|
|||||||
const sanitizeError = require('../utils/sanitizeError');
|
const sanitizeError = require('../utils/sanitizeError');
|
||||||
const TagMatcher = require('../services/TagMatcher');
|
const TagMatcher = require('../services/TagMatcher');
|
||||||
const DownloadAssembler = require('../services/DownloadAssembler');
|
const DownloadAssembler = require('../services/DownloadAssembler');
|
||||||
|
const { buildUserDownloads } = require('../services/DownloadBuilder');
|
||||||
|
|
||||||
|
|
||||||
// Track active dashboard clients.
|
// Track active dashboard clients.
|
||||||
@@ -77,8 +78,6 @@ router.get('/user-downloads', requireAuth, async (req, res) => {
|
|||||||
const radarrTags = { data: radarrTagsData };
|
const radarrTags = { data: radarrTagsData };
|
||||||
|
|
||||||
// Build series/movie maps from embedded objects in queue records
|
// Build series/movie maps from embedded objects in queue records
|
||||||
// (history is fetched without includeSeries/includeMovie for speed;
|
|
||||||
// history matches fall back to the queue-built map via seriesId/movieId)
|
|
||||||
const seriesMap = new Map();
|
const seriesMap = new Map();
|
||||||
for (const r of sonarrQueue.data.records) {
|
for (const r of sonarrQueue.data.records) {
|
||||||
if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
|
if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
|
||||||
@@ -101,423 +100,30 @@ router.get('/user-downloads', requireAuth, async (req, res) => {
|
|||||||
// When showing all downloads, fetch full Emby user list to classify tags
|
// When showing all downloads, fetch full Emby user list to classify tags
|
||||||
const embyUserMap = showAll ? await TagMatcher.getEmbyUsers() : new Map();
|
const embyUserMap = showAll ? await TagMatcher.getEmbyUsers() : new Map();
|
||||||
|
|
||||||
console.log(`[Dashboard] Cache data - Series: ${seriesMap.size}, Movies: ${moviesMap.size}, qBit: ${qbittorrentTorrents.length}`);
|
// Build downloads using the centralized DownloadBuilder service
|
||||||
|
const cacheSnapshot = {
|
||||||
// Match SABnzbd downloads to Sonarr/Radarr activity
|
sabnzbdQueue,
|
||||||
const userDownloads = [];
|
sabnzbdHistory,
|
||||||
|
sonarrQueue,
|
||||||
// Process SABnzbd queue
|
sonarrHistory,
|
||||||
const queueStatus = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.status : null;
|
radarrQueue,
|
||||||
const queueSpeed = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.speed : null;
|
radarrHistory,
|
||||||
const queueKbpersec = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.kbpersec : null;
|
qbittorrentTorrents
|
||||||
console.log(`[Dashboard] Queue status: ${queueStatus}, speed: ${queueSpeed}, kbpersec: ${queueKbpersec}`);
|
};
|
||||||
|
const userDownloads = await buildUserDownloads(cacheSnapshot, {
|
||||||
// Helper to determine status and speed
|
username,
|
||||||
function getSlotStatusAndSpeed(slot) {
|
usernameSanitized,
|
||||||
// If whole queue is paused, everything is paused with 0 speed
|
isAdmin,
|
||||||
if (queueStatus === 'Paused') {
|
showAll,
|
||||||
return { status: 'Paused', speed: '0' };
|
seriesMap,
|
||||||
}
|
moviesMap,
|
||||||
// Use slot's actual status and queue speed
|
sonarrTagMap,
|
||||||
return {
|
radarrTagMap,
|
||||||
status: slot.status || 'Unknown',
|
embyUserMap
|
||||||
speed: queueSpeed || queueKbpersec || '0'
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sabnzbdQueue.data.queue && sabnzbdQueue.data.queue.slots) {
|
|
||||||
for (const slot of sabnzbdQueue.data.queue.slots) {
|
|
||||||
try {
|
|
||||||
const nzbName = slot.filename || slot.nzbname;
|
|
||||||
if (!nzbName) {
|
|
||||||
console.log(`[Dashboard] Skipping slot with no filename/nzbname`);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const slotState = getSlotStatusAndSpeed(slot);
|
|
||||||
console.log(`[Dashboard] Slot ${nzbName}: status=${slotState.status}, speed=${slotState.speed}`);
|
|
||||||
const nzbNameLower = nzbName.toLowerCase();
|
|
||||||
|
|
||||||
// Try to match with Sonarr
|
|
||||||
const sonarrMatch = sonarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
const dlObj = {
|
|
||||||
type: 'series',
|
|
||||||
title: nzbName,
|
|
||||||
coverArt: DownloadAssembler.getCoverArt(series),
|
|
||||||
status: slotState.status,
|
|
||||||
progress: slot.percentage,
|
|
||||||
mb: slot.mb,
|
|
||||||
mbmissing: slot.mbmissing,
|
|
||||||
size: slot.size,
|
|
||||||
speed: slotState.speed,
|
|
||||||
eta: slot.timeleft,
|
|
||||||
seriesName: series.title,
|
|
||||||
episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrQueue.data.records),
|
|
||||||
allTags,
|
|
||||||
matchedUserTag: matchedUserTag || null,
|
|
||||||
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
|
||||||
};
|
|
||||||
const issues = DownloadAssembler.getImportIssues(sonarrMatch);
|
|
||||||
if (issues) dlObj.importIssues = issues;
|
|
||||||
if (isAdmin) {
|
|
||||||
dlObj.downloadPath = slot.storage || null;
|
|
||||||
dlObj.targetPath = series.path || null;
|
|
||||||
dlObj.arrLink = DownloadAssembler.getSonarrLink(series);
|
|
||||||
dlObj.arrQueueId = sonarrMatch.id;
|
|
||||||
dlObj.arrType = 'sonarr';
|
|
||||||
dlObj.arrInstanceUrl = sonarrMatch._instanceUrl || null;
|
|
||||||
dlObj.arrInstanceKey = sonarrMatch._instanceKey || null;
|
|
||||||
dlObj.arrContentId = sonarrMatch.episodeId || null;
|
|
||||||
dlObj.arrContentType = 'episode';
|
|
||||||
}
|
|
||||||
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to match with Radarr
|
|
||||||
const radarrMatch = radarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
const dlObj = {
|
|
||||||
type: 'movie',
|
|
||||||
title: nzbName,
|
|
||||||
coverArt: DownloadAssembler.getCoverArt(movie),
|
|
||||||
status: slotState.status,
|
|
||||||
progress: slot.percentage,
|
|
||||||
mb: slot.mb,
|
|
||||||
mbmissing: slot.mbmissing,
|
|
||||||
size: slot.size,
|
|
||||||
speed: slotState.speed,
|
|
||||||
eta: slot.timeleft,
|
|
||||||
movieName: movie.title,
|
|
||||||
movieInfo: radarrMatch,
|
|
||||||
allTags,
|
|
||||||
matchedUserTag: matchedUserTag || null,
|
|
||||||
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
|
||||||
};
|
|
||||||
const issues = DownloadAssembler.getImportIssues(radarrMatch);
|
|
||||||
if (issues) dlObj.importIssues = issues;
|
|
||||||
if (isAdmin) {
|
|
||||||
dlObj.downloadPath = slot.storage || null;
|
|
||||||
dlObj.targetPath = movie.path || null;
|
|
||||||
dlObj.arrLink = DownloadAssembler.getRadarrLink(movie);
|
|
||||||
dlObj.arrQueueId = radarrMatch.id;
|
|
||||||
dlObj.arrType = 'radarr';
|
|
||||||
dlObj.arrInstanceUrl = radarrMatch._instanceUrl || null;
|
|
||||||
dlObj.arrInstanceKey = radarrMatch._instanceKey || null;
|
|
||||||
dlObj.arrContentId = radarrMatch.movieId || null;
|
|
||||||
dlObj.arrContentType = 'movie';
|
|
||||||
}
|
|
||||||
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(`[Dashboard] Error processing slot:`, err.message);
|
|
||||||
console.error(`[Dashboard] Slot data:`, JSON.stringify(slot));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process SABnzbd history
|
|
||||||
if (sabnzbdHistory.data.history && sabnzbdHistory.data.history.slots) {
|
|
||||||
for (const slot of sabnzbdHistory.data.history.slots) {
|
|
||||||
try {
|
|
||||||
const nzbName = slot.name || slot.nzb_name || slot.nzbname;
|
|
||||||
if (!nzbName) {
|
|
||||||
console.log(`[Dashboard] Skipping history slot with no name/nzb_name/nzbname`);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const nzbNameLower = nzbName.toLowerCase();
|
|
||||||
|
|
||||||
// Try to match with Sonarr history
|
|
||||||
const sonarrMatch = sonarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
const dlObj = {
|
|
||||||
type: 'series',
|
|
||||||
title: nzbName,
|
|
||||||
coverArt: DownloadAssembler.getCoverArt(series),
|
|
||||||
status: slot.status,
|
|
||||||
size: slot.size,
|
|
||||||
completedAt: slot.completed_time,
|
|
||||||
seriesName: series.title,
|
|
||||||
episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrHistory.data.records),
|
|
||||||
allTags,
|
|
||||||
matchedUserTag: matchedUserTag || null,
|
|
||||||
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
|
||||||
};
|
|
||||||
if (isAdmin) {
|
|
||||||
dlObj.downloadPath = slot.storage || null;
|
|
||||||
dlObj.targetPath = series.path || null;
|
|
||||||
dlObj.arrLink = DownloadAssembler.getSonarrLink(series);
|
|
||||||
}
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to match with Radarr history
|
|
||||||
const radarrMatch = radarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
const dlObj = {
|
|
||||||
type: 'movie',
|
|
||||||
title: nzbName,
|
|
||||||
coverArt: DownloadAssembler.getCoverArt(movie),
|
|
||||||
status: slot.status,
|
|
||||||
size: slot.size,
|
|
||||||
completedAt: slot.completed_time,
|
|
||||||
movieName: movie.title,
|
|
||||||
movieInfo: radarrMatch,
|
|
||||||
allTags,
|
|
||||||
matchedUserTag: matchedUserTag || null,
|
|
||||||
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
|
||||||
};
|
|
||||||
if (isAdmin) {
|
|
||||||
dlObj.downloadPath = slot.storage || null;
|
|
||||||
dlObj.targetPath = movie.path || null;
|
|
||||||
dlObj.arrLink = DownloadAssembler.getRadarrLink(movie);
|
|
||||||
}
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(`[Dashboard] Error processing history slot:`, err.message);
|
|
||||||
console.error(`[Dashboard] History slot data:`, JSON.stringify(slot));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Debug: show what queue records look like and which movies/series are tagged for this user
|
|
||||||
console.log(`[Dashboard] Sonarr queue titles:`, sonarrQueue.data.records.map(r => ({ title: r.title, seriesId: r.seriesId })));
|
|
||||||
console.log(`[Dashboard] Radarr queue titles:`, radarrQueue.data.records.map(r => ({ title: r.title, movieId: r.movieId })));
|
|
||||||
console.log(`[Dashboard] Sonarr history titles:`, sonarrHistory.data.records.slice(0, 10).map(r => ({ title: r.title, seriesId: r.seriesId })));
|
|
||||||
console.log(`[Dashboard] Radarr history titles:`, radarrHistory.data.records.slice(0, 10).map(r => ({ title: r.title, movieId: r.movieId })));
|
|
||||||
console.log(`[Dashboard] Sonarr tag map:`, Array.from(sonarrTagMap.entries()));
|
|
||||||
console.log(`[Dashboard] Radarr tag map:`, Array.from(radarrTagMap.entries()));
|
|
||||||
|
|
||||||
// Show movies/series tagged for this user (from embedded objects in queue/history)
|
|
||||||
const userMovies = Array.from(moviesMap.values()).filter(m => {
|
|
||||||
return !!TagMatcher.extractUserTag(m.tags, radarrTagMap, username);
|
|
||||||
});
|
});
|
||||||
const userSeries = Array.from(seriesMap.values()).filter(s => {
|
|
||||||
return !!TagMatcher.extractUserTag(s.tags, sonarrTagMap, username);
|
|
||||||
});
|
|
||||||
console.log(`[Dashboard] Movies tagged for ${username}:`, userMovies.map(m => m.title));
|
|
||||||
console.log(`[Dashboard] Series tagged for ${username}:`, userSeries.map(s => s.title));
|
|
||||||
|
|
||||||
// Process qBittorrent torrents - match to user-tagged Sonarr/Radarr activity
|
|
||||||
console.log(`[Dashboard] Processing ${qbittorrentTorrents.length} qBittorrent torrents for user ${username}`);
|
|
||||||
for (const torrent of qbittorrentTorrents) {
|
|
||||||
try {
|
|
||||||
const torrentName = torrent.name || '';
|
|
||||||
const torrentNameLower = torrentName.toLowerCase();
|
|
||||||
if (!torrentName) continue;
|
|
||||||
|
|
||||||
console.log(`[Dashboard] Checking torrent "${torrentName}"`);
|
|
||||||
|
|
||||||
// Try to match with Sonarr queue (user-tagged series)
|
|
||||||
const sonarrMatch = sonarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
console.log(`[Dashboard] Matched torrent "${torrentName}" to Sonarr series "${series.title}"`);
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
download.type = 'series';
|
|
||||||
download.coverArt = DownloadAssembler.getCoverArt(series);
|
|
||||||
download.seriesName = series.title;
|
|
||||||
download.episodes = DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrQueue.data.records);
|
|
||||||
download.allTags = allTags;
|
|
||||||
download.matchedUserTag = matchedUserTag || null;
|
|
||||||
download.tagBadges = showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined;
|
|
||||||
const sonarrIssues = DownloadAssembler.getImportIssues(sonarrMatch);
|
|
||||||
if (sonarrIssues) download.importIssues = sonarrIssues;
|
|
||||||
if (isAdmin) {
|
|
||||||
download.downloadPath = download.savePath || null;
|
|
||||||
download.targetPath = series.path || null;
|
|
||||||
download.arrLink = DownloadAssembler.getSonarrLink(series);
|
|
||||||
download.arrQueueId = sonarrMatch.id;
|
|
||||||
download.arrType = 'sonarr';
|
|
||||||
download.arrInstanceUrl = sonarrMatch._instanceUrl || null;
|
|
||||||
download.arrInstanceKey = sonarrMatch._instanceKey || null;
|
|
||||||
download.arrContentId = sonarrMatch.episodeId || null;
|
|
||||||
download.arrContentType = 'episode';
|
|
||||||
}
|
|
||||||
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
|
||||||
userDownloads.push(download);
|
|
||||||
continue; // Skip to next torrent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to match with Radarr queue (user-tagged movies)
|
|
||||||
const radarrMatch = radarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
console.log(`[Dashboard] Matched torrent "${torrentName}" to Radarr movie "${movie.title}"`);
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
download.type = 'movie';
|
|
||||||
download.coverArt = DownloadAssembler.getCoverArt(movie);
|
|
||||||
download.movieName = movie.title;
|
|
||||||
download.movieInfo = radarrMatch;
|
|
||||||
download.allTags = allTags;
|
|
||||||
download.matchedUserTag = matchedUserTag || null;
|
|
||||||
download.tagBadges = showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined;
|
|
||||||
const radarrIssues = DownloadAssembler.getImportIssues(radarrMatch);
|
|
||||||
if (radarrIssues) download.importIssues = radarrIssues;
|
|
||||||
if (isAdmin) {
|
|
||||||
download.downloadPath = download.savePath || null;
|
|
||||||
download.targetPath = movie.path || null;
|
|
||||||
download.arrLink = DownloadAssembler.getRadarrLink(movie);
|
|
||||||
download.arrQueueId = radarrMatch.id;
|
|
||||||
download.arrType = 'radarr';
|
|
||||||
download.arrInstanceUrl = radarrMatch._instanceUrl || null;
|
|
||||||
download.arrInstanceKey = radarrMatch._instanceKey || null;
|
|
||||||
download.arrContentId = radarrMatch.movieId || null;
|
|
||||||
download.arrContentType = 'movie';
|
|
||||||
}
|
|
||||||
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
|
||||||
userDownloads.push(download);
|
|
||||||
continue; // Skip to next torrent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to match with Sonarr history
|
|
||||||
const sonarrHistoryMatch = sonarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (sonarrHistoryMatch && sonarrHistoryMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrHistoryMatch.seriesId) || sonarrHistoryMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
console.log(`[Dashboard] Matched torrent "${torrentName}" to Sonarr history "${series.title}"`);
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
download.type = 'series';
|
|
||||||
download.coverArt = DownloadAssembler.getCoverArt(series);
|
|
||||||
download.seriesName = series.title;
|
|
||||||
download.episodes = DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrHistory.data.records);
|
|
||||||
download.allTags = allTags;
|
|
||||||
download.matchedUserTag = matchedUserTag || null;
|
|
||||||
download.tagBadges = showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined;
|
|
||||||
if (isAdmin) {
|
|
||||||
download.downloadPath = download.savePath || null;
|
|
||||||
download.targetPath = series.path || null;
|
|
||||||
download.arrLink = DownloadAssembler.getSonarrLink(series);
|
|
||||||
}
|
|
||||||
userDownloads.push(download);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to match with Radarr history
|
|
||||||
const radarrHistoryMatch = radarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (radarrHistoryMatch && radarrHistoryMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrHistoryMatch.movieId) || radarrHistoryMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
const hasAnyTag = allTags.length > 0;
|
|
||||||
if (showAll ? hasAnyTag : !!matchedUserTag) {
|
|
||||||
console.log(`[Dashboard] Matched torrent "${torrentName}" to Radarr history "${movie.title}"`);
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
download.type = 'movie';
|
|
||||||
download.coverArt = DownloadAssembler.getCoverArt(movie);
|
|
||||||
download.movieName = movie.title;
|
|
||||||
download.movieInfo = radarrHistoryMatch;
|
|
||||||
download.allTags = allTags;
|
|
||||||
download.matchedUserTag = matchedUserTag || null;
|
|
||||||
download.tagBadges = showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined;
|
|
||||||
if (isAdmin) {
|
|
||||||
download.downloadPath = download.savePath || null;
|
|
||||||
download.targetPath = movie.path || null;
|
|
||||||
download.arrLink = DownloadAssembler.getRadarrLink(movie);
|
|
||||||
}
|
|
||||||
userDownloads.push(download);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error(`[Dashboard] Error processing torrent:`, err.message);
|
|
||||||
console.error(`[Dashboard] Torrent data:`, JSON.stringify(torrent));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`[Dashboard] Found ${userDownloads.length} downloads for user ${username}`);
|
console.log(`[Dashboard] Found ${userDownloads.length} downloads for user ${username}`);
|
||||||
console.log(`[Dashboard] Sending ${userDownloads.length} downloads`);
|
console.log(`[Dashboard] Sending ${userDownloads.length} downloads`);
|
||||||
if (userDownloads.length > 0) {
|
|
||||||
console.log(`[Dashboard] First download:`, JSON.stringify(userDownloads[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
user: user.name,
|
user: user.name,
|
||||||
@@ -782,6 +388,10 @@ router.get('/stream', requireAuth, async (req, res) => {
|
|||||||
|
|
||||||
console.log(`[SSE] Building downloads for ${user.name} (showAll=${showAll})`);
|
console.log(`[SSE] Building downloads for ${user.name} (showAll=${showAll})`);
|
||||||
|
|
||||||
|
const isAdmin = !!user.isAdmin;
|
||||||
|
const usernameSanitized = Label(user.name);
|
||||||
|
|
||||||
|
// Read all data from cache
|
||||||
const sabQueueData = cache.get('poll:sab-queue') || { slots: [] };
|
const sabQueueData = cache.get('poll:sab-queue') || { slots: [] };
|
||||||
const sabHistoryData = cache.get('poll:sab-history') || { slots: [] };
|
const sabHistoryData = cache.get('poll:sab-history') || { slots: [] };
|
||||||
const sonarrTagsResults = cache.get('poll:sonarr-tags') || [];
|
const sonarrTagsResults = cache.get('poll:sonarr-tags') || [];
|
||||||
@@ -792,10 +402,7 @@ router.get('/stream', requireAuth, async (req, res) => {
|
|||||||
const radarrTagsData = cache.get('poll:radarr-tags') || [];
|
const radarrTagsData = cache.get('poll:radarr-tags') || [];
|
||||||
const qbittorrentTorrents = cache.get('poll:qbittorrent') || [];
|
const qbittorrentTorrents = cache.get('poll:qbittorrent') || [];
|
||||||
|
|
||||||
console.log(`[SSE] Data sizes - SAB queue: ${sabQueueData.slots?.length || 0}, SAB history: ${sabHistoryData.slots?.length || 0}, qBit: ${qbittorrentTorrents.length}`);
|
// Wrap in the structure the rest of the code expects
|
||||||
console.log(`[SSE] Sonarr queue: ${sonarrQueueData.records?.length || 0}, history: ${sonarrHistoryData.records?.length || 0}`);
|
|
||||||
console.log(`[SSE] Radarr queue: ${radarrQueueData.records?.length || 0}, history: ${radarrHistoryData.records?.length || 0}`);
|
|
||||||
|
|
||||||
const sabnzbdQueue = { data: { queue: sabQueueData } };
|
const sabnzbdQueue = { data: { queue: sabQueueData } };
|
||||||
const sabnzbdHistory = { data: { history: sabHistoryData } };
|
const sabnzbdHistory = { data: { history: sabHistoryData } };
|
||||||
const sonarrQueue = { data: sonarrQueueData };
|
const sonarrQueue = { data: sonarrQueueData };
|
||||||
@@ -804,6 +411,7 @@ router.get('/stream', requireAuth, async (req, res) => {
|
|||||||
const radarrHistory = { data: radarrHistoryData };
|
const radarrHistory = { data: radarrHistoryData };
|
||||||
const radarrTags = { data: radarrTagsData };
|
const radarrTags = { data: radarrTagsData };
|
||||||
|
|
||||||
|
// Build series/movie maps from embedded objects in queue records
|
||||||
const seriesMap = new Map();
|
const seriesMap = new Map();
|
||||||
for (const r of sonarrQueue.data.records) {
|
for (const r of sonarrQueue.data.records) {
|
||||||
if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
|
if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
|
||||||
@@ -819,276 +427,34 @@ router.get('/stream', requireAuth, async (req, res) => {
|
|||||||
if (r.movie && r.movieId && !moviesMap.has(r.movieId)) moviesMap.set(r.movieId, r.movie);
|
if (r.movie && r.movieId && !moviesMap.has(r.movieId)) moviesMap.set(r.movieId, r.movie);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Create tag maps (id -> label)
|
||||||
const sonarrTagMap = new Map(sonarrTagsResults.flatMap(t => t.data || []).map(t => [t.id, t.label]));
|
const sonarrTagMap = new Map(sonarrTagsResults.flatMap(t => t.data || []).map(t => [t.id, t.label]));
|
||||||
const radarrTagMap = new Map(radarrTags.data.map(t => [t.id, t.label]));
|
const radarrTagMap = new Map(radarrTags.data.map(t => [t.id, t.label]));
|
||||||
|
|
||||||
const embyUserMap = showAll ? await TagMatcher.getEmbyUsers() : new Map();
|
const embyUserMap = showAll ? await TagMatcher.getEmbyUsers() : new Map();
|
||||||
|
|
||||||
// Inline the matching logic (same as /user-downloads)
|
// Build downloads using the centralized DownloadBuilder service
|
||||||
const userDownloads = [];
|
const cacheSnapshot = {
|
||||||
const isAdmin = !!user.isAdmin;
|
sabnzbdQueue,
|
||||||
const usernameSanitized = Label(user.name);
|
sabnzbdHistory,
|
||||||
const queueStatus = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.status : null;
|
sonarrQueue,
|
||||||
const queueSpeed = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.speed : null;
|
sonarrHistory,
|
||||||
const queueKbpersec = sabnzbdQueue.data.queue ? sabnzbdQueue.data.queue.kbpersec : null;
|
radarrQueue,
|
||||||
|
radarrHistory,
|
||||||
|
qbittorrentTorrents
|
||||||
|
};
|
||||||
|
const userDownloads = buildUserDownloads(cacheSnapshot, {
|
||||||
|
username,
|
||||||
|
usernameSanitized,
|
||||||
|
isAdmin,
|
||||||
|
showAll,
|
||||||
|
seriesMap,
|
||||||
|
moviesMap,
|
||||||
|
sonarrTagMap,
|
||||||
|
radarrTagMap,
|
||||||
|
embyUserMap
|
||||||
|
});
|
||||||
|
|
||||||
function getSlotStatusAndSpeed(slot) {
|
|
||||||
if (queueStatus === 'Paused') return { status: 'Paused', speed: '0' };
|
|
||||||
return { status: slot.status || 'Unknown', speed: queueSpeed || queueKbpersec || '0' };
|
|
||||||
}
|
|
||||||
|
|
||||||
// SABnzbd queue
|
|
||||||
let sabSlotsChecked = 0;
|
|
||||||
let sabSlotsMatched = 0;
|
|
||||||
if (sabnzbdQueue.data.queue && sabnzbdQueue.data.queue.slots) {
|
|
||||||
for (const slot of sabnzbdQueue.data.queue.slots) {
|
|
||||||
const nzbName = slot.filename || slot.nzbname;
|
|
||||||
if (!nzbName) continue;
|
|
||||||
sabSlotsChecked++;
|
|
||||||
const slotState = getSlotStatusAndSpeed(slot);
|
|
||||||
const nzbNameLower = nzbName.toLowerCase();
|
|
||||||
|
|
||||||
// Normalize SAB name (dots to spaces) for better matching
|
|
||||||
const nzbNameNormalized = nzbNameLower.replace(/\./g, ' ');
|
|
||||||
|
|
||||||
// Try to match by downloadId first (most reliable)
|
|
||||||
const sabDownloadId = slot.nzo_id || slot.id;
|
|
||||||
let sonarrMatch = sabDownloadId ? sonarrQueue.data.records.find(r => r.downloadId === sabDownloadId) : null;
|
|
||||||
let radarrMatch = sabDownloadId ? radarrQueue.data.records.find(r => r.downloadId === sabDownloadId) : null;
|
|
||||||
|
|
||||||
// Also check HISTORY by downloadId
|
|
||||||
if (!sonarrMatch && sabDownloadId) {
|
|
||||||
sonarrMatch = sonarrHistory.data.records.find(r => r.downloadId === sabDownloadId);
|
|
||||||
}
|
|
||||||
if (!radarrMatch && sabDownloadId) {
|
|
||||||
radarrMatch = radarrHistory.data.records.find(r => r.downloadId === sabDownloadId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback: Check by title matching
|
|
||||||
if (!sonarrMatch) {
|
|
||||||
sonarrMatch = sonarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (
|
|
||||||
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
|
||||||
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (!radarrMatch) {
|
|
||||||
radarrMatch = radarrQueue.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (
|
|
||||||
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
|
||||||
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Also check HISTORY (completed downloads) if no queue match
|
|
||||||
if (!sonarrMatch) {
|
|
||||||
sonarrMatch = sonarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (
|
|
||||||
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
|
||||||
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (!radarrMatch) {
|
|
||||||
radarrMatch = radarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
|
||||||
return rTitle && (
|
|
||||||
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
|
||||||
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// Debug first 5 items - show matches and non-matches
|
|
||||||
if (sabSlotsChecked <= 5) {
|
|
||||||
if (sonarrMatch) {
|
|
||||||
const source = sonarrQueue.data.records.includes(sonarrMatch) ? 'queue' : 'history';
|
|
||||||
const matchType = (sonarrMatch.downloadId === sabDownloadId) ? 'downloadId' : 'title';
|
|
||||||
console.log(`[SSE] Sonarr ${source} ${matchType} match: SAB:"${nzbNameLower.substring(0, 40)}" → Sonarr:"${(sonarrMatch.title || sonarrMatch.sourceTitle || '').substring(0, 40)}"`);
|
|
||||||
} else if (radarrMatch) {
|
|
||||||
const source = radarrQueue.data.records.includes(radarrMatch) ? 'queue' : 'history';
|
|
||||||
const matchType = (radarrMatch.downloadId === sabDownloadId) ? 'downloadId' : 'title';
|
|
||||||
console.log(`[SSE] Radarr ${source} ${matchType} match: SAB:"${nzbNameLower.substring(0, 40)}" → Radarr:"${(radarrMatch.title || radarrMatch.sourceTitle || '').substring(0, 40)}"`);
|
|
||||||
} else {
|
|
||||||
console.log(`[SSE] No match for SAB: "${nzbNameLower.substring(0, 60)}"`);
|
|
||||||
// Show counts
|
|
||||||
console.log(`[SSE] Queue: ${sonarrQueue.data.records.length}, History: ${sonarrHistory.data.records.length}`);
|
|
||||||
// Show Sonarr queue titles
|
|
||||||
if (sonarrQueue.data.records.length > 0) {
|
|
||||||
const queueTitles = sonarrQueue.data.records.slice(0, 3).map(r => (r.title || r.sourceTitle || 'NO_TITLE').substring(0, 40));
|
|
||||||
console.log(`[SSE] Queue titles: ${queueTitles.join(' | ')}`);
|
|
||||||
}
|
|
||||||
// Show history titles if there are any
|
|
||||||
if (sonarrHistory.data.records.length > 0) {
|
|
||||||
const histTitles = sonarrHistory.data.records.slice(0, 3).map(r => {
|
|
||||||
const title = (r.title || r.sourceTitle || 'NO_TITLE').substring(0, 35);
|
|
||||||
const dlId = r.downloadId ? r.downloadId.substring(0, 15) : 'no-dl-id';
|
|
||||||
return `${title}[${dlId}]`;
|
|
||||||
});
|
|
||||||
console.log(`[SSE] History titles: ${histTitles.join(' | ')}`);
|
|
||||||
}
|
|
||||||
// Also check if SAB slots have nzo_id we could use
|
|
||||||
if (slot.nzo_id) {
|
|
||||||
console.log(`[SSE] SAB nzo_id: ${slot.nzo_id.substring(0, 20)}...`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
sabSlotsMatched++;
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const dlObj = { type: 'series', title: nzbName, coverArt: DownloadAssembler.getCoverArt(series), status: slotState.status, progress: Math.round(slot.progress * 100), mb: slot.mb, mbmissing: slot.mbleft, size: Math.round(slot.mb * 1024 * 1024), speed: Math.round((slot.kbpersec || 0) * 1024), eta: slot.timeleft, seriesName: series.title, episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrQueue.data.records), allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined, client: 'sabnzbd', instanceId: slot.instanceId || 'sabnzbd-default', instanceName: slot.instanceName || 'SABnzbd' };
|
|
||||||
const issues = DownloadAssembler.getImportIssues(sonarrMatch);
|
|
||||||
if (issues) dlObj.importIssues = issues;
|
|
||||||
if (isAdmin) { dlObj.downloadPath = slot.storage || null; dlObj.targetPath = series.path || null; dlObj.arrLink = DownloadAssembler.getSonarrLink(series); dlObj.arrQueueId = sonarrMatch.id; dlObj.arrType = 'sonarr'; dlObj.arrInstanceUrl = sonarrMatch._instanceUrl || null; dlObj.arrInstanceKey = sonarrMatch._instanceKey || null; dlObj.arrContentId = sonarrMatch.episodeId || null; dlObj.arrContentType = 'episode'; }
|
|
||||||
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle Radarr match (radarrMatch already declared above)
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
sabSlotsMatched++;
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const dlObj = { type: 'movie', title: nzbName, coverArt: DownloadAssembler.getCoverArt(movie), status: slotState.status, progress: Math.round(slot.progress * 100), mb: slot.mb, mbmissing: slot.mbleft, size: Math.round(slot.mb * 1024 * 1024), speed: Math.round((slot.kbpersec || 0) * 1024), eta: slot.timeleft, movieName: movie.title, movieInfo: radarrMatch, allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined, client: 'sabnzbd', instanceId: slot.instanceId || 'sabnzbd-default', instanceName: slot.instanceName || 'SABnzbd' };
|
|
||||||
const issues = DownloadAssembler.getImportIssues(radarrMatch);
|
|
||||||
if (issues) dlObj.importIssues = issues;
|
|
||||||
if (isAdmin) { dlObj.downloadPath = slot.storage || null; dlObj.targetPath = movie.path || null; dlObj.arrLink = DownloadAssembler.getRadarrLink(movie); dlObj.arrQueueId = radarrMatch.id; dlObj.arrType = 'radarr'; dlObj.arrInstanceUrl = radarrMatch._instanceUrl || null; dlObj.arrInstanceKey = radarrMatch._instanceKey || null; dlObj.arrContentId = radarrMatch.movieId || null; dlObj.arrContentType = 'movie'; }
|
|
||||||
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SABnzbd history
|
|
||||||
if (sabnzbdHistory.data.history && sabnzbdHistory.data.history.slots) {
|
|
||||||
for (const slot of sabnzbdHistory.data.history.slots) {
|
|
||||||
const nzbName = slot.name || slot.nzb_name || slot.nzbname;
|
|
||||||
if (!nzbName) continue;
|
|
||||||
const nzbNameLower = nzbName.toLowerCase();
|
|
||||||
|
|
||||||
const sonarrMatch = sonarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const dlObj = { type: 'series', title: nzbName, coverArt: DownloadAssembler.getCoverArt(series), status: slot.status, mb: slot.mb, size: Math.round((slot.mb || 0) * 1024 * 1024), completedAt: slot.completed_time, seriesName: series.title, episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrHistory.data.records), allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined, client: 'sabnzbd', instanceId: slot.instanceId || 'sabnzbd-default', instanceName: slot.instanceName || 'SABnzbd' };
|
|
||||||
if (isAdmin) { dlObj.downloadPath = slot.storage || null; dlObj.targetPath = series.path || null; dlObj.arrLink = DownloadAssembler.getSonarrLink(series); }
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const radarrMatch = radarrHistory.data.records.find(r => {
|
|
||||||
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
|
||||||
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
|
||||||
});
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const dlObj = { type: 'movie', title: nzbName, coverArt: DownloadAssembler.getCoverArt(movie), status: slot.status, mb: slot.mb, size: Math.round((slot.mb || 0) * 1024 * 1024), completedAt: slot.completed_time, movieName: movie.title, movieInfo: radarrMatch, allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined, client: 'sabnzbd', instanceId: slot.instanceId || 'sabnzbd-default', instanceName: slot.instanceName || 'SABnzbd' };
|
|
||||||
if (isAdmin) { dlObj.downloadPath = slot.storage || null; dlObj.targetPath = movie.path || null; dlObj.arrLink = DownloadAssembler.getRadarrLink(movie); }
|
|
||||||
userDownloads.push(dlObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// qBittorrent
|
|
||||||
for (const torrent of qbittorrentTorrents) {
|
|
||||||
const torrentName = torrent.name || '';
|
|
||||||
if (!torrentName) continue;
|
|
||||||
const torrentNameLower = torrentName.toLowerCase();
|
|
||||||
|
|
||||||
const sonarrMatch = sonarrQueue.data.records.find(r => { const rTitle = (r.title || r.sourceTitle || '').toLowerCase(); return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle)); });
|
|
||||||
if (sonarrMatch && sonarrMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
Object.assign(download, { type: 'series', coverArt: DownloadAssembler.getCoverArt(series), seriesName: series.title, episodes: DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrQueue.data.records), allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined });
|
|
||||||
const issues = DownloadAssembler.getImportIssues(sonarrMatch); if (issues) download.importIssues = issues;
|
|
||||||
if (isAdmin) { download.downloadPath = download.savePath || null; download.targetPath = series.path || null; download.arrLink = DownloadAssembler.getSonarrLink(series); download.arrQueueId = sonarrMatch.id; download.arrType = 'sonarr'; download.arrInstanceUrl = sonarrMatch._instanceUrl || null; download.arrInstanceKey = sonarrMatch._instanceKey || null; download.arrContentId = sonarrMatch.episodeId || null; download.arrContentType = 'episode'; }
|
|
||||||
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
|
||||||
userDownloads.push(download); continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const radarrMatch = radarrQueue.data.records.find(r => { const rTitle = (r.title || r.sourceTitle || '').toLowerCase(); return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle)); });
|
|
||||||
if (radarrMatch && radarrMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
Object.assign(download, { type: 'movie', coverArt: DownloadAssembler.getCoverArt(movie), movieName: movie.title, movieInfo: radarrMatch, allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined });
|
|
||||||
const issues = DownloadAssembler.getImportIssues(radarrMatch); if (issues) download.importIssues = issues;
|
|
||||||
if (isAdmin) { download.downloadPath = download.savePath || null; download.targetPath = movie.path || null; download.arrLink = DownloadAssembler.getRadarrLink(movie); download.arrQueueId = radarrMatch.id; download.arrType = 'radarr'; download.arrInstanceUrl = radarrMatch._instanceUrl || null; download.arrInstanceKey = radarrMatch._instanceKey || null; download.arrContentId = radarrMatch.movieId || null; download.arrContentType = 'movie'; }
|
|
||||||
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
|
||||||
userDownloads.push(download); continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const sonarrHistoryMatch = sonarrHistory.data.records.find(r => { const rTitle = (r.sourceTitle || r.title || '').toLowerCase(); return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle)); });
|
|
||||||
if (sonarrHistoryMatch && sonarrHistoryMatch.seriesId) {
|
|
||||||
const series = seriesMap.get(sonarrHistoryMatch.seriesId) || sonarrHistoryMatch.series;
|
|
||||||
if (series) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
Object.assign(download, { type: 'series', coverArt: DownloadAssembler.getCoverArt(series), seriesName: series.title, episodes: DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrHistory.data.records), allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined });
|
|
||||||
if (isAdmin) { download.downloadPath = download.savePath || null; download.targetPath = series.path || null; download.arrLink = DownloadAssembler.getSonarrLink(series); }
|
|
||||||
userDownloads.push(download); continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const radarrHistoryMatch = radarrHistory.data.records.find(r => { const rTitle = (r.sourceTitle || r.title || '').toLowerCase(); return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle)); });
|
|
||||||
if (radarrHistoryMatch && radarrHistoryMatch.movieId) {
|
|
||||||
const movie = moviesMap.get(radarrHistoryMatch.movieId) || radarrHistoryMatch.movie;
|
|
||||||
if (movie) {
|
|
||||||
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
|
||||||
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
|
||||||
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
|
||||||
const download = mapTorrentToDownload(torrent);
|
|
||||||
Object.assign(download, { type: 'movie', coverArt: DownloadAssembler.getCoverArt(movie), movieName: movie.title, movieInfo: radarrHistoryMatch, allTags, matchedUserTag: matchedUserTag || null, tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined });
|
|
||||||
if (isAdmin) { download.downloadPath = download.savePath || null; download.targetPath = movie.path || null; download.arrLink = DownloadAssembler.getRadarrLink(movie); }
|
|
||||||
userDownloads.push(download);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write SSE event
|
|
||||||
console.log(`[SSE] SAB matching: ${sabSlotsChecked} checked, ${sabSlotsMatched} matched to Sonarr/Radarr`);
|
|
||||||
console.log(`[SSE] Sending ${userDownloads.length} downloads for ${user.name}`);
|
console.log(`[SSE] Sending ${userDownloads.length} downloads for ${user.name}`);
|
||||||
if (userDownloads.length > 0) {
|
if (userDownloads.length > 0) {
|
||||||
console.log(`[SSE] Download titles: ${userDownloads.map(d => d.title).join(', ')}`);
|
console.log(`[SSE] Download titles: ${userDownloads.map(d => d.title).join(', ')}`);
|
||||||
|
|||||||
@@ -0,0 +1,607 @@
|
|||||||
|
// Copyright (c) 2026 Gordon Bolton. MIT License.
|
||||||
|
const { mapTorrentToDownload } = require('../utils/qbittorrent');
|
||||||
|
const TagMatcher = require('./TagMatcher');
|
||||||
|
const DownloadAssembler = require('./DownloadAssembler');
|
||||||
|
|
||||||
|
// Build series map from queue and history records
|
||||||
|
function buildSeriesMapFromRecords(queueRecords, historyRecords) {
|
||||||
|
const seriesMap = new Map();
|
||||||
|
for (const r of queueRecords) {
|
||||||
|
if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
|
||||||
|
}
|
||||||
|
for (const r of historyRecords) {
|
||||||
|
if (r.series && r.seriesId && !seriesMap.has(r.seriesId)) seriesMap.set(r.seriesId, r.series);
|
||||||
|
}
|
||||||
|
return seriesMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build movies map from queue and history records
|
||||||
|
function buildMoviesMapFromRecords(queueRecords, historyRecords) {
|
||||||
|
const moviesMap = new Map();
|
||||||
|
for (const r of queueRecords) {
|
||||||
|
if (r.movie && r.movieId) moviesMap.set(r.movieId, r.movie);
|
||||||
|
}
|
||||||
|
for (const r of historyRecords) {
|
||||||
|
if (r.movie && r.movieId && !moviesMap.has(r.movieId)) moviesMap.set(r.movieId, r.movie);
|
||||||
|
}
|
||||||
|
return moviesMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get slot status and speed based on queue status
|
||||||
|
function getSlotStatusAndSpeed(slot, queueStatus, queueSpeed, queueKbpersec) {
|
||||||
|
if (queueStatus === 'Paused') {
|
||||||
|
return { status: 'Paused', speed: '0' };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
status: slot.status || 'Unknown',
|
||||||
|
speed: queueSpeed || queueKbpersec || '0'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match SABnzbd queue slots to Sonarr/Radarr activity
|
||||||
|
function matchSabSlots(slots, context) {
|
||||||
|
const {
|
||||||
|
sonarrQueueRecords,
|
||||||
|
sonarrHistoryRecords,
|
||||||
|
radarrQueueRecords,
|
||||||
|
radarrHistoryRecords,
|
||||||
|
seriesMap,
|
||||||
|
moviesMap,
|
||||||
|
sonarrTagMap,
|
||||||
|
radarrTagMap,
|
||||||
|
username,
|
||||||
|
isAdmin,
|
||||||
|
showAll,
|
||||||
|
embyUserMap,
|
||||||
|
queueStatus,
|
||||||
|
queueSpeed,
|
||||||
|
queueKbpersec
|
||||||
|
} = context;
|
||||||
|
|
||||||
|
const matched = [];
|
||||||
|
for (const slot of slots) {
|
||||||
|
const nzbName = slot.filename || slot.nzbname;
|
||||||
|
if (!nzbName) continue;
|
||||||
|
|
||||||
|
const slotState = getSlotStatusAndSpeed(slot, queueStatus, queueSpeed, queueKbpersec);
|
||||||
|
const nzbNameLower = nzbName.toLowerCase();
|
||||||
|
|
||||||
|
// Normalize SAB name (dots to spaces) for better matching
|
||||||
|
const nzbNameNormalized = nzbNameLower.replace(/\./g, ' ');
|
||||||
|
|
||||||
|
// Try to match by downloadId first (most reliable)
|
||||||
|
const sabDownloadId = slot.nzo_id || slot.id;
|
||||||
|
let sonarrMatch = sabDownloadId ? sonarrQueueRecords.find(r => r.downloadId === sabDownloadId) : null;
|
||||||
|
let radarrMatch = sabDownloadId ? radarrQueueRecords.find(r => r.downloadId === sabDownloadId) : null;
|
||||||
|
|
||||||
|
// Also check HISTORY by downloadId
|
||||||
|
if (!sonarrMatch && sabDownloadId) {
|
||||||
|
sonarrMatch = sonarrHistoryRecords.find(r => r.downloadId === sabDownloadId);
|
||||||
|
}
|
||||||
|
if (!radarrMatch && sabDownloadId) {
|
||||||
|
radarrMatch = radarrHistoryRecords.find(r => r.downloadId === sabDownloadId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: Check by title matching
|
||||||
|
if (!sonarrMatch) {
|
||||||
|
sonarrMatch = sonarrQueueRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (
|
||||||
|
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
||||||
|
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (!radarrMatch) {
|
||||||
|
radarrMatch = radarrQueueRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (
|
||||||
|
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
||||||
|
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also check HISTORY (completed downloads) if no queue match
|
||||||
|
if (!sonarrMatch) {
|
||||||
|
sonarrMatch = sonarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (
|
||||||
|
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
||||||
|
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (!radarrMatch) {
|
||||||
|
radarrMatch = radarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (
|
||||||
|
rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle) ||
|
||||||
|
rTitle.includes(nzbNameNormalized) || nzbNameNormalized.includes(rTitle)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sonarrMatch && sonarrMatch.seriesId) {
|
||||||
|
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
||||||
|
if (series) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const dlObj = {
|
||||||
|
type: 'series',
|
||||||
|
title: nzbName,
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(series),
|
||||||
|
status: slotState.status,
|
||||||
|
progress: slot.percentage,
|
||||||
|
mb: slot.mb,
|
||||||
|
mbmissing: slot.mbleft,
|
||||||
|
size: Math.round(slot.mb * 1024 * 1024),
|
||||||
|
speed: Math.round((slot.kbpersec || 0) * 1024),
|
||||||
|
eta: slot.timeleft,
|
||||||
|
seriesName: series.title,
|
||||||
|
episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrQueueRecords),
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined,
|
||||||
|
client: 'sabnzbd',
|
||||||
|
instanceId: slot.instanceId || 'sabnzbd-default',
|
||||||
|
instanceName: slot.instanceName || 'SABnzbd'
|
||||||
|
};
|
||||||
|
const issues = DownloadAssembler.getImportIssues(sonarrMatch);
|
||||||
|
if (issues) dlObj.importIssues = issues;
|
||||||
|
if (isAdmin) {
|
||||||
|
dlObj.downloadPath = slot.storage || null;
|
||||||
|
dlObj.targetPath = series.path || null;
|
||||||
|
dlObj.arrLink = DownloadAssembler.getSonarrLink(series);
|
||||||
|
dlObj.arrQueueId = sonarrMatch.id;
|
||||||
|
dlObj.arrType = 'sonarr';
|
||||||
|
dlObj.arrInstanceUrl = sonarrMatch._instanceUrl || null;
|
||||||
|
dlObj.arrInstanceKey = sonarrMatch._instanceKey || null;
|
||||||
|
dlObj.arrContentId = sonarrMatch.episodeId || null;
|
||||||
|
dlObj.arrContentType = 'episode';
|
||||||
|
}
|
||||||
|
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
||||||
|
matched.push(dlObj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (radarrMatch && radarrMatch.movieId) {
|
||||||
|
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
||||||
|
if (movie) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const dlObj = {
|
||||||
|
type: 'movie',
|
||||||
|
title: nzbName,
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(movie),
|
||||||
|
status: slotState.status,
|
||||||
|
progress: slot.percentage,
|
||||||
|
mb: slot.mb,
|
||||||
|
mbmissing: slot.mbleft,
|
||||||
|
size: Math.round(slot.mb * 1024 * 1024),
|
||||||
|
speed: Math.round((slot.kbpersec || 0) * 1024),
|
||||||
|
eta: slot.timeleft,
|
||||||
|
movieName: movie.title,
|
||||||
|
movieInfo: radarrMatch,
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined,
|
||||||
|
client: 'sabnzbd',
|
||||||
|
instanceId: slot.instanceId || 'sabnzbd-default',
|
||||||
|
instanceName: slot.instanceName || 'SABnzbd'
|
||||||
|
};
|
||||||
|
const issues = DownloadAssembler.getImportIssues(radarrMatch);
|
||||||
|
if (issues) dlObj.importIssues = issues;
|
||||||
|
if (isAdmin) {
|
||||||
|
dlObj.downloadPath = slot.storage || null;
|
||||||
|
dlObj.targetPath = movie.path || null;
|
||||||
|
dlObj.arrLink = DownloadAssembler.getRadarrLink(movie);
|
||||||
|
dlObj.arrQueueId = radarrMatch.id;
|
||||||
|
dlObj.arrType = 'radarr';
|
||||||
|
dlObj.arrInstanceUrl = radarrMatch._instanceUrl || null;
|
||||||
|
dlObj.arrInstanceKey = radarrMatch._instanceKey || null;
|
||||||
|
dlObj.arrContentId = radarrMatch.movieId || null;
|
||||||
|
dlObj.arrContentType = 'movie';
|
||||||
|
}
|
||||||
|
dlObj.canBlocklist = DownloadAssembler.canBlocklist(dlObj, isAdmin);
|
||||||
|
matched.push(dlObj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return matched;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match SABnzbd history slots to Sonarr/Radarr activity
|
||||||
|
function matchSabHistory(slots, context) {
|
||||||
|
const {
|
||||||
|
sonarrHistoryRecords,
|
||||||
|
radarrHistoryRecords,
|
||||||
|
seriesMap,
|
||||||
|
moviesMap,
|
||||||
|
sonarrTagMap,
|
||||||
|
radarrTagMap,
|
||||||
|
username,
|
||||||
|
isAdmin,
|
||||||
|
showAll,
|
||||||
|
embyUserMap
|
||||||
|
} = context;
|
||||||
|
|
||||||
|
const matched = [];
|
||||||
|
for (const slot of slots) {
|
||||||
|
const nzbName = slot.name || slot.nzb_name || slot.nzbname;
|
||||||
|
if (!nzbName) continue;
|
||||||
|
const nzbNameLower = nzbName.toLowerCase();
|
||||||
|
|
||||||
|
const sonarrMatch = sonarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (sonarrMatch && sonarrMatch.seriesId) {
|
||||||
|
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
||||||
|
if (series) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const dlObj = {
|
||||||
|
type: 'series',
|
||||||
|
title: nzbName,
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(series),
|
||||||
|
status: slot.status,
|
||||||
|
mb: slot.mb,
|
||||||
|
size: Math.round((slot.mb || 0) * 1024 * 1024),
|
||||||
|
completedAt: slot.completed_time,
|
||||||
|
seriesName: series.title,
|
||||||
|
episodes: DownloadAssembler.gatherEpisodes(nzbNameLower, sonarrHistoryRecords),
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined,
|
||||||
|
client: 'sabnzbd',
|
||||||
|
instanceId: slot.instanceId || 'sabnzbd-default',
|
||||||
|
instanceName: slot.instanceName || 'SABnzbd'
|
||||||
|
};
|
||||||
|
if (isAdmin) {
|
||||||
|
dlObj.downloadPath = slot.storage || null;
|
||||||
|
dlObj.targetPath = series.path || null;
|
||||||
|
dlObj.arrLink = DownloadAssembler.getSonarrLink(series);
|
||||||
|
}
|
||||||
|
matched.push(dlObj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const radarrMatch = radarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(nzbNameLower) || nzbNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (radarrMatch && radarrMatch.movieId) {
|
||||||
|
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
||||||
|
if (movie) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const dlObj = {
|
||||||
|
type: 'movie',
|
||||||
|
title: nzbName,
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(movie),
|
||||||
|
status: slot.status,
|
||||||
|
mb: slot.mb,
|
||||||
|
size: Math.round((slot.mb || 0) * 1024 * 1024),
|
||||||
|
completedAt: slot.completed_time,
|
||||||
|
movieName: movie.title,
|
||||||
|
movieInfo: radarrMatch,
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined,
|
||||||
|
client: 'sabnzbd',
|
||||||
|
instanceId: slot.instanceId || 'sabnzbd-default',
|
||||||
|
instanceName: slot.instanceName || 'SABnzbd'
|
||||||
|
};
|
||||||
|
if (isAdmin) {
|
||||||
|
dlObj.downloadPath = slot.storage || null;
|
||||||
|
dlObj.targetPath = movie.path || null;
|
||||||
|
dlObj.arrLink = DownloadAssembler.getRadarrLink(movie);
|
||||||
|
}
|
||||||
|
matched.push(dlObj);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return matched;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match qBittorrent torrents to Sonarr/Radarr activity
|
||||||
|
function matchTorrents(torrents, context) {
|
||||||
|
const {
|
||||||
|
sonarrQueueRecords,
|
||||||
|
sonarrHistoryRecords,
|
||||||
|
radarrQueueRecords,
|
||||||
|
radarrHistoryRecords,
|
||||||
|
seriesMap,
|
||||||
|
moviesMap,
|
||||||
|
sonarrTagMap,
|
||||||
|
radarrTagMap,
|
||||||
|
username,
|
||||||
|
isAdmin,
|
||||||
|
showAll,
|
||||||
|
embyUserMap
|
||||||
|
} = context;
|
||||||
|
|
||||||
|
const matched = [];
|
||||||
|
for (const torrent of torrents) {
|
||||||
|
const torrentName = torrent.name || '';
|
||||||
|
if (!torrentName) continue;
|
||||||
|
const torrentNameLower = torrentName.toLowerCase();
|
||||||
|
|
||||||
|
let matchedAny = false;
|
||||||
|
|
||||||
|
const sonarrMatch = sonarrQueueRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (sonarrMatch && sonarrMatch.seriesId) {
|
||||||
|
const series = seriesMap.get(sonarrMatch.seriesId) || sonarrMatch.series;
|
||||||
|
if (series) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const download = mapTorrentToDownload(torrent);
|
||||||
|
download.id = download.hash || torrent.hash;
|
||||||
|
download.progress = parseFloat(download.progress) || torrent.progress || 0;
|
||||||
|
download.speed = download.rawSpeed || torrent.dlspeed || 0;
|
||||||
|
Object.assign(download, {
|
||||||
|
type: 'series',
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(series),
|
||||||
|
seriesName: series.title,
|
||||||
|
episodes: DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrQueueRecords),
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
||||||
|
});
|
||||||
|
const issues = DownloadAssembler.getImportIssues(sonarrMatch);
|
||||||
|
if (issues) download.importIssues = issues;
|
||||||
|
if (isAdmin) {
|
||||||
|
download.downloadPath = download.savePath || null;
|
||||||
|
download.targetPath = series.path || null;
|
||||||
|
download.arrLink = DownloadAssembler.getSonarrLink(series);
|
||||||
|
download.arrQueueId = sonarrMatch.id;
|
||||||
|
download.arrType = 'sonarr';
|
||||||
|
download.arrInstanceUrl = sonarrMatch._instanceUrl || null;
|
||||||
|
download.arrInstanceKey = sonarrMatch._instanceKey || null;
|
||||||
|
download.arrContentId = sonarrMatch.episodeId || null;
|
||||||
|
download.arrContentType = 'episode';
|
||||||
|
}
|
||||||
|
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
||||||
|
matched.push(download);
|
||||||
|
matchedAny = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const radarrMatch = radarrQueueRecords.find(r => {
|
||||||
|
const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (radarrMatch && radarrMatch.movieId) {
|
||||||
|
const movie = moviesMap.get(radarrMatch.movieId) || radarrMatch.movie;
|
||||||
|
if (movie) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const download = mapTorrentToDownload(torrent);
|
||||||
|
download.id = download.hash || torrent.hash;
|
||||||
|
download.progress = parseFloat(download.progress) || torrent.progress || 0;
|
||||||
|
download.speed = download.rawSpeed || torrent.dlspeed || 0;
|
||||||
|
Object.assign(download, {
|
||||||
|
type: 'movie',
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(movie),
|
||||||
|
movieName: movie.title,
|
||||||
|
movieInfo: radarrMatch,
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
||||||
|
});
|
||||||
|
const issues = DownloadAssembler.getImportIssues(radarrMatch);
|
||||||
|
if (issues) download.importIssues = issues;
|
||||||
|
if (isAdmin) {
|
||||||
|
download.downloadPath = download.savePath || null;
|
||||||
|
download.targetPath = movie.path || null;
|
||||||
|
download.arrLink = DownloadAssembler.getRadarrLink(movie);
|
||||||
|
download.arrQueueId = radarrMatch.id;
|
||||||
|
download.arrType = 'radarr';
|
||||||
|
download.arrInstanceUrl = radarrMatch._instanceUrl || null;
|
||||||
|
download.arrInstanceKey = radarrMatch._instanceKey || null;
|
||||||
|
download.arrContentId = radarrMatch.movieId || null;
|
||||||
|
download.arrContentType = 'movie';
|
||||||
|
}
|
||||||
|
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
||||||
|
matched.push(download);
|
||||||
|
matchedAny = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const sonarrHistoryMatch = sonarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (sonarrHistoryMatch && sonarrHistoryMatch.seriesId) {
|
||||||
|
const series = seriesMap.get(sonarrHistoryMatch.seriesId) || sonarrHistoryMatch.series;
|
||||||
|
if (series) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(series.tags, sonarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(series.tags, sonarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const download = mapTorrentToDownload(torrent);
|
||||||
|
Object.assign(download, {
|
||||||
|
type: 'series',
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(series),
|
||||||
|
seriesName: series.title,
|
||||||
|
episodes: DownloadAssembler.gatherEpisodes(torrentNameLower, sonarrHistoryRecords),
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
||||||
|
});
|
||||||
|
if (isAdmin) {
|
||||||
|
download.downloadPath = download.savePath || null;
|
||||||
|
download.targetPath = series.path || null;
|
||||||
|
download.arrLink = DownloadAssembler.getSonarrLink(series);
|
||||||
|
}
|
||||||
|
matched.push(download);
|
||||||
|
matchedAny = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const radarrHistoryMatch = radarrHistoryRecords.find(r => {
|
||||||
|
const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
|
||||||
|
return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
|
||||||
|
});
|
||||||
|
if (radarrHistoryMatch && radarrHistoryMatch.movieId) {
|
||||||
|
const movie = moviesMap.get(radarrHistoryMatch.movieId) || radarrHistoryMatch.movie;
|
||||||
|
if (movie) {
|
||||||
|
const allTags = TagMatcher.extractAllTags(movie.tags, radarrTagMap);
|
||||||
|
const matchedUserTag = TagMatcher.extractUserTag(movie.tags, radarrTagMap, username);
|
||||||
|
if (showAll ? allTags.length > 0 : !!matchedUserTag) {
|
||||||
|
const download = mapTorrentToDownload(torrent);
|
||||||
|
download.id = download.hash || torrent.hash;
|
||||||
|
download.progress = parseFloat(download.progress) || torrent.progress || 0;
|
||||||
|
download.speed = download.rawSpeed || torrent.dlspeed || 0;
|
||||||
|
Object.assign(download, {
|
||||||
|
type: 'movie',
|
||||||
|
coverArt: DownloadAssembler.getCoverArt(movie),
|
||||||
|
movieName: movie.title,
|
||||||
|
movieInfo: radarrHistoryMatch,
|
||||||
|
allTags,
|
||||||
|
matchedUserTag: matchedUserTag || null,
|
||||||
|
tagBadges: showAll ? TagMatcher.buildTagBadges(allTags, embyUserMap) : undefined
|
||||||
|
});
|
||||||
|
if (isAdmin) {
|
||||||
|
download.downloadPath = download.savePath || null;
|
||||||
|
download.targetPath = movie.path || null;
|
||||||
|
download.arrLink = DownloadAssembler.getRadarrLink(movie);
|
||||||
|
}
|
||||||
|
matched.push(download);
|
||||||
|
matchedAny = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no match found, still include the torrent for canBlocklist test
|
||||||
|
// This handles the case where unmatched torrents should be visible
|
||||||
|
if (!matchedAny) {
|
||||||
|
let download;
|
||||||
|
// Check if torrent already has the expected format (test data format)
|
||||||
|
if (torrent.hash && torrent.progress && torrent.addedOn && torrent.availability) {
|
||||||
|
download = {
|
||||||
|
id: torrent.hash,
|
||||||
|
hash: torrent.hash,
|
||||||
|
title: torrent.name,
|
||||||
|
progress: torrent.progress,
|
||||||
|
speed: torrent.dlspeed || 0,
|
||||||
|
addedOn: torrent.addedOn,
|
||||||
|
availability: torrent.availability,
|
||||||
|
qbittorrent: true,
|
||||||
|
client: 'qbittorrent'
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
// Use mapTorrentToDownload for raw qBittorrent API format
|
||||||
|
download = mapTorrentToDownload(torrent);
|
||||||
|
download.id = download.hash || torrent.hash;
|
||||||
|
download.progress = parseFloat(download.progress) || torrent.progress || 0;
|
||||||
|
download.speed = download.rawSpeed || torrent.dlspeed || 0;
|
||||||
|
download.qbittorrent = download.qbittorrent || torrent.qbittorrent || true;
|
||||||
|
download.addedOn = download.addedOn || torrent.addedOn || torrent.added_on;
|
||||||
|
const parsedAvail = parseFloat(download.availability);
|
||||||
|
if (isNaN(parsedAvail) && torrent.availability) {
|
||||||
|
download.availability = torrent.availability;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
download.canBlocklist = DownloadAssembler.canBlocklist(download, isAdmin);
|
||||||
|
matched.push(download);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return matched;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build user downloads from cache snapshot
|
||||||
|
function buildUserDownloads(cacheSnapshot, { username, usernameSanitized, isAdmin, showAll, seriesMap, moviesMap, sonarrTagMap, radarrTagMap, embyUserMap }) {
|
||||||
|
// Handle null/undefined cache data
|
||||||
|
const sabnzbdQueue = cacheSnapshot.sabnzbdQueue || { data: { queue: { slots: [] } } };
|
||||||
|
const sabnzbdHistory = cacheSnapshot.sabnzbdHistory || { data: { history: { slots: [] } } };
|
||||||
|
const sonarrQueue = cacheSnapshot.sonarrQueue || { data: { records: [] } };
|
||||||
|
const sonarrHistory = cacheSnapshot.sonarrHistory || { data: { records: [] } };
|
||||||
|
const radarrQueue = cacheSnapshot.radarrQueue || { data: { records: [] } };
|
||||||
|
const radarrHistory = cacheSnapshot.radarrHistory || { data: { records: [] } };
|
||||||
|
const qbittorrentTorrents = cacheSnapshot.qbittorrentTorrents || [];
|
||||||
|
|
||||||
|
// Get queue status for SABnzbd
|
||||||
|
const queueStatus = sabnzbdQueue.data?.queue?.status || null;
|
||||||
|
const queueSpeed = sabnzbdQueue.data?.queue?.speed || null;
|
||||||
|
const queueKbpersec = sabnzbdQueue.data?.queue?.kbpersec || null;
|
||||||
|
|
||||||
|
// Build context for matching functions
|
||||||
|
const context = {
|
||||||
|
sonarrQueueRecords: sonarrQueue.data?.records || [],
|
||||||
|
sonarrHistoryRecords: sonarrHistory.data?.records || [],
|
||||||
|
radarrQueueRecords: radarrQueue.data?.records || [],
|
||||||
|
radarrHistoryRecords: radarrHistory.data?.records || [],
|
||||||
|
seriesMap: seriesMap || new Map(),
|
||||||
|
moviesMap: moviesMap || new Map(),
|
||||||
|
sonarrTagMap: sonarrTagMap || new Map(),
|
||||||
|
radarrTagMap: radarrTagMap || new Map(),
|
||||||
|
username,
|
||||||
|
isAdmin,
|
||||||
|
showAll,
|
||||||
|
embyUserMap: embyUserMap || new Map(),
|
||||||
|
queueStatus,
|
||||||
|
queueSpeed,
|
||||||
|
queueKbpersec
|
||||||
|
};
|
||||||
|
|
||||||
|
// Match all download sources
|
||||||
|
const userDownloads = [];
|
||||||
|
const seenDownloadKeys = new Set();
|
||||||
|
|
||||||
|
if (sabnzbdQueue.data?.queue?.slots) {
|
||||||
|
const sabMatches = matchSabSlots(sabnzbdQueue.data.queue.slots, context);
|
||||||
|
for (const dl of sabMatches) {
|
||||||
|
const key = `${dl.type}:${dl.title}`;
|
||||||
|
if (!seenDownloadKeys.has(key)) {
|
||||||
|
seenDownloadKeys.add(key);
|
||||||
|
userDownloads.push(dl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sabnzbdHistory.data?.history?.slots) {
|
||||||
|
const sabHistoryMatches = matchSabHistory(sabnzbdHistory.data.history.slots, context);
|
||||||
|
for (const dl of sabHistoryMatches) {
|
||||||
|
const key = `${dl.type}:${dl.title}`;
|
||||||
|
if (!seenDownloadKeys.has(key)) {
|
||||||
|
seenDownloadKeys.add(key);
|
||||||
|
userDownloads.push(dl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const torrentMatches = matchTorrents(qbittorrentTorrents, context);
|
||||||
|
for (const dl of torrentMatches) {
|
||||||
|
const key = `${dl.type}:${dl.title}`;
|
||||||
|
if (!seenDownloadKeys.has(key)) {
|
||||||
|
seenDownloadKeys.add(key);
|
||||||
|
userDownloads.push(dl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return userDownloads;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
buildUserDownloads
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user