From 20486fe6da94f2a9e58922ff3e2c5cddf3162fcb Mon Sep 17 00:00:00 2001
From: alfa-addon <alfa_addon@protonmail.com>
Date: Tue, 8 Aug 2017 17:22:47 -0400
Subject: [PATCH] update v1.5.1

---
 plugin.video.alfa/channels/pelisfox.py        |  39 +-
 plugin.video.alfa/channels/setting.py         |   5 +-
 plugin.video.alfa/channels/videolibrary.py    | 323 +++++------
 plugin.video.alfa/channels/yaske.py           | 519 +++++++++---------
 plugin.video.alfa/channelselector.py          |   4 +-
 plugin.video.alfa/core/videolibrarytools.py   |  32 +-
 .../resources/language/Catalan/strings.xml    |   1 +
 .../resources/language/English/strings.xml    |   1 +
 .../resources/language/Italian/strings.xml    |   1 +
 .../language/Spanish (mexico)/strings.xml     |   1 +
 .../resources/language/Spanish/strings.xml    |   1 +
 .../general/default/thumb_channels_direct.png | Bin 0 -> 14698 bytes
 plugin.video.alfa/servers/gvideo.json         |   6 +-
 plugin.video.alfa/videolibrary_service.py     |   5 +-
 14 files changed, 484 insertions(+), 454 deletions(-)
 mode change 100755 => 100644 plugin.video.alfa/channels/pelisfox.py
 mode change 100755 => 100644 plugin.video.alfa/channels/setting.py
 mode change 100755 => 100644 plugin.video.alfa/channels/videolibrary.py
 mode change 100755 => 100644 plugin.video.alfa/channelselector.py
 mode change 100755 => 100644 plugin.video.alfa/resources/language/Catalan/strings.xml
 mode change 100755 => 100644 plugin.video.alfa/resources/language/English/strings.xml
 mode change 100755 => 100644 plugin.video.alfa/resources/language/Italian/strings.xml
 mode change 100755 => 100644 plugin.video.alfa/resources/language/Spanish (mexico)/strings.xml
 mode change 100755 => 100644 plugin.video.alfa/resources/language/Spanish/strings.xml
 create mode 100644 plugin.video.alfa/resources/media/general/default/thumb_channels_direct.png

diff --git a/plugin.video.alfa/channels/pelisfox.py b/plugin.video.alfa/channels/pelisfox.py
old mode 100755
new mode 100644
index 854bf5c9..a76d7e3b
--- a/plugin.video.alfa/channels/pelisfox.py
+++ b/plugin.video.alfa/channels/pelisfox.py
@@ -9,6 +9,8 @@ from core import logger
 from core import scrapertools
 from core import tmdb
 from core.item import Item
+from core import servertools
+
 
 tgenero = {"Drama": "https://s16.postimg.org/94sia332d/drama.png",
            u"Accción": "https://s3.postimg.org/y6o9puflv/accion.png",
@@ -225,6 +227,7 @@ def findvideos(item):
     logger.info()
     itemlist = []
     templist = []
+    video_list = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     patron = '<li data-quality=(.*?) data-lang=(.*?)><a href=(.*?) title=.*?'
@@ -236,9 +239,9 @@ def findvideos(item):
                                    language=lang,
                                    url=url
                                    ))
-
+    logger.debug('templist: %s'%templist)
     for videoitem in templist:
-
+        logger.debug('videoitem.language: %s'%videoitem.language)
         data = httptools.downloadpage(videoitem.url).data
         data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
         id = scrapertools.find_single_match(data, 'var _SOURCE =.*?source:(.*?),')
@@ -247,24 +250,26 @@ def findvideos(item):
             sub = sub.replace('\\', '')
         else:
             sub = ''
-        new_url = 'http://iplay.one/api/embed?id=%s&token=8908d9f846&%s' % (id, sub)
+        new_url = 'https://onevideo.tv/api/player?key=90503e3de26d45e455b55e9dc54f015b3d1d4150&link' \
+                  '=%s&srt=%s' % (id, sub)
 
         data = httptools.downloadpage(new_url).data
 
-        patron = 'file":"(.*?)","label":"(.*?)","type":".*?"}'
-        matches = matches = re.compile(patron, re.DOTALL).findall(data)
+        url = scrapertools.find_single_match (data, '<iframe src="(.*?preview)"')
+        title = videoitem.contentTitle + ' (' + audio[videoitem.language] + ')'
+        logger.debug('url: %s'%url)
+        video_list.extend(servertools.find_video_items(data=url))
+        for urls in video_list:
+            if urls.language=='':
+                urls.language = videoitem.language
+            urls.title = item.title+'(%s) (%s)'%(urls.language, urls.server)
+        logger.debug('video_list: %s'%video_list)
+        #itemlist.append(item.clone(title= title, url = url, action = 'play', subtitle = sub))
+
+    for video_url in video_list:
+        video_url.channel = item.channel
+        video_url.action ='play'
 
-        for scrapedurl, quality in matches:
-            title = videoitem.contentTitle + ' (' + quality + ') (' + audio[videoitem.language] + ')'
-            url = scrapedurl.replace('\\', '')
-            itemlist.append(item.clone(title=title,
-                                       action='play',
-                                       url=url,
-                                       subtitle=sub,
-                                       server='directo',
-                                       quality=quality,
-                                       language='lang'
-                                       ))
 
     if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
         itemlist.append(
@@ -275,7 +280,7 @@ def findvideos(item):
                  extra="findvideos",
                  contentTitle=item.contentTitle
                  ))
-    return itemlist
+    return video_list
 
 
 def newest(categoria):
diff --git a/plugin.video.alfa/channels/setting.py b/plugin.video.alfa/channels/setting.py
old mode 100755
new mode 100644
index 105d2035..2b9b7110
--- a/plugin.video.alfa/channels/setting.py
+++ b/plugin.video.alfa/channels/setting.py
@@ -873,8 +873,9 @@ def overwrite_tools(item):
         p_dialog = platformtools.dialog_progress_bg('alfa', heading)
         p_dialog.update(0, '')
 
-        import glob
-        show_list = glob.glob(filetools.join(videolibrarytools.TVSHOWS_PATH, u'/*/tvshow.nfo'))
+        show_list = []
+        for path, folders, files in filetools.walk(videolibrarytools.TVSHOWS_PATH):
+            show_list.extend([filetools.join(path, f) for f in files if f == "tvshow.nfo"])
 
         if show_list:
             t = float(100) / len(show_list)
