diff --git a/addon.xml b/addon.xml index 62057a4..8f3f296 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 65e244c..7be6073 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -125,11 +125,21 @@ msgctxt "#30036" msgid "Exclude AAC audio tracks" msgstr "" +# For SkyOTT only +msgctxt "#30037" +msgid "Enable HDCP" +msgstr "" + # For SkyOTT only msgctxt "#30040" msgid "Use only for these languages (e.g.: es en pt):" msgstr "" +# For SkyOTT only +msgctxt "#30041" +msgid "Subscription country (two letter code):" +msgstr "" + msgctxt "#30101" msgid "Menu" msgstr "" @@ -357,6 +367,7 @@ msgctxt "#30204" msgid "Video not available" msgstr "" +# For SkyOTT only msgctxt "#30205" msgid "No playback URL" msgstr "" @@ -365,6 +376,11 @@ msgctxt "#30206" msgid "Proxy is not running" msgstr "" +# For SkyOTT only +msgctxt "#30207" +msgid "No user token" +msgstr "" + # For Orange and Movistar only msgctxt "#30300" msgid "IPTV Manager" @@ -397,7 +413,7 @@ msgstr "" # For Orange and Movistar only msgctxt "#30306" -msgid "Save to this folder (requires restart)" +msgid "Save channels and EPG to this folder" msgstr "" # For Orange and Movistar only diff --git a/resources/language/resource.language.es_es/strings.po b/resources/language/resource.language.es_es/strings.po index ddb69d8..af4237e 100644 --- a/resources/language/resource.language.es_es/strings.po +++ b/resources/language/resource.language.es_es/strings.po @@ -109,10 +109,20 @@ msgctxt "#30036" msgid "Exclude AAC audio tracks" msgstr "Excluir audio AAC" +# For SkyOTT only +msgctxt "#30037" +msgid "Enable HDCP" +msgstr "Habilitar HDCP" + msgctxt "#30040" msgid "Use only for these languages (e.g.: es en pt):" msgstr "Usar solo para estos idiomas (ej: es en pt):" +# For SkyOTT only +msgctxt "#30041" +msgid "Subscription country (two letter code):" +msgstr "País de la suscripción (código de dos letras):" + msgctxt "#30101" msgid "Menu" msgstr "Menú" @@ -341,6 +351,11 @@ msgctxt "#30206" msgid "Proxy is not running" msgstr "El proxy no está funcionando" +# For SkyOTT only +msgctxt "#30207" +msgid "No user token" +msgstr "No hay token de usuario" + msgctxt "#30300" msgid "IPTV Manager" msgstr "IPTV Manager" @@ -362,8 +377,8 @@ msgid "Export channels and EPG for IPTV automatically" msgstr "Exportar automáticamente canales y guía para IPTV" msgctxt "#30306" -msgid "Save to this folder (requires restart)" -msgstr "Guardar en esta carpeta (requiere reinicio)" +msgid "Save channels and EPG to this folder" +msgstr "Guardar canales y EPG en esta carpeta" msgctxt "#30307" msgid "Install IPTV Simple add-on" diff --git a/resources/lib/movistar.py b/resources/lib/movistar.py index 6a870ce..bb1e9b2 100644 --- a/resources/lib/movistar.py +++ b/resources/lib/movistar.py @@ -659,6 +659,17 @@ class Movistar(object): self.search_list = [s for s in self.search_list if s != search_term] self.cache.save_file('searchs.json', json.dumps(self.search_list, ensure_ascii=False)) + def get_favorite_data(self, links): + res = {} + for link in links: + name = link['rel'] + if 'favorites' in name: + d = {} + d['id'] = link['id'] + d['family'] = link.get('href', '').split("/")[-2] + res[name] = d + return res + def get_title(self, data): t = {} t['info'] = {} @@ -671,7 +682,9 @@ class Movistar(object): t['info']['genre'] = ed['GeneroComAntena'] if ed.get('TipoComercial') == 'Impulsivo': return None # Alquiler if 'Seguible' in ed: t['seguible'] = ed['Seguible'] - if 'links' in data: t['links'] = data['links'] + if 'links' in data: + #t['links'] = data['links'] + t['favorite_data'] = self.get_favorite_data(data['links']) if ed['TipoContenido'] in ['Individual', 'Episodio']: t['type'] = 'movie' t['stream_type'] = 'vod' diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py index 4cdc214..906caab 100644 --- a/resources/lib/plugin.py +++ b/resources/lib/plugin.py @@ -244,16 +244,29 @@ def add_videos(category, ctype, videos, ref=None, url_next=None, url_prev=None, stype = 'vod' possible_to_add = False - if t['type'] in ['series', 'season']: - possible_to_add = t.get('seguible', False) + if from_wishlist: + # Remove from wishlist + if 'favorite_data' in t: + if 'favorites2' in t['favorite_data']: + id = t['favorite_data']['favorites2']['id'] + stype = t['favorite_data']['favorites2']['family'] + possible_to_add = True + elif t['type'] == 'season' and 'favorites2.season' in t['favorite_data']: + id = t['favorite_data']['favorites2.season']['id'] + stype = t['favorite_data']['favorites2.season']['family'] + possible_to_add = True + else: + # Add to wishlist + if t['type'] in ['series', 'season']: + possible_to_add = t.get('seguible', False) - if t['type'] == 'movie': - if t.get('stream_type') == 'vod': - possible_to_add = t['url'] != '' - if 'show_id' in t: - possible_to_add = t['url'] != '' - stype = 'tv' - id = t['show_id'] + if t['type'] == 'movie': + if t.get('stream_type') == 'vod': + possible_to_add = t['url'] != '' + if 'show_id' in t: + possible_to_add = t['url'] != '' + stype = 'tv' + id = t['show_id'] if possible_to_add: if not from_wishlist: diff --git a/resources/settings.xml b/resources/settings.xml index bf3f282..996ff65 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -33,11 +33,11 @@ --> - - - - - + + + + +