diff --git a/plugin.video.alfa/channels/doramasmp4.py b/plugin.video.alfa/channels/doramasmp4.py
index 7926eeee..3f6139a1 100644
--- a/plugin.video.alfa/channels/doramasmp4.py
+++ b/plugin.video.alfa/channels/doramasmp4.py
@@ -40,7 +40,7 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, title="Películas", action="list_all",
url=host + 'catalogue?format=pelicula', thumbnail=get_thumb('movies', auto=True),
type='movie'))
- itemlist.append(Item(channel=item.channel, title = 'Buscar', action="search", url= host+'search?q=',
+ itemlist.append(Item(channel=item.channel, title = 'Buscar', action="search", url= host+'ajax/search.php',
thumbnail=get_thumb('search', auto=True)))
autoplay.show_option(item.channel, itemlist)
@@ -81,10 +81,9 @@ def list_all(item):
else:
new_item.contentSerieName=scrapedtitle
- new_item.action = 'episodes'
+ new_item.action = 'episodios'
itemlist.append(new_item)
-
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
# Paginacion
@@ -101,6 +100,33 @@ def list_all(item):
return itemlist
+def search_results(item):
+ logger.info()
+
+ itemlist=[]
+ data = httptools.downloadpage(item.url, post=item.post).data
+ data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data)
+ patron = '
.*?500>(.*?)'
+ patron += '(.*?)
.*?200>(.*?)'
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ for scrapedurl, scrapedthumbnail, scrapedtitle, year, scrapedtype in matches:
+ new_item = Item(channel=item.channel, url=scrapedurl, thumbnail=scrapedthumbnail, title=scrapedtitle)
+
+ if scrapedtype != 'dorama':
+ new_item.action = 'findvideos'
+ new_item.contentTitle = scrapedtitle
+
+ else:
+ new_item.contentSerieName=scrapedtitle
+ new_item.action = 'episodios'
+ itemlist.append(new_item)
+
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+ return itemlist
+
+
def latest_episodes(item):
logger.info()
itemlist = []
@@ -121,11 +147,10 @@ def latest_episodes(item):
return itemlist
-def episodes(item):
+def episodios(item):
logger.info()
itemlist = []
data = get_source(item.url)
- logger.debug(data)
patron = '(.*?)<.*?'
patron +='text-muted mb-1>Capítulo (.*?)'
@@ -154,7 +179,7 @@ def episodes(item):
if config.get_videolibrary_support() and len(itemlist) > 0:
itemlist.append(
- item.clone(title="Añadir esta serie a la videoteca", action="add_serie_to_library", extra="episodes", text_color='yellow'))
+ item.clone(title="Añadir esta serie a la videoteca", action="add_serie_to_library", extra="episodios", text_color='yellow'))
return itemlist
def findvideos(item):
@@ -164,7 +189,6 @@ def findvideos(item):
duplicated = []
headers={'referer':item.url}
data = get_source(item.url)
- logger.debug(data)
patron = 'animated pulse data-url=(.*?)>'
matches = re.compile(patron, re.DOTALL).findall(data)
if ' ¡Este capítulo no tiene subtítulos, solo audio original! ' in data:
@@ -176,7 +200,7 @@ def findvideos(item):
item.type = 'dorama'
item.contentSerieName = item.contentTitle
item.contentTitle = ''
- return episodes(item)
+ return episodios(item)
else:
for video_url in matches:
@@ -239,13 +263,17 @@ def findvideos(item):
def search(item, texto):
logger.info()
+ import urllib
itemlist = []
texto = texto.replace(" ", "+")
- item.url = item.url + texto
+ item.url = item.url
+ post = {'q':texto}
+ post = urllib.urlencode(post)
item.type = 'search'
+ item.post = post
if texto != '':
try:
- return list_all(item)
+ return search_results(item)
except:
itemlist.append(item.clone(url='', title='No hay elementos...', action=''))
return itemlist
diff --git a/plugin.video.alfa/channels/novelashdgratis.py b/plugin.video.alfa/channels/novelashdgratis.py
index 0fad07f8..a1adc345 100644
--- a/plugin.video.alfa/channels/novelashdgratis.py
+++ b/plugin.video.alfa/channels/novelashdgratis.py
@@ -13,7 +13,7 @@ from platformcode import config, logger
from channels import filtertools
from channels import autoplay
-host = 'http://www.novelashdgratis.io'
+host = 'http://www.novelasgratishd.tv'
IDIOMAS = {'la':'Latino'}
list_language = IDIOMAS.values()
diff --git a/plugin.video.alfa/channels/poseidonhd.py b/plugin.video.alfa/channels/poseidonhd.py
index b9e9dbf0..f623a0f8 100644
--- a/plugin.video.alfa/channels/poseidonhd.py
+++ b/plugin.video.alfa/channels/poseidonhd.py
@@ -256,7 +256,6 @@ def findvideos(item):
for url in urls:
final_url = httptools.downloadpage('https:'+url).data
-
if language == 'VOSE':
sub = scrapertools.find_single_match(url, 'sub=(.*?)&')
subs = 'https:%s' % sub
@@ -265,7 +264,7 @@ def findvideos(item):
file_id = scrapertools.find_single_match(url, 'file=(.*?)&')
post = {'link': file_id}
post = urllib.urlencode(post)
- hidden_url = 'https://streamango.poseidonhd.com/repro/plugins/gkpluginsphp.php'
+ hidden_url = 'https://streamango.poseidonhd.net/repro/plugins/gkpluginsphp.php'
data_url = httptools.downloadpage(hidden_url, post=post).data
dict_vip_url = jsontools.load(data_url)
url = dict_vip_url['link']
@@ -273,7 +272,7 @@ def findvideos(item):
file_id = scrapertools.find_single_match(url, 'url=(.*?)&')
post = {'url': file_id}
post = urllib.urlencode(post)
- hidden_url = 'https://streamango.poseidonhd.com/repro/r.php'
+ hidden_url = 'https://streamango.poseidonhd.net/repro/r.php'
data_url = httptools.downloadpage(hidden_url, post=post, follow_redirects=False)
url = data_url.headers['location']
diff --git a/plugin.video.alfa/channels/tvvip.py b/plugin.video.alfa/channels/tvvip.py
index b23f092d..6d9951bb 100644
--- a/plugin.video.alfa/channels/tvvip.py
+++ b/plugin.video.alfa/channels/tvvip.py
@@ -607,14 +607,25 @@ def findvideos(item):
def play(item):
logger.info()
itemlist = []
+ #logger.debug('item.url %s' % item.url)
uri = scrapertools.find_single_match(item.url, '(/transcoder[\w\W]+)')
- uri_request = host + "/video-prod/s/uri?uri=%s&_=%s" % (uri, int(time.time()))
+ s = scrapertools.find_single_match(item.url, r'http.*?://(.*?)\.')
+ #logger.debug('uri %s' % uri)
+ #logger.debug('s %s'% s)
+ uri_request = host + "/video2-prod/s/uri?uri=%s&s=%s&_=%s" % (uri, s, int(time.time()))
data = httptools.downloadpage(uri_request).data
data = jsontools.load(data)
- url = item.url.replace(".tv-vip.com/transcoder/", ".tv-vip.in/c/transcoder/") + "?tt=" + str(data['tt']) + \
- "&mm=" + data['mm'] + "&bb=" + data['bb']
- url += "|User-Agent=Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Mobile Safari/537.36"
+ #logger.debug(data)
+ if data['s'] == None:
+ data['s'] = ''
+ url = item.url.replace(".tv-vip.com/transcoder/", ".%s/e/transcoder/") % (data['b']) + "?tt=" + str(data['a']['tt']) + \
+ "&mm=" + data['a']['mm'] + "&bb=" + data['a']['bb']
+
+ #logger.debug(url)
+ #url += "|User-Agent=Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Mobile Safari/537.36"
+
itemlist.append(item.clone(action="play", server="directo", url=url, folder=False))
+
return itemlist
diff --git a/plugin.video.alfa/platformcode/launcher.py b/plugin.video.alfa/platformcode/launcher.py
index 89844318..0ab22181 100644
--- a/plugin.video.alfa/platformcode/launcher.py
+++ b/plugin.video.alfa/platformcode/launcher.py
@@ -280,7 +280,7 @@ def run(item=None):
canal = scrapertools.find_single_match(traceback.format_exc(), patron)
platformtools.dialog_ok(
- config.get_localized_string(70093) + canal,
+ config.get_localized_string(59985) + canal,
config.get_localized_string(60013) %(e))
except:
import traceback
diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py
index 5ac86e8a..eafea016 100644
--- a/plugin.video.alfa/platformcode/platformtools.py
+++ b/plugin.video.alfa/platformcode/platformtools.py
@@ -608,6 +608,7 @@ def play_video(item, strm=False, force_direct=False, autoplay=False):
logger.info()
# logger.debug(item.tostring('\n'))
logger.debug('item play: %s'%item)
+ xbmc_player = XBMCPlayer()
if item.channel == 'downloads':
logger.info("Reproducir video local: %s [%s]" % (item.title, item.url))
xlistitem = xbmcgui.ListItem(path=item.url)
@@ -674,7 +675,6 @@ def play_video(item, strm=False, force_direct=False, autoplay=False):
playlist.add(mediaurl, xlistitem)
# Reproduce
- xbmc_player = XBMCPlayer()
xbmc_player.play(playlist, xlistitem)
else:
set_player(item, xlistitem, mediaurl, view, strm)
diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po
index 27a1d0a0..f977fbb8 100644
--- a/plugin.video.alfa/resources/language/English/strings.po
+++ b/plugin.video.alfa/resources/language/English/strings.po
@@ -442,7 +442,7 @@ msgid "An error has occurred in alfa, \nCheck log for more details."
msgstr ""
msgctxt "#59985"
-msgid "Error in the channel"
+msgid "Error in the channel "
msgstr ""
msgctxt "#59986"
@@ -3302,7 +3302,7 @@ msgid "VOS (Original Subtitled Version)"
msgstr ""
msgctxt "#70144"
-msgid "VO (Original Version Originale)"
+msgid "VO (Original Version)"
msgstr ""
msgctxt "#70145"
diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po
index 98c4d708..e0216715 100644
--- a/plugin.video.alfa/resources/language/Italian/strings.po
+++ b/plugin.video.alfa/resources/language/Italian/strings.po
@@ -442,8 +442,8 @@ msgid "An error has occurred in alfa, \nCheck log for more details."
msgstr "Si è verificato un errore in alfa, \nControlla il log per maggiori dettagli."
msgctxt "#59985"
-msgid "Error in the channel"
-msgstr "Errore nel canale"
+msgid "Error in the channel "
+msgstr "Errore nel canale "
msgctxt "#59986"
msgid "Error loading the server: %s\n"
@@ -3290,7 +3290,7 @@ msgid "VOS (Original Subtitled Version)"
msgstr "VOS (Version Original Sottotitolato)"
msgctxt "#70144"
-msgid "VO (Original Version Originale)"
+msgid "VO (Original Version)"
msgstr "VO (Original)"
msgctxt "#70145"
diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
index 54e2cb35..2de12a54 100644
--- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
+++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
@@ -442,8 +442,8 @@ msgid "An error has occurred in alfa, \nCheck log for more details."
msgstr "Se ha producido un error en alfa,\nComprueba el log para ver mas detalles del error."
msgctxt "#59985"
-msgid "Error in the channel"
-msgstr "Error en el canal"
+msgid "Error in the channel "
+msgstr "Error en el canal "
msgctxt "#59986"
msgid "Error loading the server: %s\n"
@@ -3375,7 +3375,7 @@ msgstr "Opciones para Titulos"
msgctxt "#70168"
msgid "General"
-msgstr "Generale"
+msgstr "General"
msgctxt "#70169"
msgid "Servers use"
diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
index 54e2cb35..2de12a54 100644
--- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
+++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
@@ -442,8 +442,8 @@ msgid "An error has occurred in alfa, \nCheck log for more details."
msgstr "Se ha producido un error en alfa,\nComprueba el log para ver mas detalles del error."
msgctxt "#59985"
-msgid "Error in the channel"
-msgstr "Error en el canal"
+msgid "Error in the channel "
+msgstr "Error en el canal "
msgctxt "#59986"
msgid "Error loading the server: %s\n"
@@ -3375,7 +3375,7 @@ msgstr "Opciones para Titulos"
msgctxt "#70168"
msgid "General"
-msgstr "Generale"
+msgstr "General"
msgctxt "#70169"
msgid "Servers use"
diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po
index 54e2cb35..2de12a54 100644
--- a/plugin.video.alfa/resources/language/Spanish/strings.po
+++ b/plugin.video.alfa/resources/language/Spanish/strings.po
@@ -442,8 +442,8 @@ msgid "An error has occurred in alfa, \nCheck log for more details."
msgstr "Se ha producido un error en alfa,\nComprueba el log para ver mas detalles del error."
msgctxt "#59985"
-msgid "Error in the channel"
-msgstr "Error en el canal"
+msgid "Error in the channel "
+msgstr "Error en el canal "
msgctxt "#59986"
msgid "Error loading the server: %s\n"
@@ -3375,7 +3375,7 @@ msgstr "Opciones para Titulos"
msgctxt "#70168"
msgid "General"
-msgstr "Generale"
+msgstr "General"
msgctxt "#70169"
msgid "Servers use"
diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 2612be0e..cf62b4d5 100644
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -1,121 +1,121 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
-
+ default="70137" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/plugin.video.alfa/servers/mega.json b/plugin.video.alfa/servers/mega.json
index 7d69d2b2..040f56c5 100755
--- a/plugin.video.alfa/servers/mega.json
+++ b/plugin.video.alfa/servers/mega.json
@@ -12,7 +12,7 @@
"url": "https://\\1"
},
{
- "pattern": "(mega.nz/\\#\\![A-Za-z0-9\\-\\_]+\\![A-Za-z0-9\\-\\_]+)",
+ "pattern": "(mega.nz/(?:embed|)\\#\\![A-Za-z0-9\\-\\_]+\\![A-Za-z0-9\\-\\_]+)",
"url": "https://\\1"
},
{
diff --git a/plugin.video.alfa/servers/mega.py b/plugin.video.alfa/servers/mega.py
index f2b3310d..cbb2e865 100755
--- a/plugin.video.alfa/servers/mega.py
+++ b/plugin.video.alfa/servers/mega.py
@@ -15,6 +15,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
video_urls = []
from megaserver import Client
+ page_url = page_url.replace('/embed#!', '/#!')
+
c = Client(url=page_url, is_playing_fnc=platformtools.is_playing)
files = c.get_files()