add functionality to set tuner ips manually and ignore discover

jumpmanjay · Sep 26, 2016 · f32ff8b · f32ff8b
1 parent 04bb454
commit f32ff8b
Showing 1 changed file with 45 additions and 12 deletions.
diff --git a/Contents/Services/Shared Code/PyHDHR.pys b/Contents/Services/Shared Code/PyHDHR.pys
@@ -505,6 +505,12 @@ class Tuner(BaseDevice):
         if 'LineupURL' in parsestr:
             self.LineupURL = parsestr['LineupURL']
 
+    def setLocalIP(self,localip):
+        self.LocalIP = localip
+        self.BaseURL = "http://"+localip+":80"
+        self.LineupURL = self.BaseURL+"/lineup.json"
+        self.DiscoverURL = self.BaseURL+"/discover.json"
+
     def addHD(self):
         self.HDCount = self.HDCount + 1
 
@@ -575,6 +581,8 @@ class Tuner(BaseDevice):
         try:
             response = urllib2.urlopen(self.DiscoverURL,None,5)
             data = json.loads(response.read())
+            if 'DeviceID' in data:
+                self.DeviceID = data['DeviceID']
             if 'TunerCount' in data:
                 self.TunerCount = data['TunerCount']
             if 'DeviceAuth' in data:
@@ -707,10 +715,19 @@ class PyHDHR:
     RecordedPrograms = {}
     SDDVREnabled = False
     SDDVRDiscover = 0
+    ManualTunerIPs = set()
 
     def __init__(self):
         return
 
+    def setManualTunerList(self,tuners):
+        if tuners:
+            tunerips = tuners.split(';')
+            for ip in tunerips:
+                regx = Regex('(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)').search(ip)
+                if regx and ip not in self.ManualTunerIPs:
+                    self.ManualTunerIPs.add(ip)
+
     def getTuners(self):
         self.discover()
         return self.Tuners
@@ -965,6 +982,19 @@ class PyHDHR:
 
         self.LastDiscover = time.time()
 
+        for ip in self.ManualTunerIPs:
+            tuner = Tuner(self)
+            tuner.setLocalIP(ip)
+            if tuner.discover():
+                if tuner.getDeviceID() in self.Tuners:
+                    if self.Tuners[tuner.getDeviceID()].discover():
+                        self.Tuners[tuner.getDeviceID()].processLineup(self)
+                        self.Tuners[tuner.getDeviceID()].processGuide(self)
+                else:
+                    tuner.processLineup(self)
+                    tuner.processGuide(self)
+                    self.Tuners[tuner.getDeviceID()] = tuner
+
         try:
             response = urllib2.urlopen(URL_DISCOVER,None,5)
             data = json.loads(response.read())
@@ -980,19 +1010,22 @@ class PyHDHR:
                         if dvr.discover():
                             self.DVRs[item['StorageID']] = dvr
                 elif 'DeviceID' in item and 'LineupURL' in item:
-                    #Tuner
-                    if item['DeviceID'] in self.Tuners:
-                        self.Tuners[item['DeviceID']].parse(item)
-                        if self.Tuners[item['DeviceID']].discover():
-                            self.Tuners[item['DeviceID']].processLineup(self)
-                            self.Tuners[item['DeviceID']].processGuide(self)
+                    if len(self.ManualTunerIPs) == 0:
+                        #Tuner
+                        if item['DeviceID'] in self.Tuners:
+                            self.Tuners[item['DeviceID']].parse(item)
+                            if self.Tuners[item['DeviceID']].discover():
+                                self.Tuners[item['DeviceID']].processLineup(self)
+                                self.Tuners[item['DeviceID']].processGuide(self)
+                        else:
+                            tuner = Tuner(self)
+                            tuner.parse(item)
+                            if tuner.discover():
+                                tuner.processLineup(self)
+                                tuner.processGuide(self)
+                                self.Tuners[item['DeviceID']] = tuner
                     else:
-                        tuner = Tuner(self)
-                        tuner.parse(item)
-                        if tuner.discover():
-                            tuner.processLineup(self)
-                            tuner.processGuide(self)
-                            self.Tuners[item['DeviceID']] = tuner
+                        Log.Debug("PyHDHR.discover - ignoring tuner (in manual config mode)")
                 else:
                     Log.Debug("PyHDHR.discover - could not determine device type - " + str(item))
             return True