Merge branch 'master' into fix/narrow-down-bandcamp-importer

Author: arsinclair

bandcamp_importer.user.js

@@ -291,6 +291,27 @@ if (window.location.hostname === 'web.archive.org') {
     });
 }
 
+/**
+ * Bandcamp URLs can be relative or absolute. This function normalizes them to always be relative to the hostname.
+ */
+const getPathName = url => {
+    if (url.startsWith('/')) {
+        return url.split('?')[0].split('#')[0];
+    } else if (url.startsWith('http')) {
+        const parsed = new URL(url);
+        return parsed.pathname;
+    }
+    return null;
+};
+
+const getHostname = url => {
+    if (url.startsWith('http')) {
+        const parsed = new URL(url);
+        return `${parsed.protocol}//${parsed.hostname}`;
+    }
+    return null;
+};
+
 $(document).ready(function () {
     /* keep the following line as first, it is required to skip
      * pages which aren't actually a bandcamp page, since we support
@@ -310,9 +331,13 @@ $(document).ready(function () {
         $('ol#music-grid > li > a').each(function () {
             const $link = $(this);
             const bandcampReleaseUrl = $link.attr('href');
+            const pathName = getPathName(bandcampReleaseUrl);
+
+            if (pathName && pathName.match(/^(\/album|\/track)/)) {
+                const isRelative = bandcampReleaseUrl.startsWith('/');
+                const linkHostname = isRelative ? hostname : getHostname(bandcampReleaseUrl);
+                const full_url = linkHostname + pathName;
 
-            if (bandcampReleaseUrl && bandcampReleaseUrl.match(/^(\/album|\/track)/)) {
-                const full_url = hostname + bandcampReleaseUrl;
                 urls_data.push({
                     url: full_url,
                     mb_type: 'release',

discogs_importer.user.js

@@ -2,7 +2,7 @@
 
 // @name         Import Discogs releases to MusicBrainz
 // @description  Add a button to import Discogs releases to MusicBrainz and add links to matching MusicBrainz entities for various Discogs entities (artist,release,master,label)
-// @version      2025.07.01.1
+// @version      2025.08.13
 // @namespace    http://userscripts.org/users/22504
 // @downloadURL  https://raw.githubusercontent.com/murdos/musicbrainz-userscripts/master/discogs_importer.user.js
 // @updateURL    https://raw.githubusercontent.com/murdos/musicbrainz-userscripts/master/discogs_importer.user.js
@@ -469,6 +469,14 @@ function insertMBSection(release, current_page_key) {
     $('form.musicbrainz_import_search').css({ float: 'right' });
     $('form.musicbrainz_import > button').css({ width: '100%', 'box-sizing': 'border-box' });
 
+    // Fix tracklist with long credits text overlap issue by setting track height to auto
+    const tracklistCss = `
+        [class*="trackCredits"][class*="expanded"] {
+            height: auto !important;
+        }
+    `;
+    document.head.insertAdjacentHTML('beforeend', `<style>${tracklistCss}</style>`);
+
     mbUI.slideDown();
 }