Merge branch 'dev'

pyskyqremote/__init__.py

@@ -0,0 +1 @@
+"""Initialise."""

pyskyqremote/channel.py

@@ -1,8 +1,13 @@
+"""Structure of a standard EPG prorgramme."""
+
 
 class Programme:
+    """SkyQ Programme Class."""
+
     def __init__(
         self, programmeuuid, starttime, endtime, title, season, episode, imageUrl
     ):
+        """Programme structure for SkyQ."""
         self.progammeuuid = programmeuuid
         self.starttime = starttime
         self.endtime = endtime

pyskyqremote/country/__init__.py

@@ -0,0 +1 @@
+"""Initialise."""

pyskyqremote/country/remote_it.py

@@ -1,3 +1,4 @@
+"""Italy specific code."""
 from datetime import datetime
 import logging
 import requests
@@ -18,7 +19,10 @@
 
 
 class SkyQCountry:
+    """Italy specific SkyQ."""
+
     def __init__(self, host):
+        """Initialise Italy remote."""
         self.channel_image_url = CHANNEL_IMAGE_URL
         self.pvr_image_url = PVR_IMAGE_URL
         self.epgData = None
@@ -30,6 +34,7 @@ def __init__(self, host):
         self._getChannels()
 
     def getEpgData(self, sid, channelno, epgDate):
+        """Get EPG data for Italy."""
         queryDateFrom = epgDate.strftime("%Y-%m-%dT00:00:00Z")
         queryDateTo = epgDate.strftime("%Y-%m-%dT23:59:59Z")
 
@@ -57,9 +62,14 @@ def getEpgData(self, sid, channelno, epgDate):
             return None
 
         self.epgData = []
-        for p in epgData:
+        epgDataLen = len(epgData) - 1
+        for index, p in enumerate(epgData):
             starttime = datetime.strptime(p["starttime"], "%Y-%m-%dT%H:%M:%SZ")
-            endtime = datetime.strptime(p["endtime"], "%Y-%m-%dT%H:%M:%SZ")
+            if index < epgDataLen:
+                endtimeStr = epgData[index + 1]["starttime"]
+            else:
+                endtimeStr = p["endtime"]
+            endtime = datetime.strptime(endtimeStr, "%Y-%m-%dT%H:%M:%SZ")
             title = p["eventTitle"]
             season = None
             if "seasonNumber" in p["content"]:

pyskyqremote/country/remote_uk.py

@@ -1,3 +1,4 @@
+"""UK specific code."""
 from datetime import datetime
 import logging
 import requests
@@ -15,7 +16,10 @@
 
 
 class SkyQCountry:
+    """UK specific SkyQ."""
+
     def __init__(self, host):
+        """Initialise UK remote."""
         self.channel_image_url = CHANNEL_IMAGE_URL
         self.pvr_image_url = PVR_IMAGE_URL
         self.epgData = None
@@ -24,6 +28,7 @@ def __init__(self, host):
         self._host = host
 
     def getEpgData(self, sid, channelno, epgDate):
+        """Get EPG data for UK."""
         epgDateStr = epgDate.strftime("%Y%m%d")
         epgUrl = SCHEDULE_URL.format(sid, epgDateStr)
         epgData = None