diff --git a/plugin.video.alfa/channels/videolibrary.py b/plugin.video.alfa/channels/videolibrary.py
old mode 100755
new mode 100644
index 6b86e488..b0e8862b
--- a/plugin.video.alfa/channels/videolibrary.py
+++ b/plugin.video.alfa/channels/videolibrary.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import glob
 import os
 
 from core import config
@@ -36,53 +35,55 @@ def list_movies(item):
     logger.info()
     itemlist = []
 
-    for f in glob.glob(filetools.join(videolibrarytools.MOVIES_PATH, u'/*/*.nfo')):
-        nfo_path = f
-        head_nfo, new_item = videolibrarytools.read_nfo(nfo_path)
+    for raiz, subcarpetas, ficheros in filetools.walk(videolibrarytools.MOVIES_PATH):
+        for f in ficheros:
+            if f.endswith(".nfo"):
+                nfo_path = filetools.join(raiz, f)
+                head_nfo, new_item = videolibrarytools.read_nfo(nfo_path)
 
-        new_item.nfo = nfo_path
-        new_item.path = filetools.dirname(f)
-        new_item.thumbnail = new_item.contentThumbnail
-        new_item.text_color = "blue"
+                new_item.nfo = nfo_path
+                new_item.path = raiz
+                new_item.thumbnail = new_item.contentThumbnail
+                new_item.text_color = "blue"
 
-        if not filetools.exists(filetools.join(videolibrarytools.MOVIES_PATH, new_item.strm_path)):
-            # Si se ha eliminado el strm desde la bilbioteca de kodi, no mostrarlo
-            continue
+                if not filetools.exists(filetools.join(new_item.path, filetools.basename(new_item.strm_path))):
+                    # Si se ha eliminado el strm desde la bilbioteca de kodi, no mostrarlo
+                    continue
 
-        # Menu contextual: Marcar como visto/no visto
-        visto = new_item.library_playcounts.get(os.path.splitext(f)[0], 0)
-        new_item.infoLabels["playcount"] = visto
-        if visto > 0:
-            texto_visto = "Marcar película como no vista"
-            contador = 0
-        else:
-            texto_visto = "Marcar película como vista"
-            contador = 1
+                # Menu contextual: Marcar como visto/no visto
+                visto = new_item.library_playcounts.get(os.path.splitext(f)[0], 0)
+                new_item.infoLabels["playcount"] = visto
+                if visto > 0:
+                    texto_visto = "Marcar película como no vista"
+                    contador = 0
+                else:
+                    texto_visto = "Marcar película como vista"
+                    contador = 1
 
-        # Menu contextual: Eliminar serie/canal
-        num_canales = len(new_item.library_urls)
-        if "downloads" in new_item.library_urls:
-            num_canales -= 1
-        if num_canales > 1:
-            texto_eliminar = "Eliminar película/canal"
-            multicanal = True
-        else:
-            texto_eliminar = "Eliminar esta película"
-            multicanal = False
+                # Menu contextual: Eliminar serie/canal
+                num_canales = len(new_item.library_urls)
+                if "downloads" in new_item.library_urls:
+                    num_canales -= 1
+                if num_canales > 1:
+                    texto_eliminar = "Eliminar película/canal"
+                    multicanal = True
+                else:
+                    texto_eliminar = "Eliminar esta película"
+                    multicanal = False
 
-        new_item.context = [{"title": texto_visto,
-                             "action": "mark_content_as_watched",
-                             "channel": "videolibrary",
-                             "playcount": contador},
-                            {"title": texto_eliminar,
-                             "action": "delete",
-                             "channel": "videolibrary",
-                             "multicanal": multicanal}]
-        # ,{"title": "Cambiar contenido (PENDIENTE)",
-        # "action": "",
-        # "channel": "videolibrary"}]
-        # logger.debug("new_item: " + new_item.tostring('\n'))
-        itemlist.append(new_item)
+                new_item.context = [{"title": texto_visto,
+                                     "action": "mark_content_as_watched",
+                                     "channel": "videolibrary",
+                                     "playcount": contador},
+                                    {"title": texto_eliminar,
+                                     "action": "delete",
+                                     "channel": "videolibrary",
+                                     "multicanal": multicanal}]
+                # ,{"title": "Cambiar contenido (PENDIENTE)",
+                # "action": "",
+                # "channel": "videolibrary"}]
+                # logger.debug("new_item: " + new_item.tostring('\n'))
+                itemlist.append(new_item)
 
     return sorted(itemlist, key=lambda it: it.title.lower())
 
@@ -92,66 +93,68 @@ def list_tvshows(item):
     itemlist = []
 
     # Obtenemos todos los tvshow.nfo de la videoteca de SERIES recursivamente
-    for f in glob.glob(filetools.join(videolibrarytools.TVSHOWS_PATH, u'/*/tvshow.nfo')):
-        # logger.debug("file es %s" % f)
+    for raiz, subcarpetas, ficheros in filetools.walk(videolibrarytools.TVSHOWS_PATH):
+        for f in ficheros:
+            if f == "tvshow.nfo":
+                tvshow_path = filetools.join(raiz, f)
+                # logger.debug(tvshow_path)
+                head_nfo, item_tvshow = videolibrarytools.read_nfo(tvshow_path)
+                item_tvshow.title = item_tvshow.contentTitle
+                item_tvshow.path = raiz
+                item_tvshow.nfo = tvshow_path
 
-        head_nfo, item_tvshow = videolibrarytools.read_nfo(f)
-        item_tvshow.title = item_tvshow.contentTitle
-        item_tvshow.path = filetools.join(videolibrarytools.TVSHOWS_PATH, item_tvshow.path)
-        item_tvshow.nfo = f
+                # Menu contextual: Marcar como visto/no visto
+                visto = item_tvshow.library_playcounts.get(item_tvshow.contentTitle, 0)
+                item_tvshow.infoLabels["playcount"] = visto
+                if visto > 0:
+                    texto_visto = "Marcar serie como no vista"
+                    contador = 0
+                else:
+                    texto_visto = "Marcar serie como vista"
+                    contador = 1
 
-        # Menu contextual: Marcar como visto/no visto
-        visto = item_tvshow.library_playcounts.get(item_tvshow.contentTitle, 0)
-        item_tvshow.infoLabels["playcount"] = visto
-        if visto > 0:
-            texto_visto = "Marcar serie como no vista"
-            contador = 0
-        else:
-            texto_visto = "Marcar serie como vista"
-            contador = 1
+                # Menu contextual: Buscar automáticamente nuevos episodios o no
+                if item_tvshow.active and int(item_tvshow.active) > 0:
+                    texto_update = "Buscar automáticamente nuevos episodios: Desactivar"
+                    value = 0
+                    item_tvshow.text_color = "green"
+                else:
+                    texto_update = "Buscar automáticamente nuevos episodios: Activar"
+                    value = 1
+                    item_tvshow.text_color = "0xFFDF7401"
 
