Merge pull request #2 from L3v3L/feature-fallback-to-url

Author: L3v3L

.github/release.yml

@@ -1 +1,12 @@
+# .github/release.yml
 
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - octocat
+  categories:
+    - title: Changes
+      labels:
+        - "*"

foo_last_list_smp.js

@@ -6,7 +6,7 @@ include('main\\last_list\\last_list_button.js');
 window.DefineScript("Last List",
     {
         author: "Ivo Barros",
-        version: "0.4",
+        version: "0.5",
     });
 
 const lastList = new _lastList();

main/last_list/last_list.js

@@ -100,10 +100,11 @@ function _lastList() {
         });
 
         // regex patterns to match
-        let regexElement = /data-youtube-id=[^>]*>/gmi;
-        let regexYoutube = /data-youtube-id=\"([^\"]*)\"/gmi;
-        let regexTitle = /data-track-name=\"([^\"]*)\"/gmi;
-        let regexArtist = /data-artist-name=\"([^\"]*)\"/gmi;
+        let regexElement = /<tr\s((.|\n)*?)chartlist-love-button((.|\n)*?)<\/tr>/gmi;
+        let regexYoutube = /data-youtube-id=\"(.*?)\"/gmi;
+        let regexTitle = /data-track-name=\"(.*?)\"/gmi;
+        let regexArtist = /data-artist-name=\"(.*?)\"/gmi;
+        let regexFallBack = /href=\"\/music\/([^\/]+)\/_\/([^\"]+)\"/gmi;
 
         // create playlist
         let playlist = plman.FindOrCreatePlaylist(playlistName, false);
@@ -127,29 +128,44 @@ function _lastList() {
                         let matches = [...content.matchAll(regexElement)];
                         this.log(`${matches.length} matches found`);
                         matches.every((match) => {
-
+                            // get track info from youtube data element
                             let youtube = [...match[0].matchAll(regexYoutube)];
                             let title = [...match[0].matchAll(regexTitle)];
                             let artist = [...match[0].matchAll(regexArtist)];
 
-                            // TODO what if only youtube doesn't exist but have track in library?
-                            if (title.length == 0 || artist.length == 0 || youtube.length == 0) {
+                            if (title.length && artist.length) {
+                                // clean strings
+                                title = this.cleanString(decodeURI(title[0][1]));
+                                artist = this.cleanString(decodeURI(artist[0][1]));
+                            } else { // fallback to href if youtube data element is not available
+                                let fallbackData = [...match[0].matchAll(regexFallBack)];
+                                if (!fallbackData.length) {
+                                    return true;
+                                }
+                                // clean strings
+                                artist = decodeURIComponent(fallbackData[0][1]).replace(/\+/g, " ");
+                                title = decodeURIComponent(fallbackData[0][2]).replace(/\+/g, " ");
+                            }
+
+                            // if no title or artist, skip
+                            if (!title.length || !artist.length) {
                                 return true;
                             }
 
-                            youtube = youtube[0][1];
-                            title = this.cleanString(decodeURI(title[0][1]));
-                            artist = this.cleanString(decodeURI(artist[0][1]));
+                            // get file from library
+                            let file = indexedLibrary[`${artist.toLowerCase()} - ${title.toLowerCase()}`];
+                            // if no file and no youtube link, skip
+                            if (!file && !youtube.length) {
+                                return true;
+                            }
 
                             // add to items to add
-                            if (artist.length && title.length) {
-                                itemsToAdd.push({
-                                    youtube: youtube,
-                                    title: title,
-                                    artist: artist,
-                                    file: indexedLibrary[`${artist.toLowerCase()} - ${title.toLowerCase()}`]
-                                });
-                            }
+                            itemsToAdd.push({
+                                youtube: youtube.length ? youtube[0][1] : null,
+                                title: title,
+                                artist: artist,
+                                file: file
+                            });
 
                             return true;
                         });