Use External Mimetype library to identify mimetypes properly

b043a615 · Cédric Le Ninivin · 097e1705 · b043a615 · b043a615 · b043a615
Commit b043a615 authored Jul 17, 2020 by Cédric Le Ninivin
5 changed files
--- a/gadget/gadget_cribjs_page_save_load.html
+++ b/gadget/gadget_cribjs_page_save_load.html
@@ -10,6 +10,7 @@
    <script src="../lib/renderjs.js" type="text/javascript"></script>
    <script src="../lib/jszip.js" type="text/javascript"></script>
    <script src="../lib/FileSaver.js" type="text/javascript"></script>
+    <script src="../lib/mimetype.js" type="text/javascript"></script>
    <script src="../lib/webtorrent.min.js" type="text/javascript"></script>
    <script src="./gadget_global.js" type="text/javascript"></script>


--- a/gadget/gadget_cribjs_page_save_load.js
+++ b/gadget/gadget_cribjs_page_save_load.js
 /*global window, rJS, loopEventListener, RSVP, console, document, saveAs, WebTorrent,
-  File, setInterval, clearInterval*/
+  File, setInterval, clearInterval, mimeType*/
 /*jslint nomen: true, indent: 2, maxerr: 3*/
-(function (window, rJS, loopEventListener, JSZip, FileSaver, WebTorrent) {
+(function (window, rJS, loopEventListener, JSZip, FileSaver, WebTorrent,
+           mimeType) {
  "use strict";

  function getExtension(url) {
@@ -260,16 +261,10 @@
              return zipEntry.async('blob');
            })
            .push(function (result) {
-              if (end_url.endsWith(".js")) {
-                // This is a ugly hack as mimetype needs to be correct for JS
-                result = result.slice(0, result.size, "application/javascript");
-              } else if (end_url.endsWith(".html")) {
-                // This is a ugly hack as mimetype needs to be correct for JS
-                result = result.slice(0, result.size, "text/html");
-              } else if (end_url.endsWith(".css")) {
-                // This is a ugly hack as mimetype needs to be correct for JS
-                result = result.slice(0, result.size, "text/css");
-              }
+              var guessed_type = mimeType.lookup(
+                end_url, false, "application/octet-stream"
+              );
+              result = result.slice(0, result.size, guessed_type);
              return gadget.crib_sw_put(end_url, {blob: result});
            })
        );
@@ -282,6 +277,9 @@
    })
    .push(function () {
      logFunction(gadget, "Loaded " + url_number + " files at " + Date());
+    }, function (e) {
+      console.error(e);
+      logFunction(gadget, "ERROR:</br>" + e.toString());
    });
  }

@@ -367,4 +365,4 @@
          return RSVP.all(promise_list);
        });
    });
-}(window, rJS, loopEventListener, JSZip, FileSaver, WebTorrent));
\ No newline at end of file
+}(window, rJS, loopEventListener, JSZip, FileSaver, WebTorrent, mimeType));
\ No newline at end of file
--- a/gadget/gadget_landing_cribjs.html
+++ b/gadget/gadget_landing_cribjs.html
@@ -9,6 +9,7 @@
    <script src="../lib/rsvp.js"></script>
    <script src="../lib/renderjs.js"></script>
    <script src="../lib/jszip.js" type="text/javascript"></script>
+    <script src="../lib/mimetype.js" type="text/javascript"></script>
    <script src="./gadget_landing_cribjs.js"></script>
  </head>
  <body>

--- a/gadget/gadget_landing_cribjs.js
+++ b/gadget/gadget_landing_cribjs.js
 /*jslint browser: true, indent: 2, maxlen: 80*/
 /*globals RSVP, rJS,
         location, console, fetch, Promise*/
-(function (window, document, RSVP, rJS, location, console, JSZip) {
+(function (window, document, RSVP, rJS, location, console, JSZip, mimeType) {
  "use strict";

  function getExtension(url) {
@@ -38,16 +38,10 @@
          return zipEntry.async('blob');
        })
        .push(function (result) {
-          if (end_url.endsWith(".js")) {
-            // This is a ugly hack as mimetype needs to be correct for JS
-            result = result.slice(0, result.size, "application/javascript");
-          } else if (end_url.endsWith(".html")) {
-            // This is a ugly hack as mimetype needs to be correct for JS
-            result = result.slice(0, result.size, "text/html");
-          } else if (end_url.endsWith(".css")) {
-            // This is a ugly hack as mimetype needs to be correct for JS
-            result = result.slice(0, result.size, "text/css");
-          }
+          var guessed_type = mimeType.lookup(
+            end_url, false, "application/octet-stream"
+          );
+          result = result.slice(0, result.size, guessed_type);
          return gadget.crib_sw_put(end_url, {blob: result});
        })
      );
@@ -113,4 +107,4 @@
      return this.getSetting(argument_list[0], argument_list[1]);
    });

-}(window, document, RSVP, rJS, location, console, JSZip));
\ No newline at end of file
+}(window, document, RSVP, rJS, location, console, JSZip, mimeType));
\ No newline at end of file
--- a/lib/mimetype.js
+++ b/lib/mimetype.js