Merge pull request #343 from Intel11/master

Actualizados

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|&nbsp;|<br>|\s{2,}', "", data)
+    patron = '<a class=media p-2 href=(.*?)><img class=mr-2 src=(.*?)>.*?500>(.*?)</div>'
+    patron += '<div class=text-muted tx-11>(.*?)</div>.*?200>(.*?)</div>'
+    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 = '<a itemprop=url href=(.*?) title=.*? class=media.*?truncate-width>(.*?)<.*?'
     patron +='text-muted mb-1>Capítulo (.*?)</div>'
 
@@ -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 '</strong> ¡Este capítulo no tiene subtítulos, solo audio original! </div>' 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

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()

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

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
 
 

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

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)

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"

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"

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"

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"

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"

plugin.video.alfa/resources/settings.xml

@@ -1,121 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-    <category label="$ADDON[plugin.video.alfa 70168]">
-        <setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="$ADDON[plugin.video.alfa 30044]" default="0"/>
-        <setting id="default_action" type="enum" lvalues="30006|30007|30008" label="$ADDON[plugin.video.alfa 30005]" default="0"/>
-        <setting id="thumbnail_type" type="enum" lvalues="30011|30012|30200" label="$ADDON[plugin.video.alfa 30010]" default="2"/>
-        <setting id="channel_language" type="labelenum" values="all|cast|lat|ita" label="$ADDON[plugin.video.alfa 30019]" default="all"/>
-        <setting id="trakt_sync" type="bool" label="$ADDON[plugin.video.alfa 70109]" default="false"/>
-        <setting id="forceview" type="bool" label="$ADDON[plugin.video.alfa 30043]" default="false"/>
-        <setting id="faster_item_serialization" type="bool" label="$ADDON[plugin.video.alfa 30300]" default="false"/>
-        <setting id="debug" type="bool" label="$ADDON[plugin.video.alfa 30003]" default="false"/>
-        <setting label="$ADDON[plugin.video.alfa 70169]" type="lsep"/>
-        <setting id="resolve_priority" type="enum" label="$ADDON[plugin.video.alfa 70110]" lvalues="70164|70165|70166" default="0"/>
-        <setting id="resolve_stop" type="bool" label="$ADDON[plugin.video.alfa 70111]" default="true"/>
-        <setting id="hidepremium" type="bool" label="$ADDON[plugin.video.alfa 70112]" default="false"/>
+    <category label="70168">
+        <setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="30044" default="0"/>
+        <setting id="default_action" type="enum" lvalues="30006|30007|30008" label="30005" default="0"/>
+        <setting id="thumbnail_type" type="enum" lvalues="30011|30012|30200" label="30010" default="2"/>
+        <setting id="channel_language" type="labelenum" values="all|cast|lat|ita" label="30019" default="all"/>
+        <setting id="trakt_sync" type="bool" label="70109" default="false"/>
+        <setting id="forceview" type="bool" label="30043" default="false"/>
+        <setting id="faster_item_serialization" type="bool" label="30300" default="false"/>
+        <setting id="debug" type="bool" label="30003" default="false"/>
+        <setting label="70169" type="lsep"/>
+        <setting id="resolve_priority" type="enum" label="70110" lvalues="70164|70165|70166" default="0"/>
+        <setting id="resolve_stop" type="bool" label="70111" default="true"/>
+        <setting id="hidepremium" type="bool" label="70112" default="false"/>
         <setting type="sep"/>
