From 4ac77a3307da5f167c1eba16704e6a94e10753e2 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Tue, 14 Aug 2018 15:11:25 -0500 Subject: [PATCH] fix languages, tvmovidedb, watchvideo --- plugin.video.alfa/channels/tvmoviedb.py | 2 +- .../resources/language/English/strings.po | 2 +- .../resources/language/Italian/strings.po | 2 +- .../language/Spanish (Argentina)/strings.po | 16 ++++++------ .../language/Spanish (Mexico)/strings.po | 16 ++++++------ .../resources/language/Spanish/strings.po | 16 ++++++------ plugin.video.alfa/servers/watchvideo.py | 26 +++++-------------- 7 files changed, 34 insertions(+), 46 deletions(-) diff --git a/plugin.video.alfa/channels/tvmoviedb.py b/plugin.video.alfa/channels/tvmoviedb.py index 12e1b19d..2eabf442 100644 --- a/plugin.video.alfa/channels/tvmoviedb.py +++ b/plugin.video.alfa/channels/tvmoviedb.py @@ -1070,7 +1070,7 @@ def filtro_imdb(item): list_controls.append({'id': 'orden', 'label': config.get_localized_string(70455), 'enabled': True, 'color': '0xFF25AA48', 'type': 'list', 'default': -1, 'visible': True}) orden = [config.get_localized_string(70456), config.get_localized_string(70457), config.get_localized_string(70458), config.get_localized_string(70459), config.get_localized_string(70460), config.get_localized_string(70461), - config.get_localized_string(70462, config.get_localized_string(70463)] + config.get_localized_string(70462), config.get_localized_string(70463)] orden_imdb = ['moviemeter,asc', 'moviemeter,desc', 'year,desc', 'year,asc', 'user_rating,desc', 'user_rating,asc', 'alpha,asc', 'alpha,desc'] diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po index 9fca45a7..62983bf0 100644 --- a/plugin.video.alfa/resources/language/English/strings.po +++ b/plugin.video.alfa/resources/language/English/strings.po @@ -2902,7 +2902,7 @@ msgid "Search Movies/TV Shows" msgstr "" msgctxt "#70047" -msgid " Search by director" +msgid "Search by director" msgstr "" msgctxt "#70048" diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index 3c2c5148..950f4d09 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -2890,7 +2890,7 @@ msgid "Search Movies/TV Shows" msgstr "Cerca Film/Serie TV" msgctxt "#70047" -msgid " Search by director" +msgid "Search by director" msgstr "Cerca per regista" msgctxt "#70048" diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po index 80ea8959..588352ea 100644 --- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po @@ -479,7 +479,7 @@ msgstr "Elegir canales incluidos en la búsqueda" msgctxt "#59995" msgid "Saved Searches" -msgstr "Búsquedasguardadas" +msgstr "Búsquedas guardadas" msgctxt "#59996" msgid "Delete saved searches" @@ -2846,7 +2846,7 @@ msgid "Genres" msgstr "Géneros" msgctxt "#70033" -msgid "Actors / Actresses by popularity" +msgid "Actors/Actresses by popularity" msgstr "Actores/Actrices por popularidad" msgctxt "#70034" @@ -2858,12 +2858,12 @@ msgid "Search %s" msgstr "Buscar %s" msgctxt "#70036" -msgid " Search actor/actress" -msgstr " Buscar actor/actriz" +msgid "Search actor/actress" +msgstr "Buscar actor/actriz" msgctxt "#70037" -msgid " Search director, writer..." -msgstr " Buscar director, guionista..." +msgid "Search director, writer..." +msgstr "Buscar director, escritor..." msgctxt "#70038" msgid "Custom Filter" @@ -2902,8 +2902,8 @@ msgid "Search Movies/TV Shows" msgstr "Buscar Películas/Series" msgctxt "#70047" -msgid " Search by director" -msgstr " Buscar por director" +msgid "Search by director" +msgstr "Buscar por director" msgctxt "#70048" msgid " My Account" diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po index 80ea8959..588352ea 100644 --- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po @@ -479,7 +479,7 @@ msgstr "Elegir canales incluidos en la búsqueda" msgctxt "#59995" msgid "Saved Searches" -msgstr "Búsquedasguardadas" +msgstr "Búsquedas guardadas" msgctxt "#59996" msgid "Delete saved searches" @@ -2846,7 +2846,7 @@ msgid "Genres" msgstr "Géneros" msgctxt "#70033" -msgid "Actors / Actresses by popularity" +msgid "Actors/Actresses by popularity" msgstr "Actores/Actrices por popularidad" msgctxt "#70034" @@ -2858,12 +2858,12 @@ msgid "Search %s" msgstr "Buscar %s" msgctxt "#70036" -msgid " Search actor/actress" -msgstr " Buscar actor/actriz" +msgid "Search actor/actress" +msgstr "Buscar actor/actriz" msgctxt "#70037" -msgid " Search director, writer..." -msgstr " Buscar director, guionista..." +msgid "Search director, writer..." +msgstr "Buscar director, escritor..." msgctxt "#70038" msgid "Custom Filter" @@ -2902,8 +2902,8 @@ msgid "Search Movies/TV Shows" msgstr "Buscar Películas/Series" msgctxt "#70047" -msgid " Search by director" -msgstr " Buscar por director" +msgid "Search by director" +msgstr "Buscar por director" msgctxt "#70048" msgid " My Account" diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po index 80ea8959..588352ea 100644 --- a/plugin.video.alfa/resources/language/Spanish/strings.po +++ b/plugin.video.alfa/resources/language/Spanish/strings.po @@ -479,7 +479,7 @@ msgstr "Elegir canales incluidos en la búsqueda" msgctxt "#59995" msgid "Saved Searches" -msgstr "Búsquedasguardadas" +msgstr "Búsquedas guardadas" msgctxt "#59996" msgid "Delete saved searches" @@ -2846,7 +2846,7 @@ msgid "Genres" msgstr "Géneros" msgctxt "#70033" -msgid "Actors / Actresses by popularity" +msgid "Actors/Actresses by popularity" msgstr "Actores/Actrices por popularidad" msgctxt "#70034" @@ -2858,12 +2858,12 @@ msgid "Search %s" msgstr "Buscar %s" msgctxt "#70036" -msgid " Search actor/actress" -msgstr " Buscar actor/actriz" +msgid "Search actor/actress" +msgstr "Buscar actor/actriz" msgctxt "#70037" -msgid " Search director, writer..." -msgstr " Buscar director, guionista..." +msgid "Search director, writer..." +msgstr "Buscar director, escritor..." msgctxt "#70038" msgid "Custom Filter" @@ -2902,8 +2902,8 @@ msgid "Search Movies/TV Shows" msgstr "Buscar Películas/Series" msgctxt "#70047" -msgid " Search by director" -msgstr " Buscar por director" +msgid "Search by director" +msgstr "Buscar por director" msgctxt "#70048" msgid " My Account" diff --git a/plugin.video.alfa/servers/watchvideo.py b/plugin.video.alfa/servers/watchvideo.py index 879fe6eb..43bea8fc 100755 --- a/plugin.video.alfa/servers/watchvideo.py +++ b/plugin.video.alfa/servers/watchvideo.py @@ -8,35 +8,23 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - if "Not Found" in data or "File was deleted" in data: return False, "[Watchvideo] El fichero no existe o ha sido borrado" - return True, "" def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("url=" + page_url) - - data = httptools.downloadpage(page_url).data - enc_data = scrapertools.find_single_match(data, "type='text/javascript'>(eval.*?)\s*") - dec_data = jsunpack.unpack(enc_data) - video_urls = [] - media_urls = scrapertools.find_multiple_matches(dec_data, '\{file\s*:\s*"([^"]+)",label\s*:\s*"([^"]+)"\}') - for media_url, label in media_urls: - ext = scrapertools.get_filename_from_url(media_url)[-4:] - video_urls.append(["%s %sp [watchvideo]" % (ext, label), media_url]) - + data = httptools.downloadpage(page_url).data + media_urls = scrapertools.find_multiple_matches(data, 'file:"([^"]+)"') + for media_url in media_urls: + ext = "mp4" + if "m3u8" in media_url: + ext = "m3u8" + video_urls.append(["%s [watchvideo]" % (ext), media_url]) video_urls.reverse() - m3u8 = scrapertools.find_single_match(dec_data, '\{file\:"(.*?.m3u8)"\}') - if m3u8: - title = video_urls[-1][0].split(" ", 1)[1] - video_urls.insert(0, [".m3u8 %s" % title, m3u8]) - for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) - return video_urls