-        # Menu contextual: Buscar automáticamente nuevos episodios o no
-        if item_tvshow.active and int(item_tvshow.active) > 0:
-            texto_update = "Buscar automáticamente nuevos episodios: Desactivar"
-            value = 0
-            item_tvshow.text_color = "green"
-        else:
-            texto_update = "Buscar automáticamente nuevos episodios: Activar"
-            value = 1
-            item_tvshow.text_color = "0xFFDF7401"
+                # Menu contextual: Eliminar serie/canal
+                num_canales = len(item_tvshow.library_urls)
+                if "downloads" in item_tvshow.library_urls:
+                    num_canales -= 1
+                if num_canales > 1:
+                    texto_eliminar = "Eliminar serie/canal"
+                    multicanal = True
+                else:
+                    texto_eliminar = "Eliminar esta serie"
+                    multicanal = False
 
-        # Menu contextual: Eliminar serie/canal
-        num_canales = len(item_tvshow.library_urls)
-        if "downloads" in item_tvshow.library_urls:
-            num_canales -= 1
-        if num_canales > 1:
-            texto_eliminar = "Eliminar serie/canal"
-            multicanal = True
-        else:
-            texto_eliminar = "Eliminar esta serie"
-            multicanal = False
+                item_tvshow.context = [{"title": texto_visto,
+                                        "action": "mark_content_as_watched",
+                                        "channel": "videolibrary",
+                                        "playcount": contador},
+                                       {"title": texto_update,
+                                        "action": "mark_tvshow_as_updatable",
+                                        "channel": "videolibrary",
+                                        "active": value},
+                                       {"title": texto_eliminar,
+                                        "action": "delete",
+                                        "channel": "videolibrary",
+                                        "multicanal": multicanal},
+                                       {"title": "Buscar nuevos episodios ahora",
+                                        "action": "update_tvshow",
+                                        "channel": "videolibrary"}]
+                # ,{"title": "Cambiar contenido (PENDIENTE)",
+                # "action": "",
+                # "channel": "videolibrary"}]
 
-        item_tvshow.context = [{"title": texto_visto,
-                                "action": "mark_content_as_watched",
-                                "channel": "videolibrary",
-                                "playcount": contador},
-                               {"title": texto_update,
-                                "action": "mark_tvshow_as_updatable",
-                                "channel": "videolibrary",
-                                "active": value},
-                               {"title": texto_eliminar,
-                                "action": "delete",
-                                "channel": "videolibrary",
-                                "multicanal": multicanal},
-                               {"title": "Buscar nuevos episodios ahora",
-                                "action": "update_tvshow",
-                                "channel": "videolibrary"}]
-        # ,{"title": "Cambiar contenido (PENDIENTE)",
-        # "action": "",
-        # "channel": "videolibrary"}]
-
-        # logger.debug("item_tvshow:\n" + item_tvshow.tostring('\n'))
-        itemlist.append(item_tvshow)
+                # logger.debug("item_tvshow:\n" + item_tvshow.tostring('\n'))
+                itemlist.append(item_tvshow)
 
     if itemlist:
         itemlist = sorted(itemlist, key=lambda it: it.title.lower())
@@ -168,19 +171,18 @@ def get_seasons(item):
     itemlist = []
     dict_temp = {}
 
+    raiz, carpetas_series, ficheros = filetools.walk(item.path).next()
+
     # Menu contextual: Releer tvshow.nfo
     head_nfo, item_nfo = videolibrarytools.read_nfo(item.nfo)
 
-    # Miramos las temporadas que estén marcadas como vistas
-    if not hasattr(item_nfo, 'library_playcounts'):
-        item_nfo.library_playcounts = {}
-
     if config.get_setting("no_pile_on_seasons", "videolibrary") == 2:  # Siempre
         return get_episodes(item)
 
-    for f in glob.glob1(item.path, u'*.json'):
-        season = f.split('x')[0]
-        dict_temp[season] = "Temporada %s" % season
+    for f in ficheros:
+        if f.endswith('.json'):
+            season = f.split('x')[0]
+            dict_temp[season] = "Temporada %s" % season
 
     if config.get_setting("no_pile_on_seasons", "videolibrary") == 1 and len(dict_temp) == 1:  # Sólo si hay una temporada
         return get_episodes(item)
@@ -231,54 +233,58 @@ def get_episodes(item):
     # logger.debug("item:\n" + item.tostring('\n'))
     itemlist = []
 
+    # Obtenemos los archivos de los episodios
+    raiz, carpetas_series, ficheros = filetools.walk(item.path).next()
+
     # Menu contextual: Releer tvshow.nfo
     head_nfo, item_nfo = videolibrarytools.read_nfo(item.nfo)
 
     # Crear un item en la lista para cada strm encontrado
-    for f in glob.glob1(item.path, u'*.strm'):
-        season_episode = scrapertools.get_season_and_episode(f)
-        if not season_episode:
-            # El fichero no incluye el numero de temporada y episodio
-            continue
-        season, episode = season_episode.split("x")
-        # Si hay q filtrar por temporada, ignoramos los capitulos de otras temporadas
-        if item.filtrar_season and int(season) != int(item.contentSeason):
-            continue
+    for i in ficheros:
+        if i.endswith('.strm'):
+            season_episode = scrapertools.get_season_and_episode(i)
+            if not season_episode:
+                # El fichero no incluye el numero de temporada y episodio
+                continue
+            season, episode = season_episode.split("x")
+            # Si hay q filtrar por temporada, ignoramos los capitulos de otras temporadas
+            if item.filtrar_season and int(season) != int(item.contentSeason):
+                continue
 
-        # Obtener los datos del season_episode.nfo
-        nfo_path = filetools.join(item.path, f).replace('.strm', '.nfo')
-        head_nfo, epi = videolibrarytools.read_nfo(nfo_path)
+            # Obtener los datos del season_episode.nfo
+            nfo_path = filetools.join(raiz, i).replace('.strm', '.nfo')
+            head_nfo, epi = videolibrarytools.read_nfo(nfo_path)
 
