Updated dependencies, JS backwards compatibility

Marekkon5 · Nov 8, 2020 · 24bf526 · 24bf526
1 parent 8ab595e
commit 24bf526
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 47 deletions.
diff --git a/html/index.html b/html/index.html
@@ -22,7 +22,7 @@ <h2>SETTINGS</h2>
                     <input type="checkbox" id="replaceArt">
                     <label for="replaceArt" class="checkbox-label">Replace
                         Album Art
-</label>
+                    </label>
                     <span class="checkbox-custom circular"></span>
                 </label>
             </div>
@@ -109,45 +109,55 @@ <h2>TAGS</h2>
     </body>
     <script>
 
-function start() {
-    pywebview.api.start();
-}
-
-function toggleButton() {
-    document.getElementById('startButton').disabled = !document.getElementById('startButton').disabled;
-}
-
-function browse() {
-    pywebview.api.browseFolder().then((res) => {
-        document.getElementById('path').value = res
-    });
-}
-
-function updateProgress(v, s, f) {
-    document.getElementById('progress').value = v;
-    document.getElementById('percent').innerText = v;
-    document.getElementById('success').innerText = s;
-    document.getElementById('failed').innerText = f;
-}
-
-function getConfig() {
-    config = {
-        tags: [
-            ...(document.getElementById('updateTitle').checked?['title']:[]),
-            ...(document.getElementById('updateArtists').checked?['artist']:[]),
-            ...(document.getElementById('updateAlbum').checked?['album']:[]),
-            ...(document.getElementById('updateLabel').checked?['label']:[]),
-            ...(document.getElementById('updateBPM').checked?['bpm']:[]),
-            ...(document.getElementById('updateGenre').checked?['genre']:[]),
-            ...(document.getElementById('updateDate').checked?['date']:[]),
-            ...(document.getElementById('updateKey').checked?['key']:[])
-        ],
-        artResolution: document.getElementById('artResolution').value,
-        replaceArt: document.getElementById('replaceArt').checked,
-        artistSeparator: document.getElementById('artistSeparator').value,
-        fuzziness: parseInt(document.getElementById('fuzziness').value, 10)
-    };
-    return config;
-}
-
-</script>
+        function start() {
+            pywebview.api.start();
+        }
+
+        function toggleButton() {
+            document.getElementById('startButton').disabled = !document.getElementById('startButton').disabled;
+        }
+
+        function browse() {
+            pywebview.api.browseFolder().then(function (path) {
+                document.getElementById('path').value = path;
+            });  
+        }
+
+        function updateProgress(v, s, f) {
+            document.getElementById('progress').value = v;
+            document.getElementById('percent').innerText = v;
+            document.getElementById('success').innerText = s;
+            document.getElementById('failed').innerText = f;
+        }
+
+        function getConfig() {
+            var config =  {
+                tags: [],
+                artResolution: document.getElementById('artResolution').value,
+                replaceArt: document.getElementById('replaceArt').checked,
+                artistSeparator: document.getElementById('artistSeparator').value,
+                fuzziness: parseInt(document.getElementById('fuzziness').value, 10)
+            };
+            //Add tags
+            if (document.getElementById('updateTitle').checked)
+                config.tags.push('title');
+            if (document.getElementById('updateArtists').checked)
+                config.tags.push('artist');
+            if (document.getElementById('updateAlbum').checked)
+                config.tags.push('album')
+            if (document.getElementById('updateLabel').checked)
+                config.tags.push('label')
+            if (document.getElementById('updateBPM').checked)
+                config.tags.push('bpm')
+            if (document.getElementById('updateGenre').checked)
+                config.tags.push('genre')
+            if (document.getElementById('updateDate').checked)
+                config.tags.push('date')
+            if (document.getElementById('updateKey').checked)
+                config.tags.push('key')
+
+            return config;
+        }
+
+    </script>        
+</html>
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-requests==2.22.0
-fuzzywuzzy==0.17.0
-mutagen==1.42.0
-pywebview==3.3.3
+requests==2.24.0
+fuzzywuzzy==0.18.0
+mutagen==1.45.1
+pywebview==3.3.5
 beautifulsoup4==4.9.3
 PyQt5==5.15.1
 lxml==4.6.1