Fix: Extract corrupt file show first error message

ollm · Mar 31, 2024 · b95de2c · b95de2c
1 parent cae6b6c
commit b95de2c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/scripts/dom.js b/scripts/dom.js
@@ -948,6 +948,8 @@ function compressedError(error, showInPage = true)
 			key: 'compressedError',
 			text: language.error.uncompress.title+(error ? ': '+(error.detail || error.message) : ''),
 			duration: 6,
+			update: true,
+			updateShown: true,
 			buttons: [
 				{
 					text: language.buttons.dismiss,

diff --git a/scripts/events.js b/scripts/events.js
@@ -1046,15 +1046,14 @@ function snackbar(config)
 
 		snackbarCurrent = config;
 
-		var duration = config.duration;
+		let duration = config.duration;
 
 		if(duration > 10)
 			duration = 10;
 		else if(duration < 4)
 			duration = 4;
 
 		handlebarsContext.snackbar = config;
-
 		$('.snackbars').html(template.load('snackbar.html'));
 
 		snackbarST = setTimeout(function() {
@@ -1080,7 +1079,7 @@ function snackbar(config)
 	}
 	else	
 	{
-		var isset = false;
+		let isset = false;
 
 		for(let key in snackbarQueue)
 		{
@@ -1093,10 +1092,15 @@ function snackbar(config)
 			}
 		}
 
-		if(!isset && (!snackbarCurrent || (snackbarCurrent.key != config.key || config.update)))
+		if(!isset && (!snackbarCurrent || (snackbarCurrent.key != config.key || (config.update && !config.updateShown))))
 		{
 			snackbarQueue.push(config);
 		}
+		else if(!isset && snackbarCurrent.key == config.key && config.updateShown)
+		{
+			let snackbarText = document.querySelector('.snackbars .snackbar-text');
+			if(snackbarText) snackbarText.innerHTML = config.text;
+		}
 	}
 }
 

diff --git a/scripts/file-manager.js b/scripts/file-manager.js
@@ -215,7 +215,7 @@ var file = function(path, _config = false) {
 			{
 				if(json.mtime == mtime || _isServer)
 				{
-					if(json.error)
+					if(json.error && !this.config.fromThumbnailsGeneration)
 						dom.compressedError({message: json.error}, false);
 
 					return json.files;
@@ -1894,12 +1894,10 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 				if(readSome)
 				{
-					console.timeEnd('read7z: '+_this.path);
+					/*_this.files = _this.filesToMultidimension(files);
+					resolve(_this.files);*/
 
-					_this.files = _this.filesToMultidimension(files);
-					resolve(_this.files);
-
-					_this.saveErrorToCache(error);
+					//_this.saveErrorToCache(error);
 					dom.compressedError(error, false);
 				}
 				else
@@ -1949,17 +1947,16 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 				_this.setProgress(1);
 
+				console.log('extract7z end:'+_this.path);
+
 				resolve();
 
 			}).on('error', function(error) {
 
 				if(extractedSome)
 				{
-					console.timeEnd('extract7z: '+_this.path);
-
-					_this.setProgress(1);
-
-					resolve();
+					/*_this.setProgress(1);
+					resolve();*/
 
 					_this.saveErrorToCache(error);
 					dom.compressedError(error, false);