Fixed issues with the elapsed time

kkevinm · Aug 8, 2020 · 3a31963 · 3a31963
1 parent 109e363
commit 3a31963
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.kevinmussi</groupId>
     <artifactId>itunes-discord-rp</artifactId>
-    <version>1.5.4</version>
+    <version>1.5.5</version>
     <packaging>jar</packaging>
     <name>iTunes Discord RP</name>
     <properties>

diff --git a/src/main/resources/scripts/macos/itunes_track_info_script.applescript b/src/main/resources/scripts/macos/itunes_track_info_script.applescript
@@ -4,9 +4,6 @@ set STR_PAUSED to "PAUSED"
 
 set state to ""
 
-property savedTrack : missing value
-property savedPlayerState : missing value
-
 repeat
     delay 1
     # If iTunes is not running, set the state to "STOPPED" and do nothing
@@ -28,23 +25,14 @@ repeat
                         log state
                     end if
                 else
-                	set currentTrack to current track
-
-                    # If the current song or the player status has changed, log the new track information
-                    if currentPlayerState is not savedPlayerState or currentTrack is not savedTrack then
-                        if currentPlayerState is playing then
-                            set state to STR_PLAYING
-                        else
-                            set state to STR_PAUSED
-                        end if
-
-                        # Write the track main information in the log
-                        log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
+                    if currentPlayerState is playing then
+                        set state to STR_PLAYING
+                    else
+                        set state to STR_PAUSED
                     end if
-
-                    # Update the player state and song name to detect when the track changes
-                    set savedPlayerState to currentPlayerState
-                    set savedTrack to currentTrack
+
+                    # Write the track main information in the log
+                    log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
                 end if
             end tell
         on error

diff --git a/src/main/resources/scripts/macos15/itunes_track_info_script.applescript b/src/main/resources/scripts/macos15/itunes_track_info_script.applescript
@@ -4,9 +4,6 @@ set STR_PAUSED to "PAUSED"
 
 set state to ""
 
-property savedTrack : missing value
-property savedPlayerState : missing value
-
 repeat
     delay 1
     # If iTunes is not running, set the state to "STOPPED" and do nothing
@@ -28,23 +25,14 @@ repeat
                         log state
                     end if
                 else
-                	set currentTrack to current track
-
-                    # If the current song or the player status has changed, log the new track information
-                    if currentPlayerState is not savedPlayerState or currentTrack is not savedTrack then
-                        if currentPlayerState is playing then
-                            set state to STR_PLAYING
-                        else
-                            set state to STR_PAUSED
-                        end if
-
-                        # Write the track main information in the log
-                        log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
+                    if currentPlayerState is playing then
+                        set state to STR_PLAYING
+                    else
+                        set state to STR_PAUSED
                     end if
-
-                    # Update the player state and song name to detect when the track changes
-                    set savedPlayerState to currentPlayerState
-                    set savedTrack to currentTrack
+
+                    # Write the track main information in the log
+                    log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
                 end if
             end tell
         on error

diff --git a/src/main/resources/scripts/windows/itunes_track_info_script.js b/src/main/resources/scripts/windows/itunes_track_info_script.js
@@ -2,8 +2,6 @@ var sQuery = "SELECT * FROM Win32_Process WHERE Name = 'iTunes.exe'";
 var stderr = WScript.CreateObject("Scripting.FileSystemObject").GetStandardStream(2);
 
 var iTunesApp = null;
-var savedTrack = null;
-var savedState = null;
 var state = "";
 
 function WaitForITunes() {
@@ -31,10 +29,7 @@ function MainLoop() {
                 var playerState = iTunesApp.PlayerState;
                 if(currentTrack == null || playerState == null) {
                     LogStopped();
-                } else if(!EqualTracks(currentTrack, savedTrack) || playerState != savedState) {
-                    savedTrack = currentTrack;
-                    savedState = playerState;
-
+                } else {
                     if(playerState == 0) {
                         state = "PAUSED";
                     } else {
@@ -49,8 +44,6 @@ function MainLoop() {
             } catch(err) {
                 // If iTunes stops, reset the variables and do nothing
                 iTunesApp = null;
-                savedTrack = null;
-                savedState = null;
             }
         }
     }
@@ -63,15 +56,5 @@ function LogStopped() {
     }
 }
 
-function EqualTracks(track1, track2) {
-    if((track1 == null && track2 != null) || (track1 != null && track2 == null)) {
-        return false;
-    } else if(track1 == null && track2 == null) {
-        return true;
-    } else {
-        return track1.Name == track2.Name && track1.Artist == track2.Artist && track1.Album == track2.Album;
-    }
-}
-
 WaitForITunes();
 MainLoop();