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

fix languages, tvmovidedb, watchvideo

Browse Source
This commit is contained in:
Intel1
2018-08-14 15:11:25 -05:00
parent 16293d252e
commit 4ac77a3307
7 changed files with 34 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.video.alfa/channels/tvmoviedb.py
View File

@@ -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']

2
plugin.video.alfa/resources/language/English/strings.po
View File

@@ -2902,7 +2902,7 @@ msgid "Search Movies/TV Shows"
msgstr ""
msgctxt "#70047"
msgid " Search by director"
msgid "Search by director"
msgstr ""
msgctxt "#70048"

2
plugin.video.alfa/resources/language/Italian/strings.po
View File

@@ -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"

16
plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
View File

@@ -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"

16
plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
View File

@@ -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"

16
plugin.video.alfa/resources/language/Spanish/strings.po
View File

@@ -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"

26
plugin.video.alfa/servers/watchvideo.py
View File

@@ -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*</script>")
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