-
-
${translate('settings.metadataArchive.status')}:
-
- ${status.isAvailable ? translate('settings.metadataArchive.statusAvailable') : translate('settings.metadataArchive.statusUnavailable')}
-
+
+ ${translate('settings.metadataArchive.status')}:
+
+ ${status.isAvailable ? translate('settings.metadataArchive.statusAvailable') : translate('settings.metadataArchive.statusUnavailable')}
${sizeText}
-
-
- ${translate('settings.metadataArchive.enabled')}:
-
- ${status.isEnabled ? translate('common.enabled') : translate('common.disabled')}
-
-
-
- ${translate('settings.metadataArchive.currentPriority')}:
+
+
+
+ ${translate('settings.metadataArchive.enabled')}:
+
+ ${status.isEnabled ? translate('common.status.enabled') : translate('common.status.disabled')}
+
+
+
+ ${translate('settings.metadataArchive.currentPriority')}:
+
${status.priority === 'archive_db' ? translate('settings.metadataArchive.priorityArchiveDb') : translate('settings.metadataArchive.priorityCivitaiApi')}
-
+
`;
@@ -1012,12 +1026,81 @@ export class SettingsManager {
async downloadMetadataArchive() {
try {
const downloadBtn = document.getElementById('downloadMetadataArchiveBtn');
+
if (downloadBtn) {
downloadBtn.disabled = true;
downloadBtn.textContent = translate('settings.metadataArchive.downloadingButton');
}
+
+ // Show loading with enhanced progress
+ const progressUpdater = state.loadingManager.showEnhancedProgress(translate('settings.metadataArchive.preparing'));
- const response = await fetch('/api/download-metadata-archive', {
+ // Set up WebSocket for progress updates
+ const wsProtocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+ const downloadId = `metadata_archive_${Date.now()}`;
+ const ws = new WebSocket(`${wsProtocol}${window.location.host}/ws/download-progress?id=${downloadId}`);
+
+ let wsConnected = false;
+ let actualDownloadId = downloadId; // Will be updated when WebSocket confirms the ID
+
+ // Promise to wait for WebSocket connection and ID confirmation
+ const wsReady = new Promise((resolve) => {
+ ws.onopen = () => {
+ wsConnected = true;
+ console.log('Connected to metadata archive download progress WebSocket');
+ };
+
+ ws.onmessage = (event) => {
+ const data = JSON.parse(event.data);
+
+ // Handle download ID confirmation
+ if (data.type === 'download_id') {
+ actualDownloadId = data.download_id;
+ console.log(`Connected to metadata archive download progress with ID: ${data.download_id}`);
+ resolve(data.download_id);
+ return;
+ }
+
+ // Handle metadata archive download progress
+ if (data.type === 'metadata_archive_download') {
+ const message = data.message || '';
+
+ // Update progress bar based on stage
+ let progressPercent = 0;
+ if (data.stage === 'download') {
+ // Extract percentage from message if available
+ const percentMatch = data.message.match(/(\d+\.?\d*)%/);
+ if (percentMatch) {
+ progressPercent = Math.min(parseFloat(percentMatch[1]), 90); // Cap at 90% for download
+ } else {
+ progressPercent = 0; // Default download progress
+ }
+ } else if (data.stage === 'extract') {
+ progressPercent = 95; // Near completion for extraction
+ }
+
+ // Update loading manager progress
+ progressUpdater.updateProgress(progressPercent, '', `${message}`);
+ }
+ };
+
+ ws.onerror = (error) => {
+ console.error('WebSocket error:', error);
+ resolve(downloadId); // Fallback to original ID
+ };
+
+ // Timeout fallback
+ setTimeout(() => resolve(downloadId), 5000);
+ });
+
+ ws.onclose = () => {
+ console.log('WebSocket connection closed');
+ };
+
+ // Wait for WebSocket to be ready
+ await wsReady;
+
+ const response = await fetch(`/api/download-metadata-archive?download_id=${encodeURIComponent(actualDownloadId)}`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
@@ -1026,8 +1109,16 @@ export class SettingsManager {
const data = await response.json();
+ // Close WebSocket
+ if (ws.readyState === WebSocket.OPEN) {
+ ws.close();
+ }
+
if (data.success) {
- showNotification(translate('settings.metadataArchive.downloadSuccess'), 'success');
+ // Complete progress
+ await progressUpdater.complete(translate('settings.metadataArchive.downloadComplete'));
+
+ showToast('settings.metadataArchive.downloadSuccess', 'success');
// Update settings in state
state.global.settings.enable_metadata_archive_db = true;
@@ -1041,11 +1132,17 @@ export class SettingsManager {
await this.updateMetadataArchiveStatus();
} else {
- showNotification(translate('settings.metadataArchive.downloadError') + ': ' + data.error, 'error');
+ // Hide loading on error
+ state.loadingManager.hide();
+ showToast('settings.metadataArchive.downloadError' + ': ' + data.error, 'error');
}
} catch (error) {
console.error('Error downloading metadata archive:', error);
- showNotification(translate('settings.metadataArchive.downloadError') + ': ' + error.message, 'error');
+
+ // Hide loading on error
+ state.loadingManager.hide();
+
+ showToast('settings.metadataArchive.downloadError' + ': ' + error.message, 'error');
} finally {
const downloadBtn = document.getElementById('downloadMetadataArchiveBtn');
if (downloadBtn) {
@@ -1077,8 +1174,8 @@ export class SettingsManager {
const data = await response.json();
if (data.success) {
- showNotification(translate('settings.metadataArchive.removeSuccess'), 'success');
-
+ showToast('settings.metadataArchive.removeSuccess', 'success');
+
// Update settings in state
state.global.settings.enable_metadata_archive_db = false;
setStorageItem('settings', state.global.settings);
@@ -1091,11 +1188,11 @@ export class SettingsManager {
await this.updateMetadataArchiveStatus();
} else {
- showNotification(translate('settings.metadataArchive.removeError') + ': ' + data.error, 'error');
+ showToast('settings.metadataArchive.removeError' + ': ' + data.error, 'error');
}
} catch (error) {
console.error('Error removing metadata archive:', error);
- showNotification(translate('settings.metadataArchive.removeError') + ': ' + error.message, 'error');
+ showToast('settings.metadataArchive.removeError' + ': ' + error.message, 'error');
} finally {
const removeBtn = document.getElementById('removeMetadataArchiveBtn');
if (removeBtn) {
diff --git a/templates/components/modals/settings_modal.html b/templates/components/modals/settings_modal.html
index a2f85716..d150c81d 100644
--- a/templates/components/modals/settings_modal.html
+++ b/templates/components/modals/settings_modal.html
@@ -398,28 +398,6 @@