-        # Fijar el titulo del capitulo si es posible
-        if epi.contentTitle:
-            title_episodie = epi.contentTitle.strip()
-        else:
-            title_episodie = "Temporada %s Episodio %s" % \
-                             (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2))
+            # Fijar el titulo del capitulo si es posible
+            if epi.contentTitle:
+                title_episodie = epi.contentTitle.strip()
+            else:
+                title_episodie = "Temporada %s Episodio %s" % \
+                                 (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2))
 
-        epi.contentTitle = "%sx%s" % (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2))
-        epi.title = "%sx%s - %s" % (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2), title_episodie)
+            epi.contentTitle = "%sx%s" % (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2))
+            epi.title = "%sx%s - %s" % (epi.contentSeason, str(epi.contentEpisodeNumber).zfill(2), title_episodie)
 
-        if item_nfo.library_filter_show:
-            epi.library_filter_show = item_nfo.library_filter_show
+            if item_nfo.library_filter_show:
+                epi.library_filter_show = item_nfo.library_filter_show
 
-        # Menu contextual: Marcar episodio como visto o no
-        visto = item_nfo.library_playcounts.get(season_episode, 0)
-        epi.infoLabels["playcount"] = visto
-        if visto > 0:
-            texto = "Marcar episodio como no visto"
-            value = 0
-        else:
-            texto = "Marcar episodio como visto"
-            value = 1
-        epi.context = [{"title": texto,
-                        "action": "mark_content_as_watched",
-                        "channel": "videolibrary",
-                        "playcount": value,
-                        "nfo": item.nfo}]
+            # Menu contextual: Marcar episodio como visto o no
+            visto = item_nfo.library_playcounts.get(season_episode, 0)
+            epi.infoLabels["playcount"] = visto
+            if visto > 0:
+                texto = "Marcar episodio como no visto"
+                value = 0
+            else:
+                texto = "Marcar episodio como visto"
+                value = 1
+            epi.context = [{"title": texto,
+                            "action": "mark_content_as_watched",
+                            "channel": "videolibrary",
+                            "playcount": value,
+                            "nfo": item.nfo}]
 
-        # logger.debug("epi:\n" + epi.tostring('\n'))
-        itemlist.append(epi)
+            # logger.debug("epi:\n" + epi.tostring('\n'))
+            itemlist.append(epi)
 
     return sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))
 
@@ -530,25 +536,28 @@ def mark_season_as_watched(item):
     # logger.debug("item:\n" + item.tostring('\n'))
 
     # Obtener el diccionario de episodios marcados
-    tvshow_path = filetools.join(item.path, 'tvshow.nfo')
-    head_nfo, it = videolibrarytools.read_nfo(tvshow_path)
+    f = filetools.join(item.path, 'tvshow.nfo')
+    head_nfo, it = videolibrarytools.read_nfo(f)
     if not hasattr(it, 'library_playcounts'):
         it.library_playcounts = {}
 
+    # Obtenemos los archivos de los episodios
+    raiz, carpetas_series, ficheros = filetools.walk(item.path).next()
+
     # Marcamos cada uno de los episodios encontrados de esta temporada
     episodios_marcados = 0
-    for f in glob.glob1(item.path, u'*.strm'):
-        # if f.endswith(".strm"):
-        season_episode = scrapertools.get_season_and_episode(f)
-        if not season_episode:
-            # El fichero no incluye el numero de temporada y episodio
-            continue
-        season, episode = season_episode.split("x")
+    for i in ficheros:
+        if i.endswith(".strm"):
+            season_episode = scrapertools.get_season_and_episode(i)
+            if not season_episode:
+                # El fichero no incluye el numero de temporada y episodio
+                continue
+            season, episode = season_episode.split("x")
 
-        if int(item.contentSeason) == -1 or int(season) == int(item.contentSeason):
-            name_file = os.path.splitext(os.path.basename(f))[0]
-            it.library_playcounts[name_file] = item.playcount
-            episodios_marcados += 1
+            if int(item.contentSeason) == -1 or int(season) == int(item.contentSeason):
+                name_file = os.path.splitext(os.path.basename(f))[0]
+                it.library_playcounts[name_file] = item.playcount
+                episodios_marcados += 1
 
     if episodios_marcados:
         if int(item.contentSeason) == -1:
@@ -564,7 +573,7 @@ def mark_season_as_watched(item):
             it = check_tvshow_playcount(it, item.contentSeason)
 
         # Guardamos los cambios en tvshow.nfo
-        filetools.write(tvshow_path, head_nfo + it.tojson())
+        filetools.write(f, head_nfo + it.tojson())
         item.infoLabels['playcount'] = item.playcount
 
         if config.is_xbmc():
