skipped csv

JeanBaptiste-dlb · Oct 23, 2022 · ef4f253 · ef4f253
1 parent 4d41f33
commit ef4f253
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/backend/src/model/decision_maker.py b/backend/src/model/decision_maker.py
@@ -0,0 +1,41 @@
+from backend.src.config import settings
+from backend.src.spotify_api.api_interface import SPOTIFY_API_INTERFACE
+import pandas as pd
+
+
+class DecisionLoop:
+    def __init__(self):
+        self.scope = settings.scope
+        self.skiped = pd.DataFrame()
+        self.played_emtirely = pd.DataFrame()
+        self.interface = SPOTIFY_API_INTERFACE()
+        self.current_song = None
+        self.previous_song = None
+        self.end_time = 0
+        self.all_skipped = []
+        self.all_non_skipped = []
+        self.next_song = None
+        Path(settings.APP_PATH)
+
+    def decision_maker(self):
+        while True:
+            next_song = self.interface.get_next_song()
+            if next_song != self.next_song:
+                self.next_song = next_song
+                skipped = self.interface.is_song_skipped(song_id)
+                # true or false
+                if skipped:
+                    with open
+
+
+
+
+
+
+
+
+
+        sleep(5)
+
+
+
diff --git a/backend/src/model/decision_template.py b/backend/src/model/decision_template.py
diff --git a/backend/src/spotify_api/api_interface.py b/backend/src/spotify_api/api_interface.py
@@ -155,7 +155,7 @@ def get_metadata(self, track_id):
         self.sp._update_scope("user-read-currently-playing")
         name = self.sp.currently_playing()["item"]["name"]
         album_title = self.sp.currently_playing()["item"]["album"][""]
-        metadata={"name": name}
+        metadata = {"name": name}
         return metadata
 
 
diff --git a/backend/src/spotify_api/skip_listener.py b/backend/src/spotify_api/skip_listener.py
@@ -40,11 +40,13 @@ def listen(self):
                 else:
                     self.previous_song = self.current_song
             else:
-                self.previous_song = self.current_song
                 self.current_song = self.interface.get_current_song()
+                self.previous_song = self.current_song
                 self.update_end_time()
                 self.all_non_skipped.append(self.previous_song)
                 self.previous_song["date_saved"] = str(datetime.now())
+                self.interface.save_song_features(self.previous_song,
+                                                  "NOT SKIPPEP")
                 self.save_all_non_skipped()
                 print("not_skipped")
             time.sleep(1)

diff --git a/data/player_data/non_skipped.csv b/data/player_data/non_skipped.csv
@@ -1,3 +1,3 @@
 ,danceability,energy,key,loudness,mode,speechiness,acousticness,instrumentalness,liveness,valence,tempo,type,id,uri,track_href,analysis_url,duration_ms,time_signature,skip_state,date_saved,skip_probability
-0,0.682,0.0987,1,-22.723,1,0.612,0.133,0,0.105,0.396,100.247,audio_features,5ZxX55HFfi4aofGTxMp58x,spotify:track:5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/tracks/5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/audio-analysis/5ZxX55HFfi4aofGTxMp58x,33107,5,SKIPPEP,2022-10-23 11:09:07.142544,0
-1,0.74,0.266,1,-17.222,1,0.947,0.986,0,0.508,0.963,70.633,audio_features,0EgkVzDidmq4MP57jZFeik,spotify:track:0EgkVzDidmq4MP57jZFeik,https://api.spotify.com/v1/tracks/0EgkVzDidmq4MP57jZFeik,https://api.spotify.com/v1/audio-analysis/0EgkVzDidmq4MP57jZFeik,22747,3,SKIPPEP,2022-10-23 11:09:09.500457,0
+0,0.702,0.823,11,-3.329,1,0.473,0.198,0.0,0.163,0.323,160.995,audio_features,7zlvNFYfOu0aK1kxDAHnu6,spotify:track:7zlvNFYfOu0aK1kxDAHnu6,https://api.spotify.com/v1/tracks/7zlvNFYfOu0aK1kxDAHnu6,https://api.spotify.com/v1/audio-analysis/7zlvNFYfOu0aK1kxDAHnu6,58280,4,SKIPPEP,2022-10-23 11:46:33.359512,0
+1,0.466,0.576,2,-10.491,1,0.408,0.126,0.000334,0.175,0.832,180.084,audio_features,2IoSF6KSDcw5V9eVSxgsm0,spotify:track:2IoSF6KSDcw5V9eVSxgsm0,https://api.spotify.com/v1/tracks/2IoSF6KSDcw5V9eVSxgsm0,https://api.spotify.com/v1/audio-analysis/2IoSF6KSDcw5V9eVSxgsm0,55147,4,SKIPPEP,2022-10-23 11:53:45.461116,0
diff --git a/data/player_data/skipped.csv b/data/player_data/skipped.csv
@@ -1,4 +1,3 @@
 ,danceability,energy,key,loudness,mode,speechiness,acousticness,instrumentalness,liveness,valence,tempo,type,id,uri,track_href,analysis_url,duration_ms,time_signature,skip_state,date_saved,skip_probability
-0,0.682,0.0987,1,-22.723,1,0.612,0.133,0,0.105,0.396,100.247,audio_features,5ZxX55HFfi4aofGTxMp58x,spotify:track:5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/tracks/5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/audio-analysis/5ZxX55HFfi4aofGTxMp58x,33107,5,SKIPPEP,2022-10-23 11:09:07.142544,0.0
-1,0.74,0.266,1,-17.222,1,0.947,0.986,0,0.508,0.963,70.633,audio_features,0EgkVzDidmq4MP57jZFeik,spotify:track:0EgkVzDidmq4MP57jZFeik,https://api.spotify.com/v1/tracks/0EgkVzDidmq4MP57jZFeik,https://api.spotify.com/v1/audio-analysis/0EgkVzDidmq4MP57jZFeik,22747,3,SKIPPEP,2022-10-23 11:09:09.500457,0.0
-2,0.682,0.0987,1,-22.723,1,0.612,0.133,0,0.105,0.396,100.247,audio_features,5ZxX55HFfi4aofGTxMp58x,spotify:track:5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/tracks/5ZxX55HFfi4aofGTxMp58x,https://api.spotify.com/v1/audio-analysis/5ZxX55HFfi4aofGTxMp58x,33107,5,,,
+0,0.702,0.823,11,-3.329,1,0.473,0.198,0.0,0.163,0.323,160.995,audio_features,7zlvNFYfOu0aK1kxDAHnu6,spotify:track:7zlvNFYfOu0aK1kxDAHnu6,https://api.spotify.com/v1/tracks/7zlvNFYfOu0aK1kxDAHnu6,https://api.spotify.com/v1/audio-analysis/7zlvNFYfOu0aK1kxDAHnu6,58280,4,SKIPPEP,2022-10-23 11:46:33.359512,0.0
+1,0.466,0.576,2,-10.491,1,0.408,0.126,0.000334,0.175,0.832,180.084,audio_features,2IoSF6KSDcw5V9eVSxgsm0,spotify:track:2IoSF6KSDcw5V9eVSxgsm0,https://api.spotify.com/v1/tracks/2IoSF6KSDcw5V9eVSxgsm0,https://api.spotify.com/v1/audio-analysis/2IoSF6KSDcw5V9eVSxgsm0,55147,4,,,