stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Revert "test processi in ricerca globale"

Browse Source 
This reverts commit 3f32c572
This commit is contained in:
marco
2019-11-20 13:12:14 +01:00
parent 9dad4bc4d6
commit ff7e3a3fc0
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/search.py
+8 -21
View File
@@ -18,8 +18,7 @@ from platformcode import config, logger
from platformcode import platformtools from platformcode import platformtools
from core.support import typo from core.support import typo
import cPickle, shutil import cPickle, shutil
from multiprocessing import Process global_lock = threading.Lock()
multi = 'process'
addon = xbmcaddon.Addon('metadata.themoviedb.org') addon = xbmcaddon.Addon('metadata.themoviedb.org')
def_lang = addon.getSetting('language') def_lang = addon.getSetting('language')
@@ -574,15 +573,10 @@ def do_search(item, categories=None):
logger.info("Búsqueda cancelada") logger.info("Búsqueda cancelada")
return itemlist return itemlist
if multithread: if multithread:
if multi == 'threads': t = Thread(target=channel_search, args=[search_results, channel_parameters, tecleado],
t = Thread(target=channel_search, args=[search_results, channel_parameters, tecleado], name=channel_parameters["title"])
name=channel_parameters["title"]) t.setDaemon(True)
t.setDaemon(True) t.start()
t.start()
else:
t = Process(target=channel_search, args=[search_results, channel_parameters, tecleado],
name=channel_parameters["title"])
t.start()
threads.append(t) threads.append(t)
# Modo single Thread # Modo single Thread
else: else:
@@ -612,26 +606,19 @@ def search_progress(threads):
import math import math
progreso = platformtools.dialog_progress_bg(config.get_localized_string(20000), "") progreso = platformtools.dialog_progress_bg(config.get_localized_string(20000), "")
if multi == 'threads': pendent = [a for a in threads if a.isAlive()]
pendent = [a for a in threads if a.isAlive()]
else:
pendent = [a for a in threads if a.is_alive()]
if len(pendent) > 0: t = float(100) / len(pendent) if len(pendent) > 0: t = float(100) / len(pendent)
while len(pendent) > 0: while len(pendent) > 0:
index = (len(threads) - len(pendent)) + 1 index = (len(threads) - len(pendent)) + 1
percentage = int(math.ceil(index * t)) percentage = int(math.ceil(index * t))
list_pendent_names = ['test' for a in pendent] list_pendent_names = [a.getName() for a in pendent]
mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names)) mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names))
progreso.update(percentage, progreso.update(percentage,
config.get_localized_string(60521) % (len(threads) - len(pendent) + 1, len(threads)), config.get_localized_string(60521) % (len(threads) - len(pendent) + 1, len(threads)),
mensaje) mensaje)
time.sleep(0.5) time.sleep(0.5)
if multi == 'threads': pendent = [a for a in threads if a.isAlive()]
pendent = [a for a in threads if a.isAlive()]
else:
pendent = [a for a in threads if a.is_alive()]
progreso.close() progreso.close()
with open(os.path.join(res_dir, 'done'), 'w') as f: with open(os.path.join(res_dir, 'done'), 'w') as f:
f.write('1') f.write('1')