mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-11-10 04:06:11 +00:00
Merge branch 'master' into threaded_http_gets
This commit is contained in:
commit
ce10cb88c2
3 changed files with 10 additions and 4 deletions
|
@ -23,7 +23,7 @@ from jellyfin import Jellyfin
|
|||
##################################################################################################
|
||||
|
||||
LOG = logging.getLogger("JELLYFIN." + __name__)
|
||||
LIMIT = min(int(settings('limitIndex') or 50), 50)
|
||||
LIMIT = int(settings('limitIndex') or 15)
|
||||
DTHREADS = int(settings('limitThreads') or 3)
|
||||
MEDIA = {
|
||||
'Movie': Movies,
|
||||
|
@ -138,7 +138,8 @@ class Library(threading.Thread):
|
|||
|
||||
if not self.player.isPlayingVideo() or settings('syncDuringPlay.bool') or xbmc.getCondVisibility('VideoPlayer.Content(livetv)'):
|
||||
|
||||
self.worker_downloads()
|
||||
while self.worker_downloads():
|
||||
pass
|
||||
self.worker_sort()
|
||||
|
||||
self.worker_updates()
|
||||
|
@ -224,6 +225,7 @@ class Library(threading.Thread):
|
|||
|
||||
''' Get items from jellyfin and place them in the appropriate queues.
|
||||
'''
|
||||
added_threads = False
|
||||
for queue in ((self.updated_queue, self.updated_output), (self.userdata_queue, self.userdata_output)):
|
||||
if queue[0].qsize() and len(self.download_threads) < DTHREADS:
|
||||
|
||||
|
@ -231,6 +233,8 @@ class Library(threading.Thread):
|
|||
new_thread.start()
|
||||
LOG.info("-->[ q:download/%s ]", id(new_thread))
|
||||
self.download_threads.append(new_thread)
|
||||
added_threads = True
|
||||
return added_threads
|
||||
|
||||
def worker_sort(self):
|
||||
|
||||
|
|
2
resources/language/resource.language.es_DO/strings.po
Normal file
2
resources/language/resource.language.es_DO/strings.po
Normal file
|
@ -0,0 +1,2 @@
|
|||
msgid ""
|
||||
msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"
|
|
@ -25,8 +25,8 @@
|
|||
<setting label="30511" id="useDirectPaths" type="enum" lvalues="33036|33037" default="1" />
|
||||
|
||||
<setting label="33175" type="lsep" />
|
||||
<setting label="30515" id="limitIndex" type="number" default="15" option="int" />
|
||||
<setting label="33174" id="limitThreads" type="number" default="3" option="int" />
|
||||
<setting label="30515" id="limitIndex" type="slider" default="15" range="1, 1, 100" option="int" />
|
||||
<setting label="33174" id="limitThreads" type="slider" default="3" range="1, 1, 50" option="int" />
|
||||
<setting label="33176" type="lsep" />
|
||||
<setting label="30512" id="enableTextureCache" type="bool" default="true" />
|
||||
<setting label="30157" id="enableCoverArt" type="bool" default="true" />
|
||||
|
|
Loading…
Reference in a new issue