|
|
@@ -49,15 +49,18 @@ singlefile.download = (() => {
|
|
|
return downloadPage(message, { confirmFilename: message.confirmFilename, incognito: sender.tab.incognito, filenameConflictAction: message.filenameConflictAction })
|
|
|
.catch(error => {
|
|
|
if (error.message) {
|
|
|
- if (!error.message.toLowerCase().includes("canceled")) {
|
|
|
- if (error.message.includes("'incognito'")) {
|
|
|
- return downloadPage(message, { confirmFilename: message.confirmFilename, filenameConflictAction: message.filenameConflictAction });
|
|
|
- } else if (error.message == "conflictAction prompt not yet implemented") {
|
|
|
- return downloadPage(message, { confirmFilename: message.confirmFilename });
|
|
|
- } else {
|
|
|
- throw error;
|
|
|
- }
|
|
|
+ if (error.message.includes("'incognito'")) {
|
|
|
+ return downloadPage(message, { confirmFilename: message.confirmFilename, filenameConflictAction: message.filenameConflictAction });
|
|
|
+ } else if (error.message == "conflictAction prompt not yet implemented") {
|
|
|
+ return downloadPage(message, { confirmFilename: message.confirmFilename });
|
|
|
+ } else if (error.message.includes("illegal characters")) {
|
|
|
+ message.filename = message.filename.replace(/,/, "_").replace(/[^\x00-\x7f]+/g, "_"); // eslint-disable-line no-control-regex
|
|
|
+ return downloadPage(message, { confirmFilename: message.confirmFilename, incognito: sender.tab.incognito, filenameConflictAction: message.filenameConflictAction });
|
|
|
+ } else {
|
|
|
+ throw error;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ throw error;
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -78,11 +81,7 @@ singlefile.download = (() => {
|
|
|
} catch (error) {
|
|
|
if (error.message) {
|
|
|
if (!error.message.toLowerCase().includes("canceled")) {
|
|
|
- if (error.message.includes("'incognito'")) {
|
|
|
- return downloadPage(page, { confirmFilename: options.confirmFilename, filenameConflictAction: options.filenameConflictAction });
|
|
|
- } else {
|
|
|
- throw error;
|
|
|
- }
|
|
|
+ throw error;
|
|
|
}
|
|
|
} else {
|
|
|
throw error;
|