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

Merge branch 'master' of github.com:kodiondemand/addon

Browse Source 
* 'master' of github.com:kodiondemand/addon:
  modifica nomi canali in ricerca globale
  uso il titolo reale, non quello inserito dall'utente
  ops
  updater sempre con dialog ok
This commit is contained in:
greko17
2019-12-19 20:00:03 +01:00
parent f63a557c2b 3ef0596bab
commit d0d60eeb64
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platformcode/updater.py
View File

@@ -90,7 +90,7 @@ def check_addon_init():
localCommitFile.close()
c['sha'] = updateFromZip('Aggiornamento in corso...')
localCommitFile = open(addonDir + trackingFile, 'w') # il file di tracking viene eliminato, lo ricreo
changelog += commitJson['commit']['message'] + " | "
changelog += commitJson['commit']['message'] + "\n"
nCommitApplied += 3 # il messaggio sarà lungo, probabilmente, il tempo di vis. è maggiorato
break
@@ -145,11 +145,10 @@ def check_addon_init():
filetools.move(addonDir + file['previous_filename'], addonDir + file['filename'])
alreadyApplied = False
if not alreadyApplied: # non mando notifica se già applicata (es. scaricato zip da github)
changelog += commitJson['commit']['message'] + " | "
changelog += commitJson['commit']['message'] + "\n"
nCommitApplied += 1
if addon.getSetting("addon_update_message"):
time = nCommitApplied * 2000 if nCommitApplied < 10 else 20000
platformtools.dialog_notification('Kodi on Demand', 'Aggiornamenti applicati:\n' + changelog[:-3], time)
platformtools.dialog_ok('Kodi on Demand', 'Aggiornamenti applicati:\n' + changelog)
localCommitFile.seek(0)
localCommitFile.truncate()

23
specials/search.py
View File

@@ -158,9 +158,10 @@ def channel_search(item):
results = list()
valid = list()
ch_list = dict()
to_temp = dict()
mode = item.mode
max_results = 10
if item.infoLabels['title']:
item.text = item.infoLabels['title']
searched_id = item.infoLabels['tmdb_id']
@@ -169,15 +170,16 @@ def channel_search(item):
from lib import cloudscraper
session = cloudscraper.create_scraper()
searching += channel_list
searching += [ch[0] for ch in channel_list]
searching_titles = [ch[1] for ch in channel_list]
cnt = 0
progress = platformtools.dialog_progress(config.get_localized_string(30993) % item.title, config.get_localized_string(70744) % len(channel_list),
str(searching))
str(searching_titles))
config.set_setting('tmdb_active', False)
with futures.ThreadPoolExecutor() as executor:
c_results = [executor.submit(get_channel_results, ch, item, session) for ch in channel_list]
c_results = [executor.submit(get_channel_results, ch[0], item, session) for ch in channel_list]
for res in futures.as_completed(c_results):
cnt += 1
@@ -188,9 +190,10 @@ def channel_search(item):
if progress.iscanceled():
break
if finished in searching:
searching_titles.remove(searching_titles[searching.index(finished)])
searching.remove(finished)
progress.update((cnt * 100) / len(channel_list), config.get_localized_string(70744) % str(len(channel_list) - cnt),
str(searching))
str(searching_titles))
progress.close()
@@ -201,8 +204,12 @@ def channel_search(item):
config.set_setting('tmdb_active', True)
res_count = 0
for key, value in ch_list.items():
ch_path = filetools.join(config.get_runtime_path(),'channels',key+'.json')
ch_name = jsontools.load(filetools.read(ch_path))['name']
for ch in channel_list:
if ch[0] == key:
ch_name = ch[1]
break
else:
ch_name = key
grouped = list()
cnt += 1
progress.update((cnt * 100) / len(ch_list), config.get_localized_string(60295), config.get_localized_string(60293))
@@ -326,7 +333,7 @@ def get_channels(item):
if item.mode == 'all' or (item.mode in list_cat):
if config.get_setting("include_in_global_search", channel):
channels_list.append(channel)
channels_list.append((channel, ch_param.get('title', channel)))
return channels_list