From c8b1e738c66d422382f791abd86b0e6b0ce85e14 Mon Sep 17 00:00:00 2001
From: shaun <shaun@bluebit.com.au>
Date: Sat, 4 Feb 2017 10:42:22 +1100
Subject: [PATCH] refine download function, more exceptions
---
addon.xml | 2 +-
resources/lib/downloadutils.py | 35 +++++++++++-----------------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/addon.xml b/addon.xml
index 37d82938..e84041d4 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.43"
+ version="2.3.44"
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 96ec40c7..ad3d52cd 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -238,7 +238,7 @@ class DownloadUtils(object):
# does the URL look ok
if url.startswith('/'):
exc = Exception("URL Error: " + url)
- exc.quiet = True
+ #exc.quiet = True
raise exc
##### PREPARE REQUEST #####
@@ -260,7 +260,7 @@ class DownloadUtils(object):
# Read response to release connection
response.content
if action_type == "GET":
- raise Warning("Response Code 204: No Content for GET request")
+ raise Exception("Response Code 204 for GET request")
else:
# this is probably valid for DELETE and PUT
return None
@@ -279,7 +279,7 @@ class DownloadUtils(object):
##### EXCEPTIONS #####
except requests.exceptions.SSLError as error:
- log.error("invalid SSL certificate for: %s", url)
+ log.error("Invalid SSL certificate for: %s", url)
error.quiet = True
raise
@@ -303,11 +303,6 @@ class DownloadUtils(object):
except requests.exceptions.HTTPError as error:
- if response.status_code == 400:
- log.error("Malformed request: %s", error)
- error.quiet = True
- raise
-
if response.status_code == 401:
# Unauthorized
status = window('emby_serverStatus')
@@ -322,16 +317,6 @@ class DownloadUtils(object):
icon=xbmcgui.NOTIFICATION_ERROR,
time=5000)
window('emby_serverStatus', value="restricted")
- exc = Exception("restricted: " + str(error))
- exc.quiet = True
- raise exc
-
- elif (response.headers['X-Application-Error-Code'] ==
- "UnauthorizedAccessException"):
- # User tried to do something his emby account doesn't allow
- exc = Exception("UnauthorizedAccessException: " + str(error))
- exc.quiet = True
- raise exc
elif status not in ("401", "Auth"):
# Tell userclient token has been revoked.
@@ -340,13 +325,15 @@ class DownloadUtils(object):
xbmcgui.Dialog().notification(heading="Error connecting",
message="Unauthorized.",
icon=xbmcgui.NOTIFICATION_ERROR)
- exc = Exception("401: " + str(error))
- exc.quiet = True
- raise exc
- except requests.exceptions.RequestException as error:
- log.error("unknown error connecting to: %s", url)
- raise
+ exc = Exception("HTTPError : " + str(response.status_code) + " : " + str(error))
+ #exc.quiet = True
+ raise exc
+
+ # if we got to here and did not process the download for some reason then that is bad
+ exc = Exception("Unhandled Download : %s", url)
+ #exc.quiet = True
+ raise exc
def _ensure_server(self, server_id=None):