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

Aggiunto filtro Qualità e Lingua anche a Download

Browse Source
This commit is contained in:
Alhaziel
2019-09-11 18:01:26 +02:00
parent 091125ed08
commit 6493c127fa
2 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/videolibrarytools.py
+13 -13
View File
@@ -222,17 +222,17 @@ def save_movie(item):
p_dialog.close() p_dialog.close()
return 0, 0, -1 return 0, 0, -1
def filter_list(episodelist, action, path=None): def filter_list(episodelist, action=None, path=None):
lang_sel = quality_sel = '' lang_sel = quality_sel = ''
if action:
tvshow_path = filetools.join(path, "tvshow.nfo") tvshow_path = filetools.join(path, "tvshow.nfo")
head_nfo, tvshow_item = read_nfo(tvshow_path) head_nfo, tvshow_item = read_nfo(tvshow_path)
if action == 'get_seasons': if action == 'get_seasons':
if tvshow_item: if tvshow_item:
if "favourite_language" in tvshow_item: if "favourite_language" in tvshow_item:
lang_sel = tvshow_item.favourite_language lang_sel = tvshow_item.favourite_language
if "favourite_quality" in tvshow_item: if "favourite_quality" in tvshow_item:
quality_sel = tvshow_item.favourite_quality quality_sel = tvshow_item.favourite_quality
# SELECT EISODE BY LANG AND QUALITY # SELECT EISODE BY LANG AND QUALITY
quality_dict = {"BLURAY": ["br", "bluray"], quality_dict = {"BLURAY": ["br", "bluray"],
@@ -260,7 +260,7 @@ def filter_list(episodelist, action, path=None):
it = [] it = []
for episode in episodelist: for episode in episodelist:
if episode.contentLanguage == lang_list[selection]: if episode.contentLanguage == lang_list[selection]:
tvshow_item.favourite_language = lang_list[selection] if action: tvshow_item.favourite_language = lang_list[selection]
it.append(episode) it.append(episode)
episodelist = it episodelist = it
@@ -284,12 +284,12 @@ def filter_list(episodelist, action, path=None):
it = [] it = []
for episode in episodelist: for episode in episodelist:
if episode.title in ep_list: if episode.title in ep_list:
tvshow_item.favourite_quality = quality_list[favourite_quality_selection] if action: tvshow_item.favourite_quality = quality_list[favourite_quality_selection]
it.append(episode) it.append(episode)
episodelist = it episodelist = it
# logger.info('ITEM NFO= ' + str(tvshow_item)) # logger.info('ITEM NFO= ' + str(tvshow_item))
filetools.write(tvshow_path, head_nfo + tvshow_item.tojson()) if action: filetools.write(tvshow_path, head_nfo + tvshow_item.tojson())
return episodelist return episodelist
def save_tvshow(item, episodelist): def save_tvshow(item, episodelist):
specials/downloads.py
+2 -25
View File
@@ -317,11 +317,6 @@ def move_to_libray(item):
xbmc.sleep(500) xbmc.sleep(500)
xbmc_videolibrary.clean() xbmc_videolibrary.clean()
if config.get_setting("library_add", "downloads") == True and config.get_setting("library_move", "downloads") == False: if config.get_setting("library_add", "downloads") == True and config.get_setting("library_move", "downloads") == False:
if filetools.isfile(final_path): if filetools.isfile(final_path):
if item.contentType == "movie" and item.infoLabels["tmdb_id"]: if item.contentType == "movie" and item.infoLabels["tmdb_id"]:
@@ -780,26 +775,8 @@ def get_episodes(item):
logger.info("Omitting invalid item: %s" % episode.tostring()) logger.info("Omitting invalid item: %s" % episode.tostring())
# if Multiple Languages or Qualities # if Multiple Languages or Qualities
list_lang = [] itemlist = videolibrarytools.filter_list(itemlist)
list_quality = []
for item in itemlist:
if not item.language: item.language = item.contentLanguage
if item.language not in list_lang: list_lang.append(item.language)
if item.infoLabels['quality'] not in list_quality: list_quality.append(item.infoLabels['quality'])
if len(list_lang) > 1:
selection = platformtools.dialog_select(config.get_localized_string(70725),list_lang)
it = []
for item in itemlist:
if not item.language: item.language = item.contentLanguage
if item.language == list_lang[selection]:
it.append(item)
itemlist = it
if len(list_quality) > 1:
selection = platformtools.dialog_select(config.get_localized_string(70726),list_quality)
it = []
for item in itemlist:
if item.infoLabels['quality'] == list_quality[selection]: it.append(item)
itemlist = it
return itemlist return itemlist