diff --git a/channels/animesaturn.py b/channels/animesaturn.py index 90edb519..0cba6129 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -30,7 +30,7 @@ def mainlist(item): support.menu(itemlist, 'Novità bold', 'ultimiep', "%s/fetch_pages.php?request=episodes" % host, 'tvshow') support.menu(itemlist, 'Anime bold', 'lista_anime', "%s/animelist?load_all=1" % host) support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', '%s/animelist?load_all=1' % host, args=['tvshow', 'alfabetico']) - support.menu(itemlist, 'Cerca', 'search', host) + support.aplay(item, itemlist, list_servers, list_quality) support.channel_config(item, itemlist) diff --git a/channels/animeworld.py b/channels/animeworld.py index 5b0ac071..a6d07fa6 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -31,10 +31,10 @@ def mainlist(item): support.menu(itemlist, 'ITA submenu bold', 'build_menu', host + '/filter?', args=["anime", 'language[]=1']) support.menu(itemlist, 'Sub-ITA submenu bold', 'build_menu', host + '/filter?', args=["anime", 'language[]=0']) - support.menu(itemlist, 'Archivio A-Z submenu', 'alfabetico', host+'/az-list', args=["tvshow","a-z"]) - support.menu(itemlist, 'In corso submenu', 'video', host+'/', args=["in sala"]) - support.menu(itemlist, 'Generi submenu', 'generi', host+'/') - support.menu(itemlist, 'Ultimi Aggiunti bold', 'video', host+'/newest', args=["anime"]) + ('Archivio A-Z ', ['/az-list', 'alfabetico', ]), args=["tvshow","a-z"]) + ('In corso ', ['/', 'video', ]), args=["in sala"]) + ('Generi ', ['/') + support.menu(itemlist, 'generi', ]), 'Ultimi Aggiunti bold', 'video', host+'/newest', args=["anime"]) support.menu(itemlist, 'Ultimi Episodi bold', 'video', host+'/updated', args=["novita'"]) support.menu(itemlist, 'Cerca...', 'search') support.aplay(item, itemlist, list_servers, list_quality) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index a5ab985c..df4d39c8 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -79,19 +79,8 @@ def menu(item): return support.thumb(itemlist) -def search(item, text): - support.log(item.url, "search" ,text) - try: - item.url = item.url + "/?s=" + text - return peliculas(item) - # Continua la ricerca in caso di errore - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] def newest(categoria): diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 811b01f4..76f5164d 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -28,46 +28,25 @@ host = config.get_channel_url(__channel__) headers = [['Referer', host]] +@support.menu def mainlist(item): - logger.info('[cinemalibero.py] mainlist') - - autoplay.init(item.channel, list_servers, list_quality) # Necessario per Autoplay - - # Menu Principale - itemlist = [] - support.menu(itemlist, 'Film bold', 'video', host+'/category/film/') - support.menu(itemlist, 'Generi submenu', 'genres', host) - support.menu(itemlist, 'Cerca film submenu', 'search', host) - support.menu(itemlist, 'Serie TV bold', 'video', host+'/category/serie-tv/', contentType='episode') - support.menu(itemlist, 'Anime submenu', 'video', host+'/category/anime-giapponesi/', contentType='episode') - support.menu(itemlist, 'Cerca serie submenu', 'search', host, contentType='episode') - support.menu(itemlist, 'Sport bold', 'video', host+'/category/sport/') - - autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione) - - support.channel_config(item, itemlist) - - return itemlist - - -def search(item, texto): - logger.info("[cinemalibero.py] " + item.url + " search " + texto) - item.url = host + "/?s=" + texto - try: - return video(item) - # Continua la ricerca in caso di errore - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] + film = '/category/film/' + filmSub = [ + ('Generi', ['', 'genres']), + ('Sport', ['/category/sport/', 'peliculas']), + ] + tvshow = '/category/serie-tv/' + tvshowSub = [ + ('Anime ', ['/category/anime-giapponesi/', 'video']) + ] + return locals() def genres(item): - return support.scrape(item, patronBlock=r'