diff --git a/plugin.video.alfa/channels/yaske.py b/plugin.video.alfa/channels/yaske.py
index 99e3d9aa..19c85e83 100644
--- a/plugin.video.alfa/channels/yaske.py
+++ b/plugin.video.alfa/channels/yaske.py
@@ -1,256 +1,263 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import channeltools
-from core import config
-from core import httptools
-from core import logger
-from core import scrapertoolsV2
-from core import servertools
-from core import tmdb
-from core.item import Item
-
-HOST = 'http://www.yaske.ro'
-parameters = channeltools.get_channel_parameters('yaske')
-fanart_host = parameters['fanart']
-thumbnail_host = parameters['thumbnail']
-color1, color2, color3 = ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E']
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    item.url = HOST
-    item.text_color = color2
-    item.fanart = fanart_host
-    thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png"
-
-    itemlist.append(item.clone(title="Novedades", action="peliculas", text_bold=True, viewcontent='movies',
-                               url=HOST + "/ultimas-y-actualizadas",
-                               thumbnail=thumbnail % 'novedades', viewmode="movie_with_plot"))
-    itemlist.append(item.clone(title="Estrenos", action="peliculas", text_bold=True,
-                               url=HOST + "/genre/premieres", thumbnail=thumbnail % 'estrenos'))
-    itemlist.append(item.clone(title="", folder=False))
-
-    itemlist.append(Item(channel=item.channel, title="Filtrar por:", fanart=fanart_host, folder=False,
-                         text_color=color3, text_bold=True, thumbnail=thumbnail_host))
-    itemlist.append(item.clone(title="    Género", action="menu_buscar_contenido", text_color=color1, text_italic=True,
-                               extra="genre", thumbnail=thumbnail % 'generos', viewmode="thumbnails"))
-    itemlist.append(item.clone(title="    Idioma", action="menu_buscar_contenido", text_color=color1, text_italic=True,
-                               extra="audio", thumbnail=thumbnail % 'idiomas'))
-    itemlist.append(item.clone(title="    Calidad", action="menu_buscar_contenido", text_color=color1, text_italic=True,
-                               extra="quality", thumbnail=thumbnail % 'calidad'))
-    itemlist.append(item.clone(title="    Año", action="menu_buscar_contenido", text_color=color1, text_italic=True,
-                               extra="year", thumbnail=thumbnail % 'year'))
-
-    itemlist.append(item.clone(title="", folder=False))
-    itemlist.append(item.clone(title="Buscar por título", action="search", thumbnail=thumbnail % 'buscar'))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    itemlist = []
-
-    try:
-        # http://www.yaske.ro/search/?q=los+pitufos
-        item.url = HOST + "/search/?q=" + texto.replace(' ', '+')
-        item.extra = ""
-        itemlist.extend(peliculas(item))
-        if itemlist[-1].title == ">> Página siguiente":
-            item_pag = itemlist[-1]
-            itemlist = sorted(itemlist[:-1], key=lambda Item: Item.contentTitle)
-            itemlist.append(item_pag)
-        else:
-            itemlist = sorted(itemlist, key=lambda Item: Item.contentTitle)
-
-        return itemlist
-
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def newest(categoria):
-    logger.info()
-    item = Item()
-    try:
-        if categoria == 'peliculas':
-            item.url = HOST + "/ultimas-y-actualizadas"
-        elif categoria == 'infantiles':
-            item.url = HOST + "/search/?q=&genre%5B%5D=animation"
-        else:
-            return []
-
-        itemlist = peliculas(item)
-        if itemlist[-1].title == ">> Página siguiente":
-            itemlist.pop()
-
-    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-    url_next_page = ""
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    patron = '<article class.*?'
-    patron += '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<aside class="item-control down">(.*?)</aside>.*?'
-    patron += '<small class="pull-right text-muted">([^<]+)</small>.*?'
-    patron += '<h2 class.*?>([^<]+)</h2>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    # Paginacion
-    if item.next_page != 'b':
-        if len(matches) > 30:
-            url_next_page = item.url
-        matches = matches[:30]
-        next_page = 'b'
-    else:
-        matches = matches[30:]
-        next_page = 'a'
-        patron_next_page = 'Anteriores</a> <a href="([^"]+)" class="btn btn-default ".*?Siguiente'
-        matches_next_page = re.compile(patron_next_page, re.DOTALL).findall(data)
-        if len(matches_next_page) > 0:
-            url_next_page = matches_next_page[0]
-
-    for scrapedurl, scrapedthumbnail, idiomas, year, scrapedtitle in matches:
-        patronidiomas = "<img src='([^']+)'"
-        matchesidiomas = re.compile(patronidiomas, re.DOTALL).findall(idiomas)
-
-        idiomas_disponibles = []
-        for idioma in matchesidiomas:
-            if idioma.endswith("la_la.png"):
-                idiomas_disponibles.append("LAT")
-            elif idioma.endswith("en_en.png"):
-                idiomas_disponibles.append("VO")
-            elif idioma.endswith("en_es.png"):
-                idiomas_disponibles.append("VOSE")
-            elif idioma.endswith("es_es.png"):
-                idiomas_disponibles.append("ESP")
-
-        if idiomas_disponibles:
-            idiomas_disponibles = "[" + "/".join(idiomas_disponibles) + "]"
-
-        contentTitle = scrapertoolsV2.decodeHtmlentities(scrapedtitle.strip())
-        title = "%s %s" % (contentTitle, idiomas_disponibles)
-
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, contentTitle=contentTitle,
-                             infoLabels={"year": year}, text_color=color1))
-
-    # Obtenemos los datos basicos de todas las peliculas mediante multihilos
-    tmdb.set_infoLabels(itemlist)
-
-    # Si es necesario añadir paginacion
-    if url_next_page:
-        itemlist.append(
-            Item(channel=item.channel, action="peliculas", title=">> Página siguiente", thumbnail=thumbnail_host,
-                 url=url_next_page, next_page=next_page, folder=True, text_color=color3, text_bold=True))
-
-    return itemlist
-
-
-def menu_buscar_contenido(item):
-    logger.info(item)
-
-    data = httptools.downloadpage(item.url).data
-    patron = '<select name="' + item.extra + '(.*?)</select>'
-    data = scrapertoolsV2.get_match(data, patron)
-
-    # Extrae las entradas
-    patron = "<option value='([^']+)'>([^<]+)</option>"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    itemlist = []
-    for scrapedvalue, scrapedtitle in matches:
-        thumbnail = ""
-
-        if item.extra == 'genre':
-            if scrapedtitle.strip() in ['Documental', 'Short', 'News']:
-                continue
-
-            url = HOST + "/search/?q=&genre%5B%5D=" + scrapedvalue
-            filename = scrapedtitle.lower().replace(' ', '%20')
-            if filename == "ciencia%20ficción":
-                filename = "ciencia%20ficcion"
-            thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png" \
-                        % filename
-
-        elif item.extra == 'year':
-            url = HOST + "/search/?q=&year=" + scrapedvalue
-            thumbnail = item.thumbnail
-        else:
-            # http://www.yaske.ro/search/?q=&quality%5B%5D=c9
-            # http://www.yaske.ro/search/?q=&audio%5B%5D=es
-            url = HOST + "/search/?q=&" + item.extra + "%5B%5D=" + scrapedvalue
-            thumbnail = item.thumbnail
-
-        itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url, text_color=color1,
-                             thumbnail=thumbnail, contentType='movie', folder=True, viewmode="movie_with_plot"))
-
-    if item.extra in ['genre', 'audio', 'year']:
-        return sorted(itemlist, key=lambda i: i.title.lower(), reverse=item.extra == 'year')
-    else:
-        return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = list()
-    sublist = list()
-
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-
-    if not item.plot:
-        item.plot = scrapertoolsV2.find_single_match(data, '>Sinopsis</dt> <dd>([^<]+)</dd>')
-        item.plot = scrapertoolsV2.decodeHtmlentities(item.plot)
-
-    patron = '<option value="([^"]+)"[^>]+'
-    patron += '>([^<]+).*?</i>([^<]+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url, idioma, calidad in matches:
-        sublist.append(item.clone(action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(),
-                                  language=idioma.strip()))
-
-    sublist = servertools.get_servers_itemlist(sublist, lambda i: "Ver en %s %s" % (i.server, i.quality), True)
-
-    # Añadir servidores encontrados, agrupandolos por idioma
-    for k in ["Español", "Latino", "Subtitulado", "Ingles"]:
-        lista_idioma = filter(lambda i: i.language == k, sublist)
-        if lista_idioma:
-            itemlist.append(Item(channel=item.channel, title=k, fanart=item.fanart, folder=False,
-                                 text_color=color2, text_bold=True, thumbnail=thumbnail_host))
-            itemlist.extend(lista_idioma)
-
-    # Insertar items "Buscar trailer" y "Añadir a la videoteca"
-    if itemlist and item.extra != "library":
-        title = "%s [Buscar trailer]" % (item.contentTitle)
-        itemlist.insert(0, item.clone(channel="trailertools", action="buscartrailer",
-                                      text_color=color3, title=title, viewmode="list"))
-
-        if config.get_videolibrary_support():
-            itemlist.append(Item(channel=item.channel, title="Añadir película a la videoteca",
-                                 action="add_pelicula_to_library", url=item.url, text_color="green",
-                                 contentTitle=item.contentTitle, extra="library", thumbnail=thumbnail_host))
-
-    return itemlist
+# -*- coding: utf-8 -*-
+
+import re
+import base64
+
+from core import channeltools
+from core import config
+from core import httptools
+from core import logger
+from core import scrapertoolsV2
+from core import servertools
+from core import tmdb
+from core.item import Item
+
+
+HOST = 'http://www.yaske.ro'
+parameters = channeltools.get_channel_parameters('yaske')
+fanart_host = parameters['fanart']
+thumbnail_host = parameters['thumbnail']
+color1, color2, color3 = ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E']
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    item.url = HOST
+    item.text_color = color2
+    item.fanart = fanart_host
+    thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png"
+
+    itemlist.append(item.clone(title="Novedades", action="peliculas", text_bold=True, viewcontent='movies',
+                               url=HOST + "/ultimas-y-actualizadas",
+                               thumbnail=thumbnail % 'novedades', viewmode="movie_with_plot"))
+    itemlist.append(item.clone(title="Estrenos", action="peliculas", text_bold=True,
+                               url=HOST + "/genre/premieres", thumbnail=thumbnail % 'estrenos'))
+    itemlist.append(item.clone(title="", folder=False))
+
+    itemlist.append(Item(channel=item.channel, title="Filtrar por:", fanart=fanart_host, folder=False,
+                         text_color=color3, text_bold=True, thumbnail=thumbnail_host))
+    itemlist.append(item.clone(title="    Género", action="menu_buscar_contenido", text_color=color1, text_italic=True,
+                               extra="genre", thumbnail=thumbnail % 'generos', viewmode="thumbnails"))
+    itemlist.append(item.clone(title="    Idioma", action="menu_buscar_contenido", text_color=color1, text_italic=True,
+                               extra="audio", thumbnail=thumbnail % 'idiomas'))
+    itemlist.append(item.clone(title="    Calidad", action="menu_buscar_contenido", text_color=color1, text_italic=True,
+                               extra="quality", thumbnail=thumbnail % 'calidad'))
+    itemlist.append(item.clone(title="    Año", action="menu_buscar_contenido", text_color=color1, text_italic=True,
+                               extra="year", thumbnail=thumbnail % 'year'))
+
+    itemlist.append(item.clone(title="", folder=False))
+    itemlist.append(item.clone(title="Buscar por título", action="search", thumbnail=thumbnail % 'buscar'))
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    itemlist = []
+
+    try:
+        # http://www.yaske.ro/search/?q=los+pitufos
+        item.url = HOST + "/search/?q=" + texto.replace(' ', '+')
+        item.extra = ""
+        itemlist.extend(peliculas(item))
+        if itemlist[-1].title == ">> Página siguiente":
+            item_pag = itemlist[-1]
+            itemlist = sorted(itemlist[:-1], key=lambda Item: Item.contentTitle)
+            itemlist.append(item_pag)
+        else:
+            itemlist = sorted(itemlist, key=lambda Item: Item.contentTitle)
+
+        return itemlist
+
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def newest(categoria):
+    logger.info()
+    item = Item()
+    try:
+        if categoria == 'peliculas':
+            item.url = HOST + "/ultimas-y-actualizadas"
+        elif categoria == 'infantiles':
+            item.url = HOST + "/search/?q=&genre%5B%5D=animation"
+        else:
+            return []
+
+        itemlist = peliculas(item)
+        if itemlist[-1].title == ">> Página siguiente":
+            itemlist.pop()
+
+    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    url_next_page = ""
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+
+    patron = '<article class.*?'
+    patron += '<a href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<aside class="item-control down">(.*?)</aside>.*?'
+    patron += '<small class="pull-right text-muted">([^<]+)</small>.*?'
+    patron += '<h2 class.*?>([^<]+)</h2>'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    # Paginacion
+    if item.next_page != 'b':
+        if len(matches) > 30:
+            url_next_page = item.url
+        matches = matches[:30]
+        next_page = 'b'
+    else:
+        matches = matches[30:]
+        next_page = 'a'
+        patron_next_page = 'Anteriores</a> <a href="([^"]+)" class="btn btn-default ".*?Siguiente'
+        matches_next_page = re.compile(patron_next_page, re.DOTALL).findall(data)
+        if len(matches_next_page) > 0:
+            url_next_page = matches_next_page[0]
+
+    for scrapedurl, scrapedthumbnail, idiomas, year, scrapedtitle in matches:
+        patronidiomas = "<img src='([^']+)'"
+        matchesidiomas = re.compile(patronidiomas, re.DOTALL).findall(idiomas)
+
+        idiomas_disponibles = []
+        for idioma in matchesidiomas:
+            if idioma.endswith("la_la.png"):
+                idiomas_disponibles.append("LAT")
+            elif idioma.endswith("en_en.png"):
+                idiomas_disponibles.append("VO")
+            elif idioma.endswith("en_es.png"):
+                idiomas_disponibles.append("VOSE")
+            elif idioma.endswith("es_es.png"):
+                idiomas_disponibles.append("ESP")
+
+        if idiomas_disponibles:
+            idiomas_disponibles = "[" + "/".join(idiomas_disponibles) + "]"
+
+        contentTitle = scrapertoolsV2.decodeHtmlentities(scrapedtitle.strip())
+        title = "%s %s" % (contentTitle, idiomas_disponibles)
+
+        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, contentTitle=contentTitle,
+                             infoLabels={"year": year}, text_color=color1))
+
+    # Obtenemos los datos basicos de todas las peliculas mediante multihilos
+    tmdb.set_infoLabels(itemlist)
+
+    # Si es necesario añadir paginacion
+    if url_next_page:
+        itemlist.append(
+            Item(channel=item.channel, action="peliculas", title=">> Página siguiente", thumbnail=thumbnail_host,
+                 url=url_next_page, next_page=next_page, folder=True, text_color=color3, text_bold=True))
+
+    return itemlist
+
+
+def menu_buscar_contenido(item):
+    logger.info(item)
+
+    data = httptools.downloadpage(item.url).data
+    patron = '<select name="' + item.extra + '(.*?)</select>'
+    data = scrapertoolsV2.get_match(data, patron)
+
+    # Extrae las entradas
+    patron = "<option value='([^']+)'>([^<]+)</option>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    itemlist = []
+    for scrapedvalue, scrapedtitle in matches:
+        thumbnail = ""
+
+        if item.extra == 'genre':
+            if scrapedtitle.strip() in ['Documental', 'Short', 'News']:
+                continue
+
+            url = HOST + "/search/?q=&genre%5B%5D=" + scrapedvalue
+            filename = scrapedtitle.lower().replace(' ', '%20')
+            if filename == "ciencia%20ficción":
+                filename = "ciencia%20ficcion"
+            thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png" \
+                        % filename
+
+        elif item.extra == 'year':
+            url = HOST + "/search/?q=&year=" + scrapedvalue
+            thumbnail = item.thumbnail
+        else:
+            # http://www.yaske.ro/search/?q=&quality%5B%5D=c9
+            # http://www.yaske.ro/search/?q=&audio%5B%5D=es
+            url = HOST + "/search/?q=&" + item.extra + "%5B%5D=" + scrapedvalue
+            thumbnail = item.thumbnail
+
+        itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url, text_color=color1,
+                             thumbnail=thumbnail, contentType='movie', folder=True, viewmode="movie_with_plot"))
+
+    if item.extra in ['genre', 'audio', 'year']:
+        return sorted(itemlist, key=lambda i: i.title.lower(), reverse=item.extra == 'year')
+    else:
+        return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = list()
+    sublist = list()
+
+    # Descarga la página
+    data = httptools.downloadpage(item.url).data
+
+    if not item.plot:
+        item.plot = scrapertoolsV2.find_single_match(data, '>Sinopsis</dt> <dd>([^<]+)</dd>')
+        item.plot = scrapertoolsV2.decodeHtmlentities(item.plot)
+
+    patron = '<option value="([^"]+)"[^>]+'
+    patron += '>([^<]+).*?</i>([^<]+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for url, idioma, calidad in matches:
+        if 'yaske' in url:
+            data = httptools.downloadpage(url).data
+            url_enc = scrapertoolsV2.find_single_match(data, "eval.*?'(.*?)'")
+            url_dec = base64.b64decode(url_enc)
+            url = scrapertoolsV2.find_single_match(url_dec, 'iframe src="(.*?)"')
+        sublist.append(item.clone(action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(),
+                                  language=idioma.strip()))
+
+    sublist = servertools.get_servers_itemlist(sublist, lambda i: "Ver en %s %s" % (i.server, i.quality), True)
+
+    # Añadir servidores encontrados, agrupandolos por idioma
+    for k in ["Español", "Latino", "Subtitulado", "Ingles"]:
+        lista_idioma = filter(lambda i: i.language == k, sublist)
+        if lista_idioma:
+            itemlist.append(Item(channel=item.channel, title=k, fanart=item.fanart, folder=False,
+                                 text_color=color2, text_bold=True, thumbnail=thumbnail_host))
+            itemlist.extend(lista_idioma)
+
+    # Insertar items "Buscar trailer" y "Añadir a la videoteca"
+    if itemlist and item.extra != "library":
+        title = "%s [Buscar trailer]" % (item.contentTitle)
+        itemlist.insert(0, item.clone(channel="trailertools", action="buscartrailer",
+                                      text_color=color3, title=title, viewmode="list"))
+
+        if config.get_videolibrary_support():
+            itemlist.append(Item(channel=item.channel, title="Añadir película a la videoteca",
+                                 action="add_pelicula_to_library", url=item.url, text_color="green",
+                                 contentTitle=item.contentTitle, extra="library", thumbnail=thumbnail_host))
+
+    return itemlist
diff --git a/plugin.video.alfa/channelselector.py b/plugin.video.alfa/channelselector.py
old mode 100755
new mode 100644
index 956effdd..4586ef2c
--- a/plugin.video.alfa/channelselector.py
+++ b/plugin.video.alfa/channelselector.py
@@ -62,11 +62,11 @@ def getchanneltypes():
     logger.info()
 
     # Lista de categorias