-        <setting label="$ADDON[plugin.video.alfa 60305]" type="lsep"/>
-        <setting id="adult_aux_intro_password" type="text" label="$ADDON[plugin.video.alfa 70113]" option="hidden"  default=""/>
-        <setting id="adult_mode" type="enum" lvalues="60602|60616|70114" label="$ADDON[plugin.video.alfa 30002]" enable="!eq(-1,)" default="0"/>
-        <setting id="adult_request_password" type="bool" label="$ADDON[plugin.video.alfa 70115]"  enable="!eq(-1,0)+!eq(-2,)" default="true"/>
-        <setting id="adult_aux_new_password1" type="text" label="$ADDON[plugin.video.alfa 70116]" option="hidden" enable="!eq(-3,)" default=""/>
-        <setting id="adult_aux_new_password2" type="text" label="$ADDON[plugin.video.alfa 70117]" option="hidden" enable="!eq(-1,)" default=""/>
+        <setting label="60305" type="lsep"/>
+        <setting id="adult_aux_intro_password" type="text" label="70113" option="hidden"  default=""/>
+        <setting id="adult_mode" type="enum" lvalues="60602|60616|70114" label="30002" enable="!eq(-1,)" default="0"/>
+        <setting id="adult_request_password" type="bool" label="70115"  enable="!eq(-1,0)+!eq(-2,)" default="true"/>
+        <setting id="adult_aux_new_password1" type="text" label="70116" option="hidden" enable="!eq(-3,)" default=""/>
+        <setting id="adult_aux_new_password2" type="text" label="70117" option="hidden" enable="!eq(-1,)" default=""/>
     </category>
 
     <!-- Path downloads -->
-    <category label="$ADDON[plugin.video.alfa 30501]">
-        <setting id="downloadpath" type="folder" label="$ADDON[plugin.video.alfa 30017]" default=""/>
-        <setting id="downloadlistpath" type="folder" label="$ADDON[plugin.video.alfa 30018]" default=""/>
-        <setting id="videolibrarypath" type="folder" label="$ADDON[plugin.video.alfa 30067]" default=""/>
+    <category label="30501">
+        <setting id="downloadpath" type="folder" label="30017" default=""/>
+        <setting id="downloadlistpath" type="folder" label="30018" default=""/>
+        <setting id="videolibrarypath" type="folder" label="30067" default=""/>
 
         <setting type="sep"/>
-        <setting label="$ADDON[plugin.video.alfa 30131]" type="lsep"/>
-        <setting id="folder_tvshows" type="text" label="$ADDON[plugin.video.alfa 70118]" default="SERIES"/>
-        <setting id="folder_movies" type="text" label="$ADDON[plugin.video.alfa 70119]" default="CINE"/>
+        <setting label="30131" type="lsep"/>
+        <setting id="folder_tvshows" type="text" label="70118" default="SERIES"/>
+        <setting id="folder_movies" type="text" label="70119" default="CINE"/>
         <setting id="videolibrary_kodi_flag" type="number" label="" default="0" visible="false"/>
-        <setting id="videolibrary_kodi" type="bool" label="$ADDON[plugin.video.alfa 70120]" enable="lt(-1,2)+eq(0,false)" default="false"/>
+        <setting id="videolibrary_kodi" type="bool" label="70120" enable="lt(-1,2)+eq(0,false)" default="false"/>
     </category>
-     <category label="$ADDON[plugin.video.alfa 70121]">
-        <setting id="start_page" type="bool" label="$ADDON[plugin.video.alfa 70121]" default="false"/>
-        <setting id="custom_start" type="bool" label="$ADDON[plugin.video.alfa 70122]" default="false"
+     <category label="70121">
+        <setting id="start_page" type="bool" label="70121" default="false"/>
+        <setting id="custom_start" type="bool" label="70122" default="false"
                  visible="eq(-1,True)"/>
-        <setting id="news_start" type="bool" label="$ADDON[plugin.video.alfa 70123]" default="false" visible="eq(-2,True)"
+        <setting id="news_start" type="bool" label="70123" default="false" visible="eq(-2,True)"
                  enable="eq(-1,False)+eq(-2,True"/>
-         <setting id="category" type="labelenum" label="$ADDON[plugin.video.alfa 70124]"
+         <setting id="category" type="labelenum" label="70124"
                  lvalues="70137|70136|70127|60269|60272|70013|70014|59976|70171"
