Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby" 
         name="Emby" 
-        version="0.1.6"
+        version="0.1.7"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

resources/lib/KodiMonitor.py

@@ -67,14 +67,15 @@ class Kodi_Monitor(xbmc.Monitor):
             cursor = connection.cursor()
             cursor.execute("DELETE FROM emby WHERE emby_id = ?", (id,))
             connection.commit()
+            cursor.close
             
-            if jsondata != None:
+            if jsondata:
                 if jsondata.get("type") == "episode":
                     url='{server}/mediabrowser/Items?Ids=' + id + '&format=json'
                     #This is a check to see if the item exists on the server, if it doesn't it may have already been deleted by another client
                     result = DownloadUtils().downloadUrl(url)
                     item = result.get("Items")[0]
-                    if data != "":
+                    if data:
                         return_value = xbmcgui.Dialog().yesno("Confirm Delete", "Delete file on Emby Server?")
                         if return_value:
                             url='{server}/mediabrowser/Items/' + id

resources/skins/default/720p/NextUpInfo.xml

@@ -15,6 +15,13 @@
 					<height>281</height>
 					<aspectratio align="right" aligny="bottom">keep</aspectratio>
 				</control>
+				<control type="image">
+					<top>110r</top>
+					<width>100%</width>
+					<height>374</height>
+					<texture>white.png</texture>
+					<colordiffuse>ff010101</colordiffuse>
+				</control>
 				<!-- buttons -->
 				<control type="button" id="3012">
 					<description>Watch Now</description>
@@ -93,7 +100,16 @@
 							<textcolor>orange</textcolor>
 							<visible>false</visible>
 						</control>
+						<control type="image">
+							<top>52</top>
+							<width>24</width>
+							<height>24</height>
+							<aspect>keep</aspect>
+							<texture>imdb.png</texture>
+							<visible>Control.IsVisible(3003)</visible>
+						</control>
 						<control type="label" id="3003" description="rating">
+							<left>35</left>
 							<width>100%</width>
 							<top>50</top>
 							<height>40</height>
@@ -101,7 +117,7 @@
 							<textcolor>B3dddddd</textcolor>
 						</control>
 						<control type="label" id="3004" description="year/runtime">
-							<left>55</left>
+							<left>90</left>
 							<width>100%</width>
 							<top>50</top>
 							<height>40</height>