Merge pull request #21 from L3v3L/develop

L3v3L · Mar 6, 2023 · f6e8ee2 · f6e8ee2 · regorxxx · Mar 8, 2023
2 parents ca21707 + 05e5d28
commit f6e8ee2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1",
+    "version": "1.2",
     "name": "foo-last-list-smp",
     "author": "Ivo Barros",
     "id": "{152DE6E6-A5D6-4434-88D8-E9FF00130BF9}",

diff --git a/scripts/LastList.js b/scripts/LastList.js
@@ -2,10 +2,10 @@
 
 include('InputError.js');
 include('LastListHelpers.js');
+include('LastListCache.js');
 
 class LastList {
     constructor({ url = '', pages = 1, playlistName = 'Last List', cacheTime = 86400000 } = {}) {
-        this.cachedUrls = [];
         this.url = url;
         this.pages = pages;
         this.playlistName = playlistName;
@@ -16,9 +16,9 @@ class LastList {
         try {
             if (!this.url) {
                 try {
-                    this.url = utils.InputBox(0, "Enter the URL:", "Download", this.cachedUrls.length ? this.cachedUrls[0] : '', true);
+                    this.url = utils.InputBox(0, "Enter the URL:", "Download", '', true);
                 } catch (e) {
-                    throw new InputError('Cancelled Input');
+                    throw new InputError('Canceled Input');
                 }
 
                 if (!this.url) {
@@ -45,7 +45,7 @@ class LastList {
                 try {
                     this.pages = utils.InputBox(0, "Enter the number of pages:", "Download", '1', true);
                 } catch (e) {
-                    throw new InputError('Cancelled Input');
+                    throw new InputError('Canceled Input');
                 }
 
                 this.pages = parseInt(this.pages);
@@ -58,7 +58,7 @@ class LastList {
                 try {
                     this.playlistName = utils.InputBox(0, "Enter the playlist name:", "Download", 'Last List', true);
                 } catch (e) {
-                    throw new InputError('Cancelled Input');
+                    throw new InputError('Canceled Input');
                 }
 
                 if (!this.playlistName) {
@@ -67,13 +67,6 @@ class LastList {
             }
 
             this.scrapeUrl(this.url, startPage, this.pages, this.playlistName, this.cacheTime);
-
-            // removes url from cache if it exists and slices the cache to 9 items
-            this.cachedUrls = this.cachedUrls.filter((cachedUrl) => {
-                return cachedUrl !== this.url;
-            }).slice(0, 9);
-            // add url to the beginning of the cache
-            this.cachedUrls.unshift(this.url);
         } catch (e) {
             if (e instanceof InputError) {
                 // do nothing
@@ -182,8 +175,8 @@ class LastList {
 
                 xmlhttp.open("GET", urlToUse, true);
                 xmlhttp.onreadystatechange = () => {
-                    this.log(`Cached Not Used`);
                     if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+                        this.log(`Cached Not Used`);
                         this.log(`searching page ${i}...`);
                         let content = xmlhttp.responseText;
                         // check if content is json

diff --git a/scripts/LastListMenu.js b/scripts/LastListMenu.js
@@ -70,8 +70,7 @@ class LastListMenu {
                     {
                         menuName: playingSubMenu,
                         entryText: config.entryText,
-                        func: () => { config.lastList.run() },
-                        flags: MF_STRING
+                        func: () => { config.lastList.run() }
                     }
                 );
 
@@ -93,8 +92,7 @@ class LastListMenu {
                     {
                         menuName: selectedSubMenu,
                         entryText: config.entryText,
-                        func: () => { config.lastList.run() },
-                        flags: MF_STRING
+                        func: () => { config.lastList.run() }
                     }
                 );
 
@@ -119,7 +117,9 @@ class LastListMenu {
         menu = this.createQuestionButton(menu, customArtistSubMenu, 'Similar Artists', ['Enter Artist'], 'ARTIST_SIMILAR');
         menu = this.createQuestionButton(menu, customArtistSubMenu, 'Album', ['Enter Artist', 'Enter Album'], 'ALBUM_TRACKS');
 
-        menu = this.createQuestionButton(menu, 'main', 'Custom Tag', ['Enter Last.fm Tag'], 'TAG_TRACKS');
+        let customTagSubMenu = menu.newMenu('Custom Tag');
+        menu = this.createQuestionButton(menu, customTagSubMenu, 'Top Tracks', ['Enter Last.fm Tag'], 'TAG_TRACKS');
+        menu = this.createQuestionButton(menu, customTagSubMenu, 'Random Tracks', ['Enter Last.fm Tag'], 'TAG_RADIO');
 
         menu.newEntry({ entryText: 'sep' });
         let lastFMGlobalSubMenu = menu.newMenu('Last.fm Global');