Merge branch 'develop' of https://github.com/JeanBaptiste-dlb/Skiptify …

…into develop

backend/src/main.py

@@ -1,5 +1,16 @@
-from backend
+from backend.src.spotify_api.skip_listener import SKIP_LISTENER
+from backend.src.model.decision_maker import DecisionLoop
+from backend.src.config import settings
+from multiprocessing import Process
 
+def main():
+    processes=[]
+    loop_1=DecisionLoop()
+    loop_2=SKIP_LISTENER()
+    p1 = Process(target=loop_1.decision_maker(), args=())
+    processes.append(p1)
+    p2 = Process(target=loop_2.decision_maker(), args=())
+    processes.append(p2)
 
 if __name__ == "__main__":
     main()

backend/src/model/decision_maker.py

@@ -2,6 +2,7 @@
 from backend.src.spotify_api.api_interface import SPOTIFY_API_INTERFACE
 import pandas as pd
 from pathlib import Path
+import time
 
 class DecisionLoop:
     def __init__(self):
@@ -15,19 +16,20 @@ def __init__(self):
         self.all_skipped = []
         self.all_non_skipped = []
         self.next_song = None
-        self.to_skip_path=Path(settings.APP_PATH, "tmp", "to_skip")
+        self.to_skip_path=Path(settings.DATA_PATH, "tmp", "to_skip")
         self.to_skip_path.mkdir(parents=True, exist_ok= True)
 
     def decision_maker(self):
         while True:
             next_song = self.interface.get_next_song()
             if next_song != self.next_song:
+                print("wrote a decision")
                 self.next_song = next_song
-                skip_decision = self.interface.is_song_skipped(next_song["id"])
+                skip_decision = self.interface.is_song_skipped(next_song)
                 # true or false
-                with open(self.to_skip_path, "w") as writer:
+                with open(Path(self.to_skip_path, "skip_decision.txt"), "w") as writer:
                     writer.write(str(skip_decision))
-                sleep(5)
+            time.sleep(5)
 
 def main():
     loop=DecisionLoop()

backend/src/spotify_api/skip_listener.py

@@ -22,7 +22,7 @@ def __init__(self):
         self.end_time = 0
         self.all_skipped = []
         self.all_non_skipped = []
-        self.to_skip_path = Path(settings.APP_PATH, "tmp", "to_skip")
+        self.to_skip_path = Path(settings.DATA_PATH, "tmp", "to_skip")
         self.actioner = SpotifyActioner()
         Path(settings.DATA_PATH, "player_data").mkdir(parents=True, exist_ok = True)
 
@@ -32,13 +32,12 @@ def listen(self):
         self.update_end_time()
         while True:
             if time.time() > self.end_time:
-
                 with open(self.to_skip_path, "r") as reader:
                     line = reader.readline()
                 if line == "True":
                     self.interface.save_song_features(self.current_song, skip_state="SKIPPED BY ALGORITHM")
                     self.actioner.skip_current_song()
-                with open(self.to_skip_path, "w") as writer:
+                with open(Path(self.to_skip_path, "skip_decision.txt"), "w") as writer:
                     writer.write("False")
                 self.current_song = self.interface.get_current_song()
                 self.previous_song = self.current_song

backend/src/spotify_api/spotify_actioner.py

@@ -29,6 +29,7 @@ def _update_scope(self, scope: str):
 
     def skip_current_song(self) -> None:
         self._update_scope(scope="user-modify-playback-state")
+        print("skipped algorithmically")
         song = self.interface.get_current_song()
         self.sp.next_track()
 

tmp/to_skip/skip_decision.txt

@@ -0,0 +1 @@
+True