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

Use six library instead of checking sys version

Browse source
This commit is contained in:
Matt 2020-02-23 00:07:44 -05:00
parent 5479ba2775
commit 19ec48cd5b
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
jellyfin_kodi/downloader.py
View file

@ -6,7 +6,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
import logging import logging
import threading import threading
from six.moves import queue as Queue from six.moves import range, queue as Queue, zip
from kodi_six import xbmc from kodi_six import xbmc
import requests import requests
@ -15,14 +15,6 @@ from jellyfin import Jellyfin
from jellyfin import api from jellyfin import api
from jellyfin.exceptions import HTTPException from jellyfin.exceptions import HTTPException
# Python 2/3 Compatible things
import sys
if sys.version.startswith('3'):
xrange = range
izip = zip
else:
from itertools import izip
################################################################################################# #################################################################################################
LOG = logging.getLogger("JELLYFIN." + __name__) LOG = logging.getLogger("JELLYFIN." + __name__)
@ -275,9 +267,9 @@ def _get_items(query, server_id=None):
return params_copy return params_copy
query_params = [get_query_params(params, offset, LIMIT) \ query_params = [get_query_params(params, offset, LIMIT) \
for offset in xrange(params['StartIndex'], items['TotalRecordCount'], LIMIT)] for offset in range(params['StartIndex'], items['TotalRecordCount'], LIMIT)]
# multiprocessing.dummy.Pool completes all requests in multiple threads but has to # multiprocessing.dummy.Pool completes all requests in multiple threads but has to
# complete all tasks before allowing any results to be processed. ThreadPoolExecutor # complete all tasks before allowing any results to be processed. ThreadPoolExecutor
# allows for completed tasks to be processed while other tasks are completed on other # allows for completed tasks to be processed while other tasks are completed on other
# threads. Dont be a dummy.Pool, be a ThreadPoolExecutor # threads. Dont be a dummy.Pool, be a ThreadPoolExecutor
@ -286,7 +278,7 @@ def _get_items(query, server_id=None):
results = p.map(lambda params: _get(url, params, server_id=server_id), query_params) results = p.map(lambda params: _get(url, params, server_id=server_id), query_params)
for params, result in izip(query_params, results): for params, result in zip(query_params, results):
query['params'] = params query['params'] = params
result = result or {'Items': []} result = result or {'Items': []}