From 294d6684ef06a6d07c6d2c4aef2eddc85a4e4e96 Mon Sep 17 00:00:00 2001
From: Adam Helbing <adam.pyschny@gmail.com>
Date: Sun, 8 Oct 2023 16:01:35 +0200
Subject: [PATCH] added https, a new port and catch exceptions more broadly

My TV's (55PML9507) jointSPACE endpoint is https and on port 1926 so I made find_api_version() find it.
Exceptions are catched more broadly because both json parser and requests lib threw multiple exceptions on discovery which are all catched now.
---
 pylips.py | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/pylips.py b/pylips.py
index 7bfc75e..306b1a5 100755
--- a/pylips.py
+++ b/pylips.py
@@ -135,32 +135,36 @@ def is_online(self, host):
         return subprocess.call(command) == 0
 
     # finds API version, saves it to settings.ini (["TV"]["apiv"]) and returns True if successful.
-    def find_api_version(self, verbose=True, possible_ports=[1925], possible_api_versions=[6,5,1]):
+    def find_api_version(self, verbose=True, possible_ports=[1925,1926], possible_protocols=["http://","https://"], possible_api_versions=[6,5,1]):
         if verbose:
             print ("Checking API version and port...")
-        protocol="http://"
-        for port in possible_ports:
-            for api_version in possible_api_versions:
-                try:
-                    if verbose:
-                        print("Trying", str(protocol) + str(self.config["TV"]["host"]) + ":" + str(port)+"/" + str(api_version)+"/system")
-                    r = session.get(str(protocol) + str(self.config["TV"]["host"]) + ":" + str(port)+"/" + str(api_version)+"/system", verify=False, timeout=2)
-                except requests.exceptions.ConnectionError:
-                    print("Connection refused")
-                    continue
-                if r.status_code == 200:
-                    if "api_version" in r.json():
-                        self.config["TV"]["apiv"] = str(r.json()["api_version"]["Major"])
-                    else:
-                        print("Could not find a valid API version! Pylips will try to use '", api_version, "'" )
-                        self.config["TV"]["apiv"] = str(api_version)
-                    if "featuring" in r.json() and "systemfeatures" in r.json()["featuring"] and "pairing_type" in r.json()["featuring"]["systemfeatures"] and r.json()["featuring"]["systemfeatures"]["pairing_type"] == "digest_auth_pairing":
-                        self.config["TV"]["protocol"] = "https://"
-                        self.config["TV"]["port"] = "1926"
-                    else:
-                        self.config["TV"]["protocol"] = "http://"
-                        self.config["TV"]["port"] = "1925"
-                    return True
+        for protocol in possible_protocols:    
+            for port in possible_ports:
+                for api_version in possible_api_versions:
+                    try:
+                        if verbose:
+                            print("Trying", str(protocol) + str(self.config["TV"]["host"]) + ":" + str(port)+"/" + str(api_version)+"/system")
+                        r = session.get(str(protocol) + str(self.config["TV"]["host"]) + ":" + str(port)+"/" + str(api_version)+"/system", verify=False, timeout=2)
+                    except:
+                        print("Connection error")
+                        continue
+                    if r.status_code == 200:
+                        try:
+                            if "api_version" in r.json():
+                                self.config["TV"]["apiv"] = str(r.json()["api_version"]["Major"])
+                            else:
+                                print("Could not find a valid API version! Pylips will try to use '", api_version, "'" )
+                                self.config["TV"]["apiv"] = str(api_version)
+                            if "featuring" in r.json() and "systemfeatures" in r.json()["featuring"] and "pairing_type" in r.json()["featuring"]["systemfeatures"] and r.json()["featuring"]["systemfeatures"]["pairing_type"] == "digest_auth_pairing":
+                                self.config["TV"]["protocol"] = "https://"
+                                self.config["TV"]["port"] = "1926"
+                            else:
+                                self.config["TV"]["protocol"] = "http://"
+                                self.config["TV"]["port"] = "1925"
+                            return True
+                        except:
+                            print("JSON error")
+                            continue
         return False
 
     # returns True if already paired or using non-Android TVs.