🤖 mb_caa_dimensions 2022.8.8

refactor: more TypeScript migration (#499)
ROpdebee · Aug 8, 2022 · 75502d6 · 75502d6
1 parent 798966f
commit 75502d6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 42 deletions.
diff --git a/mb_caa_dimensions.changelog.md b/mb_caa_dimensions.changelog.md
@@ -1,3 +1,4 @@
+- **2022.8.8**: Internal changes: more TypeScript migration ([#499](https://github.com/ROpdebee/mb-userscripts/pull/499))
 - **2022.7.27.2**: Bug fix: separate cache key from full-size URL ([#518](https://github.com/ROpdebee/mb-userscripts/pull/518))
 - **2022.7.27**: Internal changes: automatically insert logger boilerplate config ([#514](https://github.com/ROpdebee/mb-userscripts/pull/514))
 - **2022.7.3**: New feature: PDF dimensions and page count ([#496](https://github.com/ROpdebee/mb-userscripts/pull/496))

diff --git a/mb_caa_dimensions.meta.js b/mb_caa_dimensions.meta.js
@@ -1,23 +1,23 @@
 // ==UserScript==
 // @name         MB: Display CAA image dimensions
 // @description  Displays the dimensions and size of images in the cover art archive.
-// @version      2022.7.27.2
+// @version      2022.8.8
 // @author       ROpdebee
 // @license      MIT; https://opensource.org/licenses/MIT
 // @namespace    https://github.com/ROpdebee/mb-userscripts
 // @homepageURL  https://github.com/ROpdebee/mb-userscripts
 // @supportURL   https://github.com/ROpdebee/mb-userscripts/issues
 // @downloadURL  https://raw.github.com/ROpdebee/mb-userscripts/dist/mb_caa_dimensions.user.js
 // @updateURL    https://raw.github.com/ROpdebee/mb-userscripts/dist/mb_caa_dimensions.meta.js
-// @match        *://*.musicbrainz.org/release/*
-// @match        *://*.musicbrainz.org/release-group/*
-// @match        *://*.musicbrainz.org/edit/*
-// @match        *://*.musicbrainz.org/*/edits*
-// @match        *://*.musicbrainz.org/user/*/votes
-// @match        *://*.musicbrainz.org/*/open_edits
-// @exclude      *://*.musicbrainz.org/release/*/edit
-// @exclude      *://*.musicbrainz.org/release/*/edit-relationships
-// @exclude      *://*.musicbrainz.org/release-group/*/edit
+// @include      /^https?://(\w+\.)?musicbrainz\.org/edit/\d+([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/edit/(open|subscribed(_editors)?)([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/(area|artist|collection|event|instrument|label|place|recording|release|release-group|series|work|url)/[a-f\d-]{36}/(open_)?edits([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/user/[^/]+/edits(/\w+)?([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/user/[^/]+/votes([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/search/edits\?.+?(#.+?)?$/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/release(-group)?/[a-f\d-]{36}(/.+?)?([?#]|$)/
+// @exclude      /^https?://(\w+\.)?musicbrainz\.org/release(-group)?/[a-f\d-]{36}/edit([?#]|$)/
+// @exclude      /^https?://(\w+\.)?musicbrainz\.org/release-group/[a-f\d-]{36}/edit-relationships([?#]|$)/
 // @run-at       document-start
 // @grant        none
 // ==/UserScript==
diff --git a/mb_caa_dimensions.metadata.json b/mb_caa_dimensions.metadata.json
@@ -1 +1 @@
-{"version":"2022.7.27.2"}
+{"version":"2022.8.8"}
diff --git a/mb_caa_dimensions.user.js b/mb_caa_dimensions.user.js
@@ -1,23 +1,23 @@
 // ==UserScript==
 // @name         MB: Display CAA image dimensions
 // @description  Displays the dimensions and size of images in the cover art archive.
-// @version      2022.7.27.2
+// @version      2022.8.8
 // @author       ROpdebee
 // @license      MIT; https://opensource.org/licenses/MIT
 // @namespace    https://github.com/ROpdebee/mb-userscripts
 // @homepageURL  https://github.com/ROpdebee/mb-userscripts
 // @supportURL   https://github.com/ROpdebee/mb-userscripts/issues
 // @downloadURL  https://raw.github.com/ROpdebee/mb-userscripts/dist/mb_caa_dimensions.user.js
 // @updateURL    https://raw.github.com/ROpdebee/mb-userscripts/dist/mb_caa_dimensions.meta.js
-// @match        *://*.musicbrainz.org/release/*
-// @match        *://*.musicbrainz.org/release-group/*
-// @match        *://*.musicbrainz.org/edit/*
-// @match        *://*.musicbrainz.org/*/edits*
-// @match        *://*.musicbrainz.org/user/*/votes
-// @match        *://*.musicbrainz.org/*/open_edits
-// @exclude      *://*.musicbrainz.org/release/*/edit
-// @exclude      *://*.musicbrainz.org/release/*/edit-relationships
-// @exclude      *://*.musicbrainz.org/release-group/*/edit
+// @include      /^https?://(\w+\.)?musicbrainz\.org/edit/\d+([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/edit/(open|subscribed(_editors)?)([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/(area|artist|collection|event|instrument|label|place|recording|release|release-group|series|work|url)/[a-f\d-]{36}/(open_)?edits([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/user/[^/]+/edits(/\w+)?([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/user/[^/]+/votes([?#]|$)/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/search/edits\?.+?(#.+?)?$/
+// @include      /^https?://(\w+\.)?musicbrainz\.org/release(-group)?/[a-f\d-]{36}(/.+?)?([?#]|$)/
+// @exclude      /^https?://(\w+\.)?musicbrainz\.org/release(-group)?/[a-f\d-]{36}/edit([?#]|$)/
+// @exclude      /^https?://(\w+\.)?musicbrainz\.org/release-group/[a-f\d-]{36}/edit-relationships([?#]|$)/
 // @run-at       document-start
 // @grant        none
 // ==/UserScript==
@@ -535,32 +535,19 @@
   })();
 
   function setupExports(cachePromise) {
-    const loadImageDimensions = _async(function (imgUrl) {
-      return _await(getCAAImageInfo(imgUrl), function (imageInfo) {
-        var _imageInfo$dimensions;
-
-        return _objectSpread2(_objectSpread2({
-          url: imgUrl
-        }, (_imageInfo$dimensions = imageInfo.dimensions) !== null && _imageInfo$dimensions !== void 0 ? _imageInfo$dimensions : {
-          width: 0,
-          height: 0
-        }), {}, {
-          size: imageInfo.size,
-          format: imageInfo.fileType
-        });
+    const getImageDimensions = function getImageDimensions(imgUrl) {
+      return _await(cachePromise, function (cache) {
+        const image = new CAAImage(imgUrl, cache);
+        return image.getDimensions();
       });
-    });
-
-    const getCAAImageInfo = _async(function (imgUrl) {
-      if (new URL(imgUrl).hostname !== 'archive.org') {
-        throw new Error('Unsupported URL: Need direct image URL');
-      }
+    };
 
+    const getCAAImageInfo = function getCAAImageInfo(imgUrl) {
       return _await(cachePromise, function (cache) {
         const image = new CAAImage(imgUrl, cache);
         return image.getImageInfo();
       });
-    });
+    };
 
     function getDimensionsWhenInView(imgElement) {
       logFailure(cachePromise.then(cache => {
@@ -570,7 +557,7 @@
     }
 
     window.ROpdebee_getDimensionsWhenInView = getDimensionsWhenInView;
-    window.ROpdebee_loadImageDimensions = loadImageDimensions;
+    window.ROpdebee_getImageDimensions = getImageDimensions;
     window.ROpdebee_getCAAImageInfo = getCAAImageInfo;
   }