-    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "torrent", "latino"]
+    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct", "torrent", "latino"]
     dict_types_lang = {'movie': config.get_localized_string(30122), 'tvshow': config.get_localized_string(30123),
                        'anime': config.get_localized_string(30124), 'documentary': config.get_localized_string(30125),
                        'vos': config.get_localized_string(30136), 'adult': config.get_localized_string(30126),
-                       'latino': config.get_localized_string(30127)}
+                       'latino': config.get_localized_string(30127), 'direct': config.get_localized_string(30137)}
 
     if config.get_setting("adult_mode") != 0:
         channel_types.append("adult")
diff --git a/plugin.video.alfa/core/videolibrarytools.py b/plugin.video.alfa/core/videolibrarytools.py
index ef783e37..060b9d61 100644
--- a/plugin.video.alfa/core/videolibrarytools.py
+++ b/plugin.video.alfa/core/videolibrarytools.py
@@ -127,14 +127,13 @@ def save_movie(item):
 
     base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").lower().encode("utf8")
 
-    subcarpetas = os.listdir(MOVIES_PATH)
-
-    for c in subcarpetas:
-        code = scrapertools.find_single_match(c, '\[(.*?)\]')
-        if code and code in item.infoLabels['code']:
-            path = filetools.join(MOVIES_PATH, c)
-            _id = code
-            break
+    for raiz, subcarpetas, ficheros in filetools.walk(MOVIES_PATH):
+        for c in subcarpetas:
+            code = scrapertools.find_single_match(c, '\[(.*?)\]')
+            if code and code in item.infoLabels['code']:
+                path = filetools.join(raiz, c)
+                _id = code
+                break
 
     if not path:
         # Crear carpeta