-                 default="$ADDON[plugin.video.alfa 70137]" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
+                 default="70137" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
    </category>
-    <category label="$ADDON[plugin.video.alfa 70126]">
-        <setting id="icon_set" type="labelenum" label="$ADDON[plugin.video.alfa 70108]" values="default|dark|angedam" default="default"/>
-        <setting id="infoplus_set" type="labelenum" label="$ADDON[plugin.video.alfa 70128]" lvalues="70129|70130" default="$ADDON[plugin.video.alfa 70129]"/>
-        <setting id="video_thumbnail_type" type="enum" label="$ADDON[plugin.video.alfa 70131]" lvalues="70132|70133" default="0"/>
-        <setting label="$ADDON[plugin.video.alfa 70167]" type="lsep"/>
-        <setting id="unify" type="bool" label="$ADDON[plugin.video.alfa 70134]" default="false"/>
-        <setting id="title_color" type="bool" label="$ADDON[plugin.video.alfa 70135]" default="false" visible="eq(-1,true)"/>
-        <setting id="movie_color" type="labelenum" label="$ADDON[plugin.video.alfa 70137]"
+    <category label="70126">
+        <setting id="icon_set" type="labelenum" label="70108" values="default|dark|angedam" default="default"/>
+        <setting id="infoplus_set" type="labelenum" label="70128" lvalues="70129|70130" default="70129"/>
+        <setting id="video_thumbnail_type" type="enum" label="70131" lvalues="70132|70133" default="0"/>
+        <setting label="70167" type="lsep"/>
+        <setting id="unify" type="bool" label="70134" default="false"/>
+        <setting id="title_color" type="bool" label="70135" default="false" visible="eq(-1,true)"/>
+        <setting id="movie_color" type="labelenum" label="70137"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-1,true)+eq(-2,true)"/>
-        <setting id="tvshow_color" type="labelenum" label="$ADDON[plugin.video.alfa 70136]"
+        <setting id="tvshow_color" type="labelenum" label="70136"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-2,true)+eq(-3,true)"/>
-        <setting id="year_color" type="labelenum" label="$ADDON[plugin.video.alfa 60232]"
+        <setting id="year_color" type="labelenum" label="60232"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-3,true)+eq(-4,true)"/>
-        <setting id="rating_1_color" type="labelenum" label="$ADDON[plugin.video.alfa 70138]"
+        <setting id="rating_1_color" type="labelenum" label="70138"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-4,true)+eq(-5,true)"/>
-        <setting id="rating_2_color" type="labelenum" label="$ADDON[plugin.video.alfa 70139]"
+        <setting id="rating_2_color" type="labelenum" label="70139"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-5,true)+eq(-6,true)"/>
-        <setting id="rating_3_color" type="labelenum" label="$ADDON[plugin.video.alfa 70140]"
+        <setting id="rating_3_color" type="labelenum" label="70140"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-6,true)+eq(-7,true)"/>
-        <setting id="quality_color" type="labelenum" label="$ADDON[plugin.video.alfa 70141]"
+        <setting id="quality_color" type="labelenum" label="70141"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-7,true)+eq(-8,true)"/>
-        <setting id="cast_color" type="labelenum" label="$ADDON[plugin.video.alfa 59980]"
+        <setting id="cast_color" type="labelenum" label="59980"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-8,true)+eq(-9,true)"/>
-        <setting id="lat_color" type="labelenum" label="$ADDON[plugin.video.alfa 59981]"
+        <setting id="lat_color" type="labelenum" label="59981"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-9,true)+eq(-10,true)"/>
-        <setting id="vose_color" type="labelenum" label="$ADDON[plugin.video.alfa 701402]"
+        <setting id="vose_color" type="labelenum" label="70142"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-10,true)+eq(-11,true)"/>
-        <setting id="vos_color" type="labelenum" label="$ADDON[plugin.video.alfa 70143]"
+        <setting id="vos_color" type="labelenum" label="70143"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-11,true)+eq(-12,true)"/>
-        <setting id="vo_color" type="labelenum" label="$ADDON[plugin.video.alfa 70144]"
+        <setting id="vo_color" type="labelenum" label="70144"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-12,true)+eq(-13,true)"/>
-        <setting id="server_color" type="labelenum" label="$ADDON[plugin.video.alfa 70145]"
+        <setting id="server_color" type="labelenum" label="70145"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-13,true)+eq(-14,true)"/>
-        <setting id="library_color" type="labelenum" label="$ADDON[plugin.video.alfa 70146]"
+        <setting id="library_color" type="labelenum" label="70146"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-14,true)+eq(-15,true)"/>
-        <setting id="update_color" type="labelenum" label="$ADDON[plugin.video.alfa 70147]"
+        <setting id="update_color" type="labelenum" label="70147"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-15,true)+eq(-16,true)"/>
-        <setting id="no_update_color" type="labelenum" label="$ADDON[plugin.video.alfa 70148]"
+        <setting id="no_update_color" type="labelenum" label="70148"
                  lvalues="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
                  default="white" visible="eq(-16,true)+eq(-17,true)"/>
    </category>
