fix file name not trimmed - ff doesnt allow leading/trailing space?

2019-02-24 12:54:41 +01:00
parent e7d07a5729
commit c1891e4f00
2 changed files with 15 additions and 5 deletions
@@ -17,8 +17,11 @@ function sanitizeUrl(unsafe) {
 /** Remove the most risky characters from a filename string */
 function cleanFilename(unsafe) {
  return unsafe
+    .replace(/::/g, " - ")
    .replace(/[/\\?*|"'<>:]+/g, " ")
-    .replace(/\s+/g, " ");
+    .replace(/\s+/g, " ")
+    .replace(/[\._-]$/g, "")
+    .trim();
 }

 browser.browserAction.onClicked.addListener((tab) => {  
@@ -26,8 +29,11 @@ browser.browserAction.onClicked.addListener((tab) => {
  const escapedTitle = escapeHtml(tab.title);
  const filename = cleanFilename(tab.title); 
  
-  const content = new Blob([
-`<!DOCTYPE html>
+  console.log(`Escaped URL: "${escapedUrl}"`);
+  console.log(`Escaped title: "${escapedTitle}"`);
+  console.log(`Saving as: "${filename}"`);  
+  
+  const html = `<!DOCTYPE html>
 <html>
 <head>
  <meta charset="utf-8">
@@ -49,7 +55,11 @@ browser.browserAction.onClicked.addListener((tab) => {
  Redirecting to: <a href="${escapedUrl}">${escapedUrl}</a>
 </body>
 </html>
-`]);
+`;
+  
+  const content = new Blob([html]);
+  
+  //console.log(`Generated HTML:\n${html}`);  
     
  browser.downloads.download({
    filename: `${filename}.link.html`,
@@ -2,7 +2,7 @@
  "manifest_version":2,
  "author": "Ondřej Hruška",
  "name":"Save Link to File",
-  "version":"0.3",
+  "version":"0.4",
  "description":"Saves the current page as a HTML file with auto-redirect. It's like a bookmark you can store anywhere on your disk.",
  "icons":{
    "48":"icon-dark.svg",