@@ -248,14 +247,13 @@ def save_tvshow(item, episodelist):
 
     base_name = unicode(filetools.validate_path(base_name.replace('/', '-')), "utf8").lower().encode("utf8")
 
-    subcarpetas = os.listdir(TVSHOWS_PATH)
-
-    for c in subcarpetas:
-        code = scrapertools.find_single_match(c, '\[(.*?)\]')
-        if code and code in item.infoLabels['code']:
-            path = filetools.join(TVSHOWS_PATH, c)
-            _id = code
-            break
+    for raiz, subcarpetas, ficheros in filetools.walk(TVSHOWS_PATH):
+        for c in subcarpetas:
+            code = scrapertools.find_single_match(c, '\[(.*?)\]')
+            if code and code in item.infoLabels['code']:
+                path = filetools.join(raiz, c)
+                _id = code
+                break
 
     if not path:
         path = filetools.join(TVSHOWS_PATH, ("%s [%s]" % (base_name, _id)).strip())
@@ -348,7 +346,7 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
     news_in_playcounts = {}
 
     # Listamos todos los ficheros de la serie, asi evitamos tener que comprobar si existe uno por uno
-    ficheros = os.listdir(path)
+    raiz, carpetas_series, ficheros = filetools.walk(path).next()
     ficheros = [filetools.join(path, f) for f in ficheros]
 
     # Silent es para no mostrar progreso (para videolibrary_service)
