Implement vol script

Gate a few things in the vol script better

Author: SteveMicroNova

CHANGELOG.md

@@ -6,6 +6,8 @@
   * Update our spotify provider `go-librespot` to `0.5.2` to accomodate spotify's API update
 * Web App
   * Upgraded volume calculations to preserve relative positions when hitting the min or max setting via source volume bar
+* Streams:
+  * Upgraded Spotify to sync Spotify's volume with AmpliPi and vice-versa
 
 ## 0.4.8
 * System

amplipi/streams/spotify_connect.py

@@ -101,7 +101,7 @@ def _activate(self, vsrc: int):
     self.proc2 = subprocess.Popen(args=meta_args, stdout=self._log_file, stderr=self._log_file)
 
     vol_sync = f"{utils.get_folder('streams')}/spotify_volume_handler.py"
-    vol_args = [sys.executable, vol_sync, str(self._api_port), src_config_folder[-1], "--debug"]
+    vol_args = [sys.executable, vol_sync, str(self._api_port), str(self.vsrc), "--debug"]
     logger.info(f'{self.name}: starting vol synchronizer: {vol_args}')
     self.proc3 = subprocess.Popen(args=vol_args, stdout=self._log_file, stderr=self._log_file)
 
@@ -111,14 +111,19 @@ def _deactivate(self):
       logger.info(f'{self.name}: stopping player')
       self.proc.terminate()
       self.proc2.terminate()
+      self.proc3.terminate()
       if self.proc.wait(1) != 0:
         logger.info(f'{self.name}: killing player')
         self.proc.kill()
       if self.proc2.wait(1) != 0:
         logger.info(f'{self.name}: killing metadata reader')
         self.proc2.kill()
+      if self.proc3.wait(1) != 0:
+        logger.info(f'{self.name}: killing volume synchronizer')
+        self.proc3.kill()
       self.proc.communicate()
       self.proc2.communicate()
+      self.proc3.communicate()
     if self.proc and self._log_file:  # prevent checking _log_file when it may not exist, thanks validation!
       self._log_file.close()
     if self.src:
@@ -129,6 +134,7 @@ def _deactivate(self):
     self._disconnect()
     self.proc = None
     self.proc2 = None
+    self.proc3 = None
 
   def info(self) -> models.SourceInfo:
     source = models.SourceInfo(

streams/spotify_volume_handler.py

@@ -67,6 +67,7 @@ def __init__(self, source_id: int, callback, debug: bool = False):
     self.callback = callback
     self.debug = debug
     self.status: dict = None
+    self.last_volume: float = None
     self.volume: float = None
 
     self.connected_zones: list = []
@@ -76,15 +77,14 @@ def __init__(self, source_id: int, callback, debug: bool = False):
   def get_status(self):
     """Call up the amplipi API and send the output to self.consume_status"""
     while True:
-      last_vol = float(self.volume) if self.volume is not None else None
-
-      # with open("/home/pi/.config/amplipi/house.json", "r", encoding="utf-8") as f:
-      #   self.consume_status(json.loads(f))
-
       self.consume_status(requests.get("http://localhost/api", timeout=5).json())
 
-      if last_vol != self.volume:
+      print(f"last: {self.last_volume}, vol: {self.volume}")
+
+      if self.last_volume != self.volume:
         self.callback("amplipi_volume_changed")
+      self.last_volume = float(self.volume)
+      sleep(2)
 
   def consume_status(self, status):
     """Consume an API response into the local object"""
@@ -98,6 +98,8 @@ def get_volume(self):
     if self.connected_zones:
       total_vol_f = sum([zone["vol_f"] for zone in self.connected_zones])  # Note that accounting for the vol_f overflow variables here would make it impossible to use those overflows while also using this volume bar
       return round(total_vol_f / len(self.connected_zones), 2)  # Round down to 2 decimals to assist with float accuracy
+    else:
+      logger.warning("Could not find any associated zones")
     return 0
 
 
@@ -169,6 +171,8 @@ def update_spotify_volume(self):
   handler = SpotifyVolumeHandler(args.port, args.source, args.debug)
   while True:
     try:
+      if handler.spotify.volume is None:
+        handler.update_spotify_volume()
       event = handler.event_queue.get(timeout=2)
       if event in "spotify_volume_changed":
         handler.update_amplipi_volume()