Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix download not always returning entire requests.response object

Browse source
This commit is contained in:
croneter 2021-09-24 16:59:41 +02:00
parent 63bd85d5c8
commit 057921b05e
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/lib/downloadutils.py
View file

@ -224,7 +224,11 @@ class DownloadUtils():
if r.status_code != 401: if r.status_code != 401:
self.count_unauthorized = 0 self.count_unauthorized = 0
if r.status_code == 204: if return_response is True:
# return the entire response object
return r
elif r.status_code == 204:
# No body in the response # No body in the response
# But read (empty) content to release connection back to pool # But read (empty) content to release connection back to pool
# (see requests: keep-alive documentation) # (see requests: keep-alive documentation)
@ -258,9 +262,6 @@ class DownloadUtils():
elif r.status_code in (200, 201): elif r.status_code in (200, 201):
# 200: OK # 200: OK
# 201: Created # 201: Created
if return_response is True:
# return the entire response object
return r
try: try:
# xml response # xml response
r = utils.defused_etree.fromstring(r.content) r = utils.defused_etree.fromstring(r.content)

15
resources/lib/plex_api/media.py
View file

@ -320,16 +320,15 @@ class Media(object):
filename, filename,
extension) extension)
response = DU().downloadUrl(url, return_response=True) response = DU().downloadUrl(url, return_response=True)
try: if not response.ok:
response.status_code
except AttributeError:
LOG.error('Could not temporarily download subtitle %s', url) LOG.error('Could not temporarily download subtitle %s', url)
LOG.error('HTTP status: %s, message: %s',
response.status_code, response.text)
return return
else: LOG.debug('Writing temp subtitle to %s', path)
LOG.debug('Writing temp subtitle to %s', path) with open(path_ops.encode_path(path), 'wb') as f:
with open(path_ops.encode_path(path), 'wb') as f: f.write(response.content)
f.write(response.content) return path
return path
def validate_playurl(self, path, typus, force_check=False, folder=False, def validate_playurl(self, path, typus, force_check=False, folder=False,
omit_check=False): omit_check=False):