From 2dfc875b761f50ef9ef766d0e5302231723d1ff5 Mon Sep 17 00:00:00 2001
From: mac12m99 <m.toma99@gmail.com>
Date: Thu, 12 Sep 2019 21:29:51 +0200
Subject: [PATCH] ops

---
 channels/fastsubita.py       | 16 ++++++----------
 channels/filmigratis.py      | 24 ++++++++++--------------
 channels/filmpertutti.py     | 26 ++++++++------------------
 channels/guardaserieclick.py | 34 ++++++++++------------------------
 4 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index 6901337a..d92ea1de 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -32,18 +32,14 @@ headers = [
 PERPAGE = 15
 
 
+@support.menu
 def mainlist(item):
-    log()
-    itemlist = []
+    tvshow = ['',
+        ('Novità', ['', 'peliculas']),
+        ('Archivio A-Z ', ['', 'list_az'])
+    ]
 
-    support.menu(itemlist, 'Novità bold', 'pelicuals_tv', host, 'tvshow')
-    support.menu(itemlist, 'Serie TV bold', 'lista_serie', host, 'tvshow')
-    ('Archivio A-Z ', [, 'list_az', ]), 'tvshow', args=['serie'])
-
-    support.aplay(item, itemlist, list_servers, list_quality)
-    support.channel_config(item, itemlist)
-
-    return itemlist
+    return locals()
 
 
 # ----------------------------------------------------------------------------------------------------------------
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
index c89e50c2..53f3549e 100644
--- a/channels/filmigratis.py
+++ b/channels/filmigratis.py
@@ -22,22 +22,18 @@ checklinks_number = config.get_setting('checklinks_number', 'filmigratis')
 headers = [['Referer', host]]
 
 #-----------------------------------------------------------------------------------------------------------------------
-
+@support.menu
 def mainlist(item):
+    film = [
+            ('Al Cinema ', ['', 'carousel']),
+            ('Film alta definizione', ['', 'peliculas']),
+            ('Categorie', ['', 'categorias_film']),
+    ]
+    tvshow = [
+        ('Categorie', ['', 'categorias_serie'])
+    ]
 
-    # Main options
-    itemlist = []
-    support.menu(itemlist, 'Al Cinema bold', 'carousel', host, contentType='movie')
-    support.menu(itemlist, 'Film alta definizione bold', 'peliculas', host, contentType='movie', args='film')
-    support.menu(itemlist, 'Categorie Film bold', 'categorias_film', host , contentType='movie', args='film')
-    support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='tvshow', args='serie')
-
-
-
-    autoplay.init(item.channel, list_servers, list_quality)
-    autoplay.show_option(item.channel, itemlist)
-
-    return itemlist
+    return locals()
 
 #-----------------------------------------------------------------------------------------------------------------------
 
diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index bf090b28..0d466ca0 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -17,26 +17,16 @@ list_servers = ['verystream', 'openload', 'streamango', 'wstream', 'akvideo']
 list_quality = ['HD', 'SD']
 
 
+@support.menu
 def mainlist(item):
-    logger.info()
+    film = ['/category/film/',
+            ('Film per Genere', ['', 'genre'])
+    ]
+    tvshow = ['/category/serie-tv/',
+              ('in ordine alfabetico', ['/category/serie-tv/', 'az'])
+    ]
 
-    itemlist =[]
-
-    support.menu(itemlist, '[B]Film[/B]', 'peliculas', host + '/category/film/', 'movie')
-    support.menu(itemlist, '[B] > Film per Genere[/B]', 'genre', host, 'tvshow')
-    support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR]', 'search', '')
-    support.menu(itemlist, '[B]Serie TV[/B]', 'peliculas', host + '/category/serie-tv/', 'tvshow')
-    support.menu(itemlist, '[B] > Serie TV in ordine alfabetico[/B]', 'az', host + '/category/serie-tv/', 'tvshow')
-    support.menu(itemlist, '[COLOR blue]Cerca Serie TV...[/COLOR]', 'search', '', 'tvshow')
-
-
-    autoplay.init(item.channel, list_servers, list_quality)
-    autoplay.show_option(item.channel, itemlist)
-
-    for item in itemlist:
-        logger.info('MENU=' + str(item) )
-
-    return itemlist
+    return locals()
 
 
 def newest(categoria):
diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py
index c91eb469..aa773eb8 100644
--- a/channels/guardaserieclick.py
+++ b/channels/guardaserieclick.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
 # Canale per Guardaserie.click
-# Thanks to Icarus crew & Alfa addon & 4l3x87
 # ------------------------------------------------------------
 
 """
@@ -19,35 +18,24 @@ __channel__ = 'guardaserieclick'
 host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
-IDIOMAS = {'Italiano': 'IT'}
-list_language = IDIOMAS.values()
 list_servers = ['speedvideo', 'openload']
 list_quality = ['default']
 
-headers = [['Referer', host]]
-
 
 # ----------------------------------------------------------------------------------------------------------------
+@support.menu
 def mainlist(item):
-    log()
+    tvshow = ["/lista-serie-tv",
+              ('Ultimi Aggiornamenti', ["/lista-serie-tv", 'peliculas', 'update']),
+                ('Categorie', ['categorie', 'categorie']),
+                ('Serie inedite Sub-ITA', ["/lista-serie-tv", 'peliculas', 'inedite']),
+                ('Da non perdere', ["/lista-serie-tv", 'peliculas', ['tv', 'da non perdere']]),
+                ('Classiche', ["/lista-serie-tv", 'peliculas', ['tv', 'classiche']]),
+                ('Anime', ["/category/animazione/", 'tvserie', 'tvshow','anime'])
+    ]
 
-    itemlist = []
+    return locals()
 
-    support.menu(itemlist, 'Serie', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['news'])
-    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args= ['update'])
-    support.menu(itemlist, 'Categorie', 'categorie', host, 'tvshow', args=['cat'])
-    support.menu(itemlist, 'Serie inedite Sub-ITA submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['inedite'])
-    support.menu(itemlist, 'Da non perdere bold submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'da non perdere'])
-    support.menu(itemlist, 'Classiche bold submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'classiche'])
-    support.menu(itemlist, 'Disegni che si muovono sullo schermo per magia bold', 'tvserie', "%s/category/animazione/" % host, 'tvshow', args= ['anime'])
-
-
-    # autoplay
-    support.aplay(item, itemlist, list_servers, list_quality)
-    # configurazione del canale
-    support.channel_config(item, itemlist)
-
-    return itemlist
 
 @support.scrape
 def peliculas(item):
@@ -154,8 +142,6 @@ def findvideos(item):
 
 @support.scrape
 def categorie(item):
-    log
-
     action = 'tvserie'
     listGroups = ['url', 'title']
     patron = r'<li>\s<a\shref="([^"]+)"[^>]+>([^<]+)</a></li>'