Merge pull request #11 from N0chteil/master

👨‍🏭 Special character fix
AngryKiller · Jun 6, 2021 · 0d84b9a · 0d84b9a
2 parents d7e4799 + 1aeb11d
commit 0d84b9a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/itunes-bridge.js b/itunes-bridge.js
@@ -307,7 +307,7 @@ function runScript(req, type, args, isJson) {
         switch(type){
             case "fetch": {
                 if(isJson) {
-                    return JSON.parse(execSync('cscript //Nologo ' + iTunesFetcherScpt + ' ' + req, { encoding: 'utf8'}));
+                    return JSON.parse(decodeURIComponent(execSync('cscript //Nologo ' + iTunesFetcherScpt + ' ' + req, { encoding: 'utf8'})));
                 }else{
                     return execSync('cscript //Nologo ' + iTunesFetcherScpt+' ' + req, { encoding: 'utf8'});
                 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "itunes-bridge",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "A macOS and Windows NodeJS package to control and get informations from iTunes and macOS Music app through AppleScript",
   "main": "itunes-bridge.js",
   "repository": {

diff --git a/wscript/iTunesFetcher.js b/wscript/iTunesFetcher.js
@@ -30,16 +30,16 @@ function getCurrentTrack(){
             }
         }
         json = {
-            "name": currentTrack.name,
-            "artist": currentTrack.artist,
-            "album": currentTrack.album,
+            "name": encodeURIComponent(currentTrack.name),
+            "artist": encodeURIComponent(currentTrack.artist),
+            "album": encodeURIComponent(currentTrack.album),
             "mediaKind": currentTrack.kind,
             "duration": currentTrack.duration,
             "elapsedTime": iTunesApp.PlayerPosition,
             "remainingTime": remainingTime,
-            "genre": currentTrack.genre,
+            "genre": encodeURIComponent(currentTrack.genre),
             "releaseYear": currentTrack.year,
-            "id": currentTrack.name, // I haven't found a way to get the current track ID with iTunes COM :/
+            "id": encodeURIComponent(currentTrack.name), // I haven't found a way to get the current track ID with iTunes COM :/
             "playerState": playerState
         };
     } catch (e) {