soco-cli 0.4.73__tar.gz → 0.4.75__tar.gz

{soco-cli-0.4.73/soco_cli.egg-info → soco-cli-0.4.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: soco-cli
-Version: 0.4.73
+Version: 0.4.75
 Summary: Sonos command line control utility, based on SoCo
 Author-email: Avantrec Ltd <soco_cli@avantrec.com>
 Project-URL: Homepage, https://github.com/avantrec/soco-cli

{soco-cli-0.4.73 → soco-cli-0.4.75}/soco_cli/__init__.py

@@ -10,4 +10,4 @@ server, to control Sonos via HTTP requests.
 For more information, please see: https://github.com/avantrec/soco-cli
 """
 
-__version__ = "0.4.73"
+__version__ = "0.4.75"

{soco-cli-0.4.73 → soco-cli-0.4.75}/soco_cli/alarms.py

@@ -53,20 +53,18 @@ def list_alarms(speaker, action, args, soco_function, use_local_speaker_list):
             duration = alarm.duration.strftime("%H:%M")
         else:
             duration = "No Limit"
-        details.append(
-            [
-                alarm.alarm_id,
-                alarm.zone.player_name,
-                time,
-                duration,
-                alarm.recurrence,
-                convert_true_false(alarm.enabled),
-                title,
-                alarm.play_mode,
-                alarm.volume,
-                convert_true_false(alarm.include_linked_zones),
-            ]
-        )
+        details.append([
+            alarm.alarm_id,
+            alarm.zone.player_name,
+            time,
+            duration,
+            alarm.recurrence,
+            convert_true_false(alarm.enabled),
+            title,
+            alarm.play_mode,
+            alarm.volume,
+            convert_true_false(alarm.include_linked_zones),
+        ])
 
     # Sort alarms by start time, room. Apply sorts in reverse order.
     details.sort(key=lambda field: field[1])  # Room

{soco-cli-0.4.73 → soco-cli-0.4.75}/soco_cli/play_local_file.py

@@ -1,6 +1,7 @@
 """Plays files from the local filesystem."""
 
 import functools
+import http.client
 import logging
 import sys
 import time
@@ -10,7 +11,7 @@ from ipaddress import IPv4Address, IPv4Network
 from os import chdir, path
 from socketserver import ThreadingMixIn
 from threading import Thread
-from typing import List, Union
+from typing import List, Optional
 
 import ifaddr  # type: ignore
 from RangeHTTPServer import RangeRequestHandler  # type: ignore
@@ -93,7 +94,7 @@ class MyHTTPHandler(RangeRequestHandler):
 
 def http_server(
     server_ip: str, directory: str, filename: str, speaker_ips: List[str]
-) -> Union[ThreadedHTTPServer, None]:
+) -> Optional[ThreadedHTTPServer]:
     # Set the directory from which to serve files, in the handler
     # Set the specific filename and client IP that are authorised
     handler = functools.partial(
@@ -122,18 +123,48 @@ def http_server(
     return None
 
 
-def get_server_ip(speaker: SoCo) -> Union[str, None]:
-    # Get a suitable IP address to use as a server address for Sonos
-    # on this host
+def get_server_ip(speaker: SoCo) -> Optional[str]:
+    # Get the host IP address to use as a server IP for Sonos
+    # on this host.
+
     adapters = ifaddr.get_adapters()
+
+    # First, try to find a host IP address in the same network as the speaker
     for adapter in adapters:
         for ip in adapter.ips:
-            if ip.is_IPv4:
+            if ip.is_IPv4 and ip.ip != "127.0.0.1":
+                logging.info(
+                    "Checking if IP address '{}' is in target speaker's network".format(
+                        ip.ip
+                    )
+                )
                 network = IPv4Network(
                     ip.ip + "/" + str(ip.network_prefix), strict=False
                 )
                 if IPv4Address(speaker.ip_address) in network:
                     return ip.ip
+
+    # If that fails, try to find a host IP address that can reach the target speaker
+    for adapter in adapters:
+        for ip in adapter.ips:
+            if ip.is_IPv4 and ip.ip != "127.0.0.1":
+                try:
+                    logging.info(
+                        "Checking target speaker's reachability from IP address '{}'"
+                        .format(ip.ip)
+                    )
+                    http_connection = http.client.HTTPConnection(
+                        speaker.ip_address,
+                        port=1400,
+                        timeout=0.5,
+                        source_address=(ip.ip, PORT_END),
+                    )
+                    http_connection.request("GET", "/status/info")
+                    if http_connection.getresponse().status == 200:
+                        return ip.ip
+                except:
+                    continue
+
     return None
 
 
@@ -186,7 +217,6 @@ def is_supported_type(filename: str) -> bool:
     file_upper = filename.upper()
     for file_type in SUPPORTED_TYPES:
         if file_upper.endswith("." + file_type):
-            # Supported file type
             return True
     return False
 

{soco-cli-0.4.73 → soco-cli-0.4.75}/soco_cli/speakers.py

@@ -305,15 +305,13 @@ class Speakers:
                 visible = "Visible"
             else:
                 visible = "Hidden"
-            households[device.household_id].append(
-                (
-                    device.speaker_name,
-                    device.ip_address,
-                    device.model_name.replace("Sonos ", ""),
-                    visible,
-                    device.display_version,
-                )
-            )
+            households[device.household_id].append((
+                device.speaker_name,
+                device.ip_address,
+                device.model_name.replace("Sonos ", ""),
+                visible,
+                device.display_version,
+            ))
             num_devices += 1
 
         headers = [

{soco-cli-0.4.73 → soco-cli-0.4.75/soco_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: soco-cli
-Version: 0.4.73
+Version: 0.4.75
 Summary: Sonos command line control utility, based on SoCo
 Author-email: Avantrec Ltd <soco_cli@avantrec.com>
 Project-URL: Homepage, https://github.com/avantrec/soco-cli