From 724ff538303d9c786ff315c1cf32000e0b1523e3 Mon Sep 17 00:00:00 2001
From: Rick Phillips <ruuk@users.noreply.github.com>
Date: Tue, 26 Sep 2017 20:32:52 -0600
Subject: [PATCH] Version bump 0.1.2 (#128)

Fix issue causing no hubs to display with newer server versions
---
 addon.xml           |  2 +-
 changelog.txt       |  4 ++++
 lib/windows/home.py | 22 ++++++++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/addon.xml b/addon.xml
index a37e74aa2..286c2aa45 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.plex"
        name="Plex"
-       version="0.1.1"
+       version="0.1.2"
        provider-name="Plex">
     <requires>
         <import addon="xbmc.python" version="2.24.0"/>
diff --git a/changelog.txt b/changelog.txt
index 24d62c6ba..8adc90b30 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[- 0.1.2 -]
+
+Fix issue with hubs not showing with (newer?) server versions
+
 [- 0.1.1 -]
 
 Remove PlexPass disclaimer from add-on info
diff --git a/lib/windows/home.py b/lib/windows/home.py
index 387b9c5ad..cf40e7016 100644
--- a/lib/windows/home.py
+++ b/lib/windows/home.py
@@ -1,5 +1,6 @@
 import time
 import threading
+import re
 
 import xbmc
 import xbmcgui
@@ -725,22 +726,26 @@ def _showHubs(self, section=None, update=False):
             hasContent = False
             skip = {}
             for hub in hubs:
-                if hub.hubIdentifier not in self.HUBMAP:
+                identifier = re.sub('\.\d+$', '', hub.hubIdentifier)
+                if identifier not in self.HUBMAP:
                     util.DEBUG_LOG('UNHANDLED - Hub: {0} ({1})'.format(hub.hubIdentifier, len(hub.items)))
                     continue
 
-                skip[self.HUBMAP[hub.hubIdentifier]['index']] = 1
+                skip[self.HUBMAP[identifier]['index']] = 1
 
                 if self.showHub(hub):
                     if hub.items:
                         hasContent = True
-                    if self.HUBMAP[hub.hubIdentifier].get('do_updates'):
-                        self.updateHubs[hub.hubIdentifier] = hub
+                    if self.HUBMAP[identifier].get('do_updates'):
+                        self.updateHubs[identifier] = hub
 
             if not hasContent:
                 self.setBoolProperty('no.content', True)
 
-            lastSkip = min(skip.keys())
+            lastSkip = 0
+            if skip:
+                lastSkip = min(skip.keys())
+
             focus = None
             if update:
                 for i, control in enumerate(self.hubControls):
@@ -757,9 +762,10 @@ def _showHubs(self, section=None, update=False):
             self.showBusy(False)
 
     def showHub(self, hub, items=None):
-        if hub.hubIdentifier in self.HUBMAP:
-            util.DEBUG_LOG('Hub: {0} ({1})'.format(hub.hubIdentifier, len(hub.items)))
-            self._showHub(hub, hubitems=items, **self.HUBMAP[hub.hubIdentifier])
+        identifier = re.sub('\.\d+$', '', hub.hubIdentifier)
+        if identifier in self.HUBMAP:
+            util.DEBUG_LOG('Hub: {0} ({1})'.format(identifier, len(hub.items)))
+            self._showHub(hub, hubitems=items, **self.HUBMAP[identifier])
             return True
         else:
             util.DEBUG_LOG('UNHANDLED - Hub: {0} ({1})'.format(hub.hubIdentifier, len(hub.items)))