Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

dont worry about server details if the url does nto have server and user id placeholders in it

Browse source
This commit is contained in:
shaun 2017-02-05 22:50:01 +11:00
parent ee01e7cb5e
commit 72c76adbf8
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon.xml
View file

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

11
resources/lib/downloadutils.py
View file

@ -216,7 +216,11 @@ class DownloadUtils(object):
self._ensure_server(server_id) self._ensure_server(server_id)
server = self.session if server_id is None else self.servers[server_id] server = self.session if server_id is None else self.servers[server_id]
if not server or not server.get("Server") or not server.get("UserId"): requires_server = False
if url.find("{server}") > -1 or url.find("{UserId}") > -1:
requires_server = True
if requires_server and (not server or not server.get("Server") or not server.get("UserId")):
log.info("Aborting download, Server Details Error: %s url=%s" % (server, url)) log.info("Aborting download, Server Details Error: %s url=%s" % (server, url))
exc = Exception("Aborting download, Server Details Error: %s url=%s" % (server, url)) exc = Exception("Aborting download, Server Details Error: %s url=%s" % (server, url))
exc.quiet = True exc.quiet = True
@ -232,8 +236,9 @@ class DownloadUtils(object):
}) })
# Replace for the real values # Replace for the real values
url = url.replace("{server}", server['Server']) if requires_server:
url = url.replace("{UserId}", server['UserId']) url = url.replace("{server}", server['Server'])
url = url.replace("{UserId}", server['UserId'])
# does the URL look ok # does the URL look ok
if url.startswith('/'): if url.startswith('/'):