From 4aef5d7551773432cd94abc58012f7675c9122d0 Mon Sep 17 00:00:00 2001
From: sfaulds <sfaulds@connexity.com>
Date: Mon, 21 Nov 2016 11:51:00 +1100
Subject: [PATCH] check LocalTrailerCount as a number dont log metrics for 400
 errors as they are mostly server issues

---
 addon.xml                       | 2 +-
 resources/lib/downloadutils.py  | 2 +-
 resources/lib/objects/movies.py | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addon.xml b/addon.xml
index 45b04230..3b644396 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="2.3.19"
+        version="2.3.20"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>
diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index b86bdf88..4cfaf841 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -293,7 +293,7 @@ class DownloadUtils(object):
 
             if response.status_code == 400:
                 log.error("Malformed request: %s", error)
-                raise Warning('400:' + str(error))
+                raise internal_exceptions.ExceptionWrapper(error)
 
             if response.status_code == 401:
                 # Unauthorized
diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py
index 9f21b172..42d8b602 100644
--- a/resources/lib/objects/movies.py
+++ b/resources/lib/objects/movies.py
@@ -178,17 +178,17 @@ class Movies(Items):
         except IndexError:
             studio = None
 
-        if item.get('LocalTrailerCount'):
+        if int(item.get('LocalTrailerCount', 0)) > 0:
             # There's a local trailer
             url = (
                 "{server}/emby/Users/{UserId}/Items/%s/LocalTrailers?format=json"
                 % itemid
             )
-            result = self.do_url(url)
             try:
+                result = self.do_url(url)
                 trailer = "plugin://plugin.video.emby/trailer/?id=%s&mode=play" % result[0]['Id']
-            except IndexError:
-                log.info("Failed to process local trailer.")
+            except Exception as error:
+                log.info("Failed to process local trailer: " + str(error))
                 trailer = None
         else:
             # Try to get the youtube trailer