-    <category label="$ADDON[plugin.video.alfa 70149]">
-        <setting label="$ADDON[plugin.video.alfa 70150]" type="lsep"/>
-        <setting id="infoplus" type="bool" label="$ADDON[plugin.video.alfa 70151]" default="true"/>
-        <setting id="extended_info" type="bool" label="$ADDON[plugin.video.alfa 70152]" default="false"/>
+    <category label="70149">
+        <setting label="70150" type="lsep"/>
+        <setting id="infoplus" type="bool" label="70151" default="true"/>
+        <setting id="extended_info" type="bool" label="70152" default="false"/>
 
-		<setting label="$ADDON[plugin.video.alfa 70153]" type="lsep"/>
+		<setting label="70153" type="lsep"/>
 		<setting id="shortcut_key" type="action" label="30999" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAia2V5bWFwIg0KfQ==)" />
 
         <setting type="sep"/>
-        <setting label="$ADDON[plugin.video.alfa 70154]" type="lsep"/>
-        <setting id="tmdb_threads" type="labelenum" values="5|10|15|20|25|30" label="$ADDON[plugin.video.alfa 70155]" default="20"/>
-        <setting id="tmdb_plus_info" type="bool" label="$ADDON[plugin.video.alfa 70156]" default="false"/>
-        <setting id="tmdb_cache" type="bool" label="$ADDON[plugin.video.alfa 70157]" default="true"/>
-        <setting id="tmdb_cache_expire" type="enum" lvalues="70158|70159|70160|70161|70170" label="$ADDON[plugin.video.alfa 70162]" enable="eq(-1,true)" default="4"/>
-        <setting id="tmdb_clean_db_cache" type="action" label="$ADDON[plugin.video.alfa 70163]" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAic2NyaXB0Ig0KfQ==)" />
+        <setting label="70154" type="lsep"/>
+        <setting id="tmdb_threads" type="labelenum" values="5|10|15|20|25|30" label="70155" default="20"/>
+        <setting id="tmdb_plus_info" type="bool" label="70156" default="false"/>
+        <setting id="tmdb_cache" type="bool" label="70157" default="true"/>
+        <setting id="tmdb_cache_expire" type="enum" lvalues="70158|70159|70160|70161|70170" label="70162" enable="eq(-1,true)" default="4"/>
+        <setting id="tmdb_clean_db_cache" type="action" label="70163" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAic2NyaXB0Ig0KfQ==)" />
 
         <setting type="sep"/>
         <setting label="Para evitar esperar demasiado cuando un servidor no responde:" type="lsep"/>

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"
       },
       {

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()