diff --git a/web_server.py b/web_server.py
index 682b821c..02d2b942 100644
--- a/web_server.py
+++ b/web_server.py
@@ -592,6 +592,81 @@ def start_download():
print(f"Download error: {e}")
return jsonify({"error": str(e)}), 500
+@app.route('/api/downloads/status')
+def get_download_status():
+ """
+ Sophisticated download status fetching that matches GUI's update_download_status method.
+ Fetches raw transfer data directly from slskd and flattens it like the GUI.
+ """
+ if not soulseek_client:
+ return jsonify({"transfers": []})
+
+ try:
+ # Fetch raw transfers data exactly like GUI's StatusProcessingWorker
+ transfers_data = asyncio.run(soulseek_client._make_request('GET', 'transfers/downloads'))
+
+ if not transfers_data:
+ return jsonify({"transfers": []})
+
+ # Flatten the nested data structure exactly like the GUI
+ all_transfers = []
+ for user_data in transfers_data:
+ if 'directories' in user_data:
+ for directory in user_data['directories']:
+ if 'files' in directory:
+ for file_info in directory['files']:
+ # Add username to each file object for convenience
+ file_info['username'] = user_data.get('username', 'Unknown')
+ all_transfers.append(file_info)
+
+ return jsonify({"transfers": all_transfers})
+
+ except Exception as e:
+ print(f"Error fetching download status: {e}")
+ return jsonify({"error": str(e)}), 500
+
+@app.route('/api/downloads/cancel', methods=['POST'])
+def cancel_download():
+ """
+ Cancel a specific download transfer, matching GUI functionality.
+ """
+ data = request.get_json()
+ if not data:
+ return jsonify({"success": False, "error": "No data provided."}), 400
+
+ download_id = data.get('download_id')
+ username = data.get('username')
+
+ if not all([download_id, username]):
+ return jsonify({"success": False, "error": "Missing download_id or username."}), 400
+
+ try:
+ # Call the same client method the GUI uses
+ success = asyncio.run(soulseek_client.cancel_download(download_id, username, remove=True))
+ if success:
+ return jsonify({"success": True, "message": "Download cancelled."})
+ else:
+ return jsonify({"success": False, "error": "Failed to cancel download via slskd."}), 500
+ except Exception as e:
+ print(f"Error cancelling download: {e}")
+ return jsonify({"success": False, "error": str(e)}), 500
+
+@app.route('/api/downloads/clear-finished', methods=['POST'])
+def clear_finished_downloads():
+ """
+ Clear all terminal (completed, cancelled, failed) downloads from slskd.
+ """
+ try:
+ # This single client call handles clearing everything that is no longer active
+ success = asyncio.run(soulseek_client.clear_all_completed_downloads())
+ if success:
+ return jsonify({"success": True, "message": "Finished downloads cleared."})
+ else:
+ return jsonify({"success": False, "error": "Backend failed to clear downloads."}), 500
+ except Exception as e:
+ print(f"Error clearing finished downloads: {e}")
+ return jsonify({"success": False, "error": str(e)}), 500
+
@app.route('/api/artists')
def get_artists():
# Placeholder: returns mock artist data
diff --git a/webui/static/script.js b/webui/static/script.js
index c3287a4f..31bd6bd1 100644
--- a/webui/static/script.js
+++ b/webui/static/script.js
@@ -96,18 +96,26 @@ async function loadPageData(pageId) {
try {
switch (pageId) {
case 'dashboard':
+ // Stop download polling when leaving downloads page
+ stopDownloadPolling();
await loadDashboardData();
break;
case 'sync':
+ // Stop download polling when leaving downloads page
+ stopDownloadPolling();
await loadSyncData();
break;
case 'downloads':
await loadDownloadsData();
break;
case 'artists':
+ // Stop download polling when leaving downloads page
+ stopDownloadPolling();
await loadArtistsData();
break;
case 'settings':
+ // Stop download polling when leaving downloads page
+ stopDownloadPolling();
await loadSettingsData();
break;
}
@@ -921,6 +929,12 @@ async function loadSyncData() {
}
}
+// Download tracking state management - matching GUI functionality
+let activeDownloads = {};
+let finishedDownloads = {};
+let downloadStatusInterval = null;
+let isDownloadPollingActive = false;
+
async function loadDownloadsData() {
// Downloads page loads search results dynamically
console.log('Downloads page loaded');
@@ -928,6 +942,7 @@ async function loadDownloadsData() {
// Connect downloads search button
const searchButton = document.getElementById('downloads-search-btn');
const searchInput = document.getElementById('downloads-search-input');
+ const clearButton = document.querySelector('.controls-panel__clear-btn');
if (searchButton && searchInput) {
searchButton.addEventListener('click', performDownloadsSearch);
@@ -935,6 +950,264 @@ async function loadDownloadsData() {
if (e.key === 'Enter') performDownloadsSearch();
});
}
+
+ if (clearButton) {
+ clearButton.addEventListener('click', clearFinishedDownloads);
+ }
+
+ // Start sophisticated polling system (1-second interval like GUI)
+ startDownloadPolling();
+
+ // Initialize tab management
+ initializeDownloadTabs();
+}
+
+function startDownloadPolling() {
+ if (isDownloadPollingActive) return;
+
+ console.log('Starting download status polling (1-second interval)');
+ isDownloadPollingActive = true;
+
+ // Initial call
+ updateDownloadQueues();
+
+ // Start 1-second polling (matching GUI's 1000ms timer)
+ downloadStatusInterval = setInterval(updateDownloadQueues, 1000);
+}
+
+function stopDownloadPolling() {
+ if (downloadStatusInterval) {
+ clearInterval(downloadStatusInterval);
+ downloadStatusInterval = null;
+ }
+ isDownloadPollingActive = false;
+ console.log('Stopped download status polling');
+}
+
+async function updateDownloadQueues() {
+ try {
+ const response = await fetch('/api/downloads/status');
+ const data = await response.json();
+
+ if (data.error) {
+ console.error("Error fetching download status:", data.error);
+ return;
+ }
+
+ const newActive = {};
+ const newFinished = {};
+
+ // Terminal states matching GUI logic
+ const terminalStates = ['Completed', 'Succeeded', 'Cancelled', 'Canceled', 'Failed', 'Errored'];
+
+ // Process transfers exactly like GUI
+ data.transfers.forEach(item => {
+ const isTerminal = terminalStates.some(state =>
+ item.state && item.state.includes(state)
+ );
+
+ if (isTerminal) {
+ newFinished[item.id] = item;
+ } else {
+ newActive[item.id] = item;
+ }
+ });
+
+ // Update global state
+ activeDownloads = newActive;
+ finishedDownloads = newFinished;
+
+ // Render both queues
+ renderQueue('active-queue', activeDownloads, true);
+ renderQueue('finished-queue', finishedDownloads, false);
+
+ // Update tab counts
+ updateTabCounts();
+
+ // Update stats in the side panel
+ updateDownloadStats();
+
+ } catch (error) {
+ // Only log errors occasionally to avoid console spam
+ if (Math.random() < 0.1) {
+ console.error("Failed to update download queues:", error);
+ }
+ }
+}
+
+function renderQueue(containerId, downloads, isActiveQueue) {
+ const container = document.getElementById(containerId);
+ if (!container) return;
+
+ const downloadIds = Object.keys(downloads);
+
+ if (downloadIds.length === 0) {
+ container.innerHTML = `${isActiveQueue ? 'No active downloads.' : 'No finished downloads.'}
`;
+ return;
+ }
+
+ let html = '';
+ for (const id of downloadIds) {
+ const item = downloads[id];
+ const title = item.filename ? item.filename.split(/[\\/]/).pop() : 'Unknown File';
+ const progress = item.percentComplete || 0;
+ const bytesTransferred = item.bytesTransferred || 0;
+ const totalBytes = item.size || 0;
+ const speed = item.averageSpeed || 0;
+
+ // Format file size
+ const formatSize = (bytes) => {
+ if (!bytes) return 'Unknown size';
+ const units = ['B', 'KB', 'MB', 'GB'];
+ let size = bytes;
+ let unitIndex = 0;
+ while (size >= 1024 && unitIndex < units.length - 1) {
+ size /= 1024;
+ unitIndex++;
+ }
+ return `${size.toFixed(1)} ${units[unitIndex]}`;
+ };
+
+ // Format speed
+ const formatSpeed = (bytesPerSecond) => {
+ if (!bytesPerSecond || bytesPerSecond <= 0) return '';
+ return `${formatSize(bytesPerSecond)}/s`;
+ };
+
+ let actionButtonHTML = '';
+ if (isActiveQueue) {
+ // Active items get progress bar and cancel button
+ actionButtonHTML = `
+
+
+
+ ${item.state} - ${progress.toFixed(1)}%
+ ${speed > 0 ? `• ${formatSpeed(speed)}` : ''}
+ ${totalBytes > 0 ? `• ${formatSize(bytesTransferred)} / ${formatSize(totalBytes)}` : ''}
+
+
+ ${item.state}
+
+
+ `;
+ }
+
+ html += `
+
+
+
+ ${actionButtonHTML}
+
+