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

Revise progress bar

Browse source 
Fix typos and subsetting
This commit is contained in:
angelblue05 2018-10-03 23:01:29 -05:00
parent 1290abf75a
commit 969629ec37
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/lib/library.py
View file

@ -136,13 +136,17 @@ class Library(threading.Thread):
if self.pending_refresh: if self.pending_refresh:
if self.total_updates > self.progress_display: if self.total_updates > self.progress_display:
queue_size = self.worker_queue_size()
if self.progress_updates is None: if self.progress_updates is None:
self.progress_updates = xbmcgui.DialogProgressBG() self.progress_updates = xbmcgui.DialogProgressBG()
self.progress_updates.create(_('addon_name'), _(33178)) self.progress_updates.create(_('addon_name'), _(33178))
self.progress_updates.update(int((float(self.total_updates - self.worker_queue_size()) / float(self.total_updates))*100)) self.progress_updates.update(int((float(self.total_updates - queue_size) / float(self.total_updates))*100), message="%s: %s" % (_(33178), queue_size))
elif queue_size:
self.progress_updates.update(int((float(self.total_updates - queue_size) / float(self.total_updates))*100), message="%s: %s" % (_(33178), queue_size))
else: else:
self.progress_updates.update(int((float(self.total_updates - self.worker_queue_size()) / float(self.total_updates))*100)) self.progress_updates.update(int((float(self.total_updates - queue_size) / float(self.total_updates))*100), message=_(33178))
if not settings('dbSyncScreensaver.bool') and self.screensaver is None: if not settings('dbSyncScreensaver.bool') and self.screensaver is None:
@ -177,7 +181,7 @@ class Library(threading.Thread):
def worker_queue_size(self): def worker_queue_size(self):
''' Get how many items are queued up for worker threads. Does not give exact ''' Get how many items are queued up for worker threads.
''' '''
total = 0 total = 0
@ -203,7 +207,7 @@ class Library(threading.Thread):
new_thread.start() new_thread.start()
LOG.info("-->[ q:download/%s ]", id(new_thread)) LOG.info("-->[ q:download/%s ]", id(new_thread))
def worker_sort(Self): def worker_sort(self):
''' Get items based on the local emby database and place item in appropriate queues. ''' Get items based on the local emby database and place item in appropriate queues.
''' '''
@ -600,7 +604,7 @@ class UpdatedWorker(threading.Thread):
while True: while True:
try: try:
item = self.queue.get(timeout=3) item = self.queue.get(timeout=1)
except Queue.Empty: except Queue.Empty:
LOG.info("--<[ q:updated/%s ]", id(self)) LOG.info("--<[ q:updated/%s ]", id(self))
@ -644,7 +648,7 @@ class UserDataWorker(threading.Thread):
while True: while True:
try: try:
item = self.queue.get(timeout=3) item = self.queue.get(timeout=1)
except Queue.Empty: except Queue.Empty:
LOG.info("--<[ q:userdata/%s ]", id(self)) LOG.info("--<[ q:userdata/%s ]", id(self))
@ -732,7 +736,7 @@ class RemovedWorker(threading.Thread):
while True: while True:
try: try:
item = self.queue.get(timeout=2) item = self.queue.get(timeout=1)
except Queue.Empty: except Queue.Empty:
LOG.info("--<[ q:removed/%s ]", id(self)) LOG.info("--<[ q:removed/%s ]", id(self))

2
resources/settings.xml
View file

@ -21,7 +21,7 @@
<category label="30506"><!-- Sync Options --> <category label="30506"><!-- Sync Options -->
<setting label="33137" id="kodiCompanion" type="bool" default="true" /> <setting label="33137" id="kodiCompanion" type="bool" default="true" />
<setting label="30507" id="syncIndicator" type="number" default="99" visible="eq(-1,true)" subsetting="true"/> <setting label="30507" id="syncIndicator" type="number" default="99" visible="eq(-1,true)" subsetting="true"/>
<setting label="33177" id="syncProgress" type="number" default="15" visible="eq(-2,true)" subsetting="true"/> <setting label="33177" id="syncProgress" type="number" default="15" visible="true" />
<setting label="30536" id="dbSyncScreensaver" type="bool" default="true" /> <setting label="30536" id="dbSyncScreensaver" type="bool" default="true" />
<setting label="33111" type="lsep" /> <setting label="33111" type="lsep" />
<setting label="30511" id="useDirectPaths" type="enum" lvalues="33036|33037" default="1" /> <setting label="30511" id="useDirectPaths" type="enum" lvalues="33036|33037" default="1" />