diff --git a/plugin.video.alfa/resources/language/Catalan/strings.xml b/plugin.video.alfa/resources/language/Catalan/strings.xml
old mode 100755
new mode 100644
index 348e408e..336e2c10
--- a/plugin.video.alfa/resources/language/Catalan/strings.xml
+++ b/plugin.video.alfa/resources/language/Catalan/strings.xml
@@ -135,6 +135,7 @@
     <string id="30124">Anime</string>
     <string id="30125">Documentals</string>
     <string id="30126">Adults</string>
+    <string id="30137">Gvideo</string>
     <string id="30127">Llatí</string>
     <string id="30128">Cerca de tràilers</string>
     <string id="30129">Adult</string>
diff --git a/plugin.video.alfa/resources/language/English/strings.xml b/plugin.video.alfa/resources/language/English/strings.xml
old mode 100755
new mode 100644
index 9b4fdc0a..04206c31
--- a/plugin.video.alfa/resources/language/English/strings.xml
+++ b/plugin.video.alfa/resources/language/English/strings.xml
@@ -138,6 +138,7 @@
     <string id="30125">Documentaries</string>
     <string id="30136">Original version</string>
     <string id="30126">Adult</string>
+    <string id="30137">Gvideo</string>
     <string id="30127">Latin</string>
     <string id="30128">Search Trailers</string>
     <string id="30129">Adult</string>
diff --git a/plugin.video.alfa/resources/language/Italian/strings.xml b/plugin.video.alfa/resources/language/Italian/strings.xml
old mode 100755
new mode 100644
index bf4b58ce..5850086a
--- a/plugin.video.alfa/resources/language/Italian/strings.xml
+++ b/plugin.video.alfa/resources/language/Italian/strings.xml
@@ -137,6 +137,7 @@
     <string id="30125">Documentari</string>
     <string id="30136">Versioni originali</string>
     <string id="30126">Adulti</string>
+    <string id="30137">Gvideo</string>
     <string id="30127">Latino</string>
     <string id="30128">Cerca trailer</string>
     <string id="30129">Adulto</string>
diff --git a/plugin.video.alfa/resources/language/Spanish (mexico)/strings.xml b/plugin.video.alfa/resources/language/Spanish (mexico)/strings.xml
old mode 100755
new mode 100644
index b6571d4d..7ed635b6
--- a/plugin.video.alfa/resources/language/Spanish (mexico)/strings.xml	
+++ b/plugin.video.alfa/resources/language/Spanish (mexico)/strings.xml	
@@ -137,6 +137,7 @@
     <string id="30125">Documentales</string>
     <string id="30126">Adultos</string>
     <string id="30136">Versión original</string>
+    <string id="30137">Gvideo</string>
     <string id="30127">Latino</string>
     <string id="30128">Buscador de Trailers</string>
     <string id="30129">Adultos</string>
diff --git a/plugin.video.alfa/resources/language/Spanish/strings.xml b/plugin.video.alfa/resources/language/Spanish/strings.xml
old mode 100755
new mode 100644
index b6571d4d..7ed635b6
--- a/plugin.video.alfa/resources/language/Spanish/strings.xml
+++ b/plugin.video.alfa/resources/language/Spanish/strings.xml
@@ -137,6 +137,7 @@
     <string id="30125">Documentales</string>
     <string id="30126">Adultos</string>
     <string id="30136">Versión original</string>
+    <string id="30137">Gvideo</string>
     <string id="30127">Latino</string>
     <string id="30128">Buscador de Trailers</string>
     <string id="30129">Adultos</string>
diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_direct.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_direct.png
new file mode 100644
index 0000000000000000000000000000000000000000..f038ff835594d3e89f0081d41f7b916582ecf82c
GIT binary patch
literal 14698
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

literal 0
HcmV?d00001

diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json
index 1bdb1823..4e487d03 100644
--- a/plugin.video.alfa/servers/gvideo.json
+++ b/plugin.video.alfa/servers/gvideo.json
@@ -12,6 +12,10 @@
       {
         "pattern": "(?s)https://youtube.googleapis.com.*?docid=([^(?:&|\")]+)",
         "url": "http://docs.google.com/get_video_info?docid=\\1"
+      },
+      {
+        "pattern": "(?s)https://drive.google.com/file/d/([^/]+)/preview",
+        "url": "http://docs.google.com/get_video_info?docid=\\1"
       }
     ]
   },
@@ -45,4 +49,4 @@
     }
   ],
   "version": 1
-}
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/videolibrary_service.py b/plugin.video.alfa/videolibrary_service.py
index dcb57459..ede7b9aa 100644
--- a/plugin.video.alfa/videolibrary_service.py
+++ b/plugin.video.alfa/videolibrary_service.py
@@ -85,9 +85,10 @@ def check_for_update(overwrite=True):
             heading = 'Actualizando videoteca....'
             p_dialog = platformtools.dialog_progress_bg('alfa', heading)
             p_dialog.update(0, '')
+            show_list = []
 
-            import glob
-            show_list = glob.glob(filetools.join(videolibrarytools.TVSHOWS_PATH, u'/*/tvshow.nfo'))
+            for path, folders, files in filetools.walk(library.TVSHOWS_PATH):
+                show_list.extend([filetools.join(path, f) for f in files if f == "tvshow.nfo"])
 
             if show_list:
                 t = float(100) / len(show_list)