From 79e79eddd1e2b362db677a1d0393a46c1a83317d Mon Sep 17 00:00:00 2001
From: im85288 <ianmalcolmmclaughlin@gmail.com>
Date: Wed, 14 Oct 2015 19:58:32 +0100
Subject: [PATCH] Set and Clear additional user images for use in skins

---
 addon.xml                   |  2 +-
 resources/lib/Entrypoint.py | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addon.xml b/addon.xml
index ef52ffed..4b08aeb4 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby" 
         name="Emby" 
-        version="1.1.48"
+        version="1.1.49"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
diff --git a/resources/lib/Entrypoint.py b/resources/lib/Entrypoint.py
index 6e10a414..513cfbc9 100644
--- a/resources/lib/Entrypoint.py
+++ b/resources/lib/Entrypoint.py
@@ -91,6 +91,10 @@ def addUser():
                     postdata = {}
                     doUtils.downloadUrl(url, postBody=postdata, type="DELETE")
                     xbmcgui.Dialog().notification("Success!", "%s removed from viewing session" % selected, time=1000)
+
+                    # clear picture
+                    position = WINDOW.getProperty('EmbyAdditionalUserPosition.' + selected_userId)
+                    WINDOW.clearProperty('EmbyAdditionalUserImage.' + str(position))
                     return
                 else:
                     return
@@ -122,6 +126,28 @@ def addUser():
         xbmc.log("Failed to add user to session.")
         xbmcgui.Dialog().notification("Error", "Unable to add/remove user from the session.", xbmcgui.NOTIFICATION_ERROR)
 
+    try:
+        # Add additional user images
+        #always clear the individual items first
+        totalNodes = 10
+        for i in range(totalNodes):
+            if not WINDOW.getProperty('EmbyAdditionalUserImage.' + str(i)):
+                break
+            WINDOW.clearProperty('EmbyAdditionalUserImage.' + str(i))
+
+        url = "{server}/mediabrowser/Sessions?DeviceId=%s" % deviceId
+        result = doUtils.downloadUrl(url)
+        additionalUsers = result[0][u'AdditionalUsers']
+        count = 0
+        for additionaluser in additionalUsers:
+            url = "{server}/mediabrowser/Users/%s?format=json" % (additionaluser[u'UserId'])
+            result = doUtils.downloadUrl(url)
+            WINDOW.setProperty("EmbyAdditionalUserImage." + str(count),API().getUserArtwork(result,"Primary"))
+            WINDOW.setProperty("EmbyAdditionalUserPosition." + str(additionaluser[u'UserId']),str(count))
+            count +=1
+    except:
+        pass
+
 # THEME MUSIC/VIDEOS
 def getThemeMedia():