Merge pull request #4 from regorxxx/input_args

Author: L3v3L

foo_last_list_smp.js

@@ -14,7 +14,7 @@ const lastList = new _lastList();
 // Button
 const buttons = {
     LastListButton: new columnButton(buttonTemplate, 0, "Last List", function () {
-        lastList.run();
+        lastList.run(null, null, null);
     }),
 };
 

main/last_list/last_list.js

@@ -10,18 +10,20 @@ class InputError extends Error {
 
 
 function _lastList() {
+    this.cachedUrls = [];
 
-    this.run = () => {
+    this.run = (url = '', pages = 1, playlistName = 'Last List') => {
         try {
-            let url;
-            try {
-                url = utils.InputBox(0, "Enter the URL:", "Download", '', true);
-            } catch (e) {
-                throw new InputError('Cancelled Input');
-            }
-
             if (!url) {
-                throw new InputError('No URL');
+                try {
+                    url = utils.InputBox(0, "Enter the URL:", "Download", this.cachedUrls.length ? this.cachedUrls[0] : '', true);
+                } catch (e) {
+                    throw new InputError('Cancelled Input');
+                }
+
+                if (!url) {
+                    throw new InputError('No URL');
+                }
             }
 
             // if url has page as parameter, set directPage to true
@@ -39,29 +41,39 @@ function _lastList() {
                 url = url.replace(matches[0][1], "");
             }
 
-            let pages;
-            try {
-                pages = utils.InputBox(0, "Enter the number of pages:", "Download", '1', true);
-            } catch (e) {
-                throw new InputError('Cancelled Input');
-            }
-            pages = parseInt(pages);
-            if (isNaN(pages) || pages < 1) {
-                pages = 1;
-            }
+            if (!pages || isNaN(pages) || pages < 1) {
+                try {
+                    pages = utils.InputBox(0, "Enter the number of pages:", "Download", '1', true);
+                } catch (e) {
+                    throw new InputError('Cancelled Input');
+                }
 
-            let playlistName;
-            try {
-                playlistName = utils.InputBox(0, "Enter the playlist name:", "Download", 'LastList', true);
-            } catch (e) {
-                throw new InputError('Cancelled Input');
+                pages = parseInt(pages);
+                if (isNaN(pages) || pages < 1) {
+                    pages = 1;
+                }
             }
 
             if (!playlistName) {
-                throw new InputError('No playlist name');
+                try {
+                    playlistName = utils.InputBox(0, "Enter the playlist name:", "Download", 'Last List', true);
+                } catch (e) {
+                    throw new InputError('Cancelled Input');
+                }
+
+                if (!playlistName) {
+                    throw new InputError('No playlist name');
+                }
             }
 
             this.scrapeUrl(url, startPage, pages, playlistName);
+
+            // removes url from cache if it exists and slices the cache to 9 items
+            this.cachedUrls = this.cachedUrls.filter((cachedUrl) => {
+                return cachedUrl !== url;
+            }).slice(0, 9);
+            // add url to the beginning of the cache
+            this.cachedUrls.unshift(url);
         } catch (e) {
             if (e instanceof InputError) {
                 // do nothing