From ad98de19e8b939ddfd1207abca1b82d80976850d Mon Sep 17 00:00:00 2001 From: greko17 Date: Wed, 7 Aug 2019 18:56:47 +0200 Subject: [PATCH 1/3] fix: checkhost ReadTimeout: HTTPSConnectionPool(host='filmsenzalimiti.best', port=443): Read timed out. (read timeout=7) --- channels/altadefinizione01.py | 2 +- channels/altadefinizione01_club.json | 2 +- channels/altadefinizione01_club.py | 147 ++++++++++++++++++++++++--- channels/altadefinizione01_link.py | 43 ++++---- channels/guardogratis.json | 4 +- core/support.py | 2 +- specials/checkhost.py | 9 +- 7 files changed, 167 insertions(+), 42 deletions(-) diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index 6e5852e9..ea15324a 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -66,7 +66,7 @@ def categorie(item): if item.args != 'orderalf': action = "peliculas" else: action = 'orderalf' - blacklist = 'altadefinizione01' + blacklist = ['Altadefinizione01'] if item.args == 'genres': patronBlock = r'' diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json index 34c36518..b77e45d7 100644 --- a/channels/altadefinizione01_club.json +++ b/channels/altadefinizione01_club.json @@ -1,7 +1,7 @@ { "id": "altadefinizione01_club", "name": "Altadefinizione01 C", - "active": false, + "active": "enable", "adult": false, "language": ["ita"], "fanart": "https://www.altadefinizione01.vision/templates/Darktemplate/images/logo.png", diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py index 09771127..bdf93559 100644 --- a/channels/altadefinizione01_club.py +++ b/channels/altadefinizione01_club.py @@ -5,23 +5,15 @@ # -*- last change: 04/05/2019 # -*- doppione di altadefinizione01 -from specials import autoplay -from core import servertools, support + +from specials.canale import Channel from core.item import Item -from platformcode import config, logger -__channel__ = "altadefinizione01_club" -host = config.get_channel_url(__channel__) + +chan = Channel(itemlist) -headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], - ['Referer', host]] - -list_servers = ['verystream','openload','rapidvideo','streamango'] -list_quality = ['default'] - -@support.menu +@canale.menu def mainlist(item): - film = [ ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']), ('Generi', ['', 'categorie', 'genres']), @@ -130,5 +122,130 @@ def newest(categoria): for line in sys.exc_info(): logger.error("{0}".format(line)) return [] - - return itemlist +##from specials import autoplay +##from core import servertools, support +##from core.item import Item +##from platformcode import config, logger +## +##__channel__ = "altadefinizione01_club" +##host = config.get_channel_url(__channel__) +## +##headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], +## ['Referer', host]] +## +##list_servers = ['verystream','openload','rapidvideo','streamango'] +##list_quality = ['default'] +## +##@support.menu +##def mainlist(item): +## +## film = [ +## ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']), +## ('Generi', ['', 'categorie', 'genres']), +## ('Lettera', ['/catalog/a/', 'categorie', 'orderalf']), +## ('Anni', ['', 'categorie', 'years']), +## ('Sub-ITA', ['/sub-ita/', 'peliculas', 'pellicola']) +## ] +## +## return locals() +## +### ======== def in ordine di menu =========================== +### =========== def per vedere la lista dei film ============= +##@support.scrape +##def peliculas(item): +#### import web_pdb; web_pdb.set_trace() +## support.log('peliculas',item) +## +## action="findvideos" +## if item.args == "search": +## patronBlock = r'
(.*?)
' +## else: +## patronBlock = r'
(.*?)
' +## patron = r'

..*?<.*?src="(?P[^"]+)"'\ +## '.+?[^>]+>[^>]+
(?P[A-Z]+)<[^>]+>(?:.[^>]+>(?P.*?)<[^>]+>).*?'\ +## '

(?P.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\ +## '[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>' +## +## patronNext = '<span>\d</span> <a href="([^"]+)">' +## +## return locals() +## +### =========== def pagina categorie ====================================== +## +##@support.scrape +##def categorie(item): +## support.log('categorie',item) +#### import web_pdb; web_pdb.set_trace() +## +## if item.args != 'orderalf': action = "peliculas" +## else: action = 'orderalf' +## blacklist = 'Altadefinizione01' +## +## if item.args == 'genres': +## patronBlock = r'<ul class="kategori_list">(.*?)</ul>' +## patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>' +## elif item.args == 'years': +## patronBlock = r'<ul class="anno_list">(.*?)</ul>' +## patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>' +## elif item.args == 'orderalf': +## patronBlock = r'<div class="movies-letter">(.*)<div class="clearfix">' +## patron = '<a title=.*?href="(?P<url>[^"]+)"><span>(?P<title>.*?)</span>' +## +## return locals() +### =========== def pagina lista alfabetica =============================== +##@support.scrape +##def orderalf(item): +## support.log('orderalf',item) +## +## action= 'findvideos' +## patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\ +## '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<'\ +## '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>' +## patronNext = r'<span>[^<]+</span>[^<]+<a href="(.*?)">' +## +## return locals() +### =========== def pagina del film con i server per verderlo ============= +## +##def findvideos(item): +## support.log('findvideos', item) +## return support.server(item, headers=headers) +## +### =========== def per cercare film/serietv ============= +###http://altadefinizione01.link/index.php?do=search&story=avatar&subaction=search +##def search(item, text): +## logger.info("%s mainlist search log: %s %s" % (__channel__, item, text)) +## itemlist = [] +## text = text.replace(" ", "+") +## item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text) +## item.args = "search" +## try: +## return peliculas(item) +## # Cattura la eccezione così non interrompe la ricerca globle se il canale si rompe! +## except: +## import sys +## for line in sys.exc_info(): +## logger.error("%s Sono qua: %s" % (__channel__, line)) +## return [] +## +### =========== def per le novità nel menu principale ============= +## +##def newest(categoria): +## support.log(categoria) +## itemlist = [] +## item = Item() +## try: +## if categoria == "peliculas": +## item.url = host +## item.action = "peliculas" +## itemlist = peliculas(item) +## +## if itemlist[-1].action == "peliculas": +## itemlist.pop() +## # Continua la ricerca in caso di errore +## except: +## import sys +## for line in sys.exc_info(): +## logger.error("{0}".format(line)) +## return [] +## +## return itemlist diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py index f3b2e8b9..98c3fcbf 100644 --- a/channels/altadefinizione01_link.py +++ b/channels/altadefinizione01_link.py @@ -3,7 +3,7 @@ # -*- By Greko -*- from specials import autoplay -from core import servertools, support, jsontools +from core import servertools, support#, jsontools from core.item import Item from platformcode import config, logger @@ -22,16 +22,16 @@ def mainlist(item): ## support.dbg() film = [ - ('Al Cinema', ['/film-del-cinema', 'peliculas','']), - ('Generi', ['', 'genres', 'genres', '']), - ('Anni', ['', 'genres', 'years', '']), - ('Qualità', ['/piu-visti.html', 'genres', 'quality', '']), - ('Mi sento fortunato', ['/piu-visti.html', 'genres', 'lucky', '']), - ('Popolari', ['/piu-visti.html', 'peliculas', '', '']), - ('Sub-ITA', ['/sub-ita/', 'peliculas', '', '']) + ('Al Cinema', ['/film-del-cinema', 'peliculas', '']), + ('Generi', ['', 'genres', 'genres']), + ('Anni', ['', 'genres', 'years']), + ('Qualità', ['/piu-visti.html', 'genres', 'quality']), + ('Mi sento fortunato', ['/piu-visti.html', 'genres', 'lucky']), + ('Popolari', ['/piu-visti.html', 'peliculas', '']), + ('Sub-ITA', ['/film-sub-ita/', 'peliculas', '']) ] - search = '' +## search = '' return locals() @@ -39,26 +39,28 @@ def mainlist(item): @support.scrape def peliculas(item): - #import web_pdb; web_pdb.set_trace() +## support.dbg() support.log('peliculas',item) - itemlist = [] - patron = r'class="innerImage">.*?href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\ - '.*?class="ml-item-title">(?P<title>[^<]+)</.*?class="ml-item-label"> '\ - '(?P<year>\d{4}) <.*?class="ml-item-label"> (?P<duration>\d+) .*?'\ - 'class="ml-item-label ml-item-label-.+?"> (?P<quality>.+?) <.*?'\ - 'class="ml-item-label"> (?P<lang>.+?) </' +## patron = r'class="innerImage">.*?href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\ +## '.*?class="ml-item-title">(?P<title>[^<]+)</.*?class="ml-item-label"> '\ +## '(?P<year>\d{4}) <.*?class="ml-item-label"> (?P<duration>\d+) .*?'\ +## 'class="ml-item-label ml-item-label-.+?"> (?P<quality>.+?) <.*?'\ +## 'class="ml-itelangm-label"> (?P<lang>.+?) </' + patron = r'class="innerImage">.*?href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+)[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> (?P<year>\d{4})[^>]+>[^>]+> (?P<duration>\d+)[^>]+>[^>]+> (?P<quality>[a-zA-Z\\]+)[^>]+>[^>]+> (?P<lang>.*?) [^>]+>' patronNext = '<span>\d</span> <a href="([^"]+)">' +## debug = True return locals() # =========== def pagina categorie ====================================== @support.scrape def genres(item): - support.log + support.log('genres',item) action = 'peliculas' +## item.contentType = 'movie' if item.args == 'genres': patronBlock = r'<ul class="listSubCat" id="Film">(?P<block>.*)</ul>' elif item.args == 'years': @@ -68,9 +70,9 @@ def genres(item): elif item.args == 'lucky': # sono i titoli random nella pagina, cambiano 1 volta al dì patronBlock = r'FILM RANDOM.*?class="listSubCat">(?P<block>.*)</ul>' action = 'findvideos' - +## item.args = '' patron = r'<li><a href="(?P<url>[^"]+)">(?P<title>[^<]+)<' - + return locals() # =========== def per cercare film/serietv ============= @@ -82,7 +84,7 @@ def search(item, text): item.url = host+"/index.php?do=search&story=%s&subaction=search" % (text) try: return peliculas(item) - # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla + # Se captura la excepcion, para no interrumpir al buscador global si un canal falla except: import sys for line in sys.exc_info(): @@ -112,6 +114,5 @@ def newest(categoria): return itemlist - def findvideos(item): return support.server(item, headers=headers) diff --git a/channels/guardogratis.json b/channels/guardogratis.json index 4ebedf28..427cb6ee 100644 --- a/channels/guardogratis.json +++ b/channels/guardogratis.json @@ -4,8 +4,8 @@ "active": true, "adult": false, "language": ["ita"], - "thumbnail": "https:\/\/guardogratis.com\/wp-content\/uploads\/2018\/01\/Logo-4.png", - "bannermenu": "https:\/\/guardogratis.com\/wp-content\/uploads\/2018\/01\/Logo-4.png", + "thumbnail": "", + "bannermenu": "", "categories": ["movie","tvshow"], "settings": [ { diff --git a/core/support.py b/core/support.py index 20423959..97560dc4 100644 --- a/core/support.py +++ b/core/support.py @@ -111,7 +111,7 @@ def dbg(): import web_pdb; if not web_pdb.WebPdb.active_instance: import webbrowser - webbrowser.open('http://localhost:5555') + webbrowser.open('http://127.0.0.1:5555') web_pdb.set_trace() diff --git a/specials/checkhost.py b/specials/checkhost.py index 5bf7d669..d9f08e7d 100644 --- a/specials/checkhost.py +++ b/specials/checkhost.py @@ -113,7 +113,7 @@ class Kdicc(): for sito in lst_urls: rslt = {} try: - r = requests.head(sito, allow_redirects = True, timeout=7) # da errore dopo l'inserimento in lib di httplib2 + r = requests.head(sito, allow_redirects = True)#, timeout=7) # da errore dopo l'inserimento in lib di httplib2 if r.url.endswith('/'): r.url = r.url[:-1] if str(sito) != str(r.url): @@ -289,3 +289,10 @@ def check_channels(inutile=''): with open(folderJson+'/'+fileJson_test, 'w') as f: data = json.dump(risultato, f, sort_keys=True, indent=4) logger.info(data) + + # codice per l'invio del file su git!!! + + # 1. Bottone OKNO richiesta se vuole inviare file + # 2. Maschera per le credenziali di Github + # 3. Invio file + # 4. Esci From 6d5c7887ae8dd306b9d8eaae9c427ff417dd7b9b Mon Sep 17 00:00:00 2001 From: greko <50103632+greko17@users.noreply.github.com> Date: Wed, 7 Aug 2019 19:02:12 +0200 Subject: [PATCH 2/3] ripristino --- channels/altadefinizione01.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index ea15324a..eb6d185a 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -66,7 +66,7 @@ def categorie(item): if item.args != 'orderalf': action = "peliculas" else: action = 'orderalf' - blacklist = ['Altadefinizione01'] + blacklist = 'altadefinizione01' if item.args == 'genres': patronBlock = r'<ul class="kategori_list">(?P<block>.*)</ul>' @@ -130,4 +130,4 @@ def newest(categoria): logger.error("{0}".format(line)) return [] - return itemlist +return itemlist From c7c73224da62a287ac5dbb2c9464fda0b09183c9 Mon Sep 17 00:00:00 2001 From: greko <50103632+greko17@users.noreply.github.com> Date: Wed, 7 Aug 2019 19:03:02 +0200 Subject: [PATCH 3/3] ripristino --- channels/altadefinizione01_club.py | 147 +++-------------------------- 1 file changed, 15 insertions(+), 132 deletions(-) diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py index bdf93559..09771127 100644 --- a/channels/altadefinizione01_club.py +++ b/channels/altadefinizione01_club.py @@ -5,15 +5,23 @@ # -*- last change: 04/05/2019 # -*- doppione di altadefinizione01 - -from specials.canale import Channel +from specials import autoplay +from core import servertools, support from core.item import Item +from platformcode import config, logger - -chan = Channel(itemlist) +__channel__ = "altadefinizione01_club" +host = config.get_channel_url(__channel__) -@canale.menu +headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], + ['Referer', host]] + +list_servers = ['verystream','openload','rapidvideo','streamango'] +list_quality = ['default'] + +@support.menu def mainlist(item): + film = [ ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']), ('Generi', ['', 'categorie', 'genres']), @@ -122,130 +130,5 @@ def newest(categoria): for line in sys.exc_info(): logger.error("{0}".format(line)) return [] -##from specials import autoplay -##from core import servertools, support -##from core.item import Item -##from platformcode import config, logger -## -##__channel__ = "altadefinizione01_club" -##host = config.get_channel_url(__channel__) -## -##headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], -## ['Referer', host]] -## -##list_servers = ['verystream','openload','rapidvideo','streamango'] -##list_quality = ['default'] -## -##@support.menu -##def mainlist(item): -## -## film = [ -## ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']), -## ('Generi', ['', 'categorie', 'genres']), -## ('Lettera', ['/catalog/a/', 'categorie', 'orderalf']), -## ('Anni', ['', 'categorie', 'years']), -## ('Sub-ITA', ['/sub-ita/', 'peliculas', 'pellicola']) -## ] -## -## return locals() -## -### ======== def in ordine di menu =========================== -### =========== def per vedere la lista dei film ============= -##@support.scrape -##def peliculas(item): -#### import web_pdb; web_pdb.set_trace() -## support.log('peliculas',item) -## -## action="findvideos" -## if item.args == "search": -## patronBlock = r'</script> <div class="boxgrid caption">(.*?)<div id="right_bar">' -## else: -## patronBlock = r'<div class="cover_kapsul ml-mask">(.*?)<div class="page_nav">' -## patron = r'<div class="cover boxcaption"> <h2>.<a href="(?P<url>[^"]+)">.*?<.*?src="(?P<thumb>[^"]+)"'\ -## '.+?[^>]+>[^>]+<div class="trdublaj"> (?P<quality>[A-Z]+)<[^>]+>(?:.[^>]+>(?P<lang>.*?)<[^>]+>).*?'\ -## '<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\ -## '[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>' -## -## patronNext = '<span>\d</span> <a href="([^"]+)">' -## -## return locals() -## -### =========== def pagina categorie ====================================== -## -##@support.scrape -##def categorie(item): -## support.log('categorie',item) -#### import web_pdb; web_pdb.set_trace() -## -## if item.args != 'orderalf': action = "peliculas" -## else: action = 'orderalf' -## blacklist = 'Altadefinizione01' -## -## if item.args == 'genres': -## patronBlock = r'<ul class="kategori_list">(.*?)</ul>' -## patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>' -## elif item.args == 'years': -## patronBlock = r'<ul class="anno_list">(.*?)</ul>' -## patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>' -## elif item.args == 'orderalf': -## patronBlock = r'<div class="movies-letter">(.*)<div class="clearfix">' -## patron = '<a title=.*?href="(?P<url>[^"]+)"><span>(?P<title>.*?)</span>' -## -## return locals() -### =========== def pagina lista alfabetica =============================== -##@support.scrape -##def orderalf(item): -## support.log('orderalf',item) -## -## action= 'findvideos' -## patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\ -## '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<'\ -## '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>' -## patronNext = r'<span>[^<]+</span>[^<]+<a href="(.*?)">' -## -## return locals() -### =========== def pagina del film con i server per verderlo ============= -## -##def findvideos(item): -## support.log('findvideos', item) -## return support.server(item, headers=headers) -## -### =========== def per cercare film/serietv ============= -###http://altadefinizione01.link/index.php?do=search&story=avatar&subaction=search -##def search(item, text): -## logger.info("%s mainlist search log: %s %s" % (__channel__, item, text)) -## itemlist = [] -## text = text.replace(" ", "+") -## item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text) -## item.args = "search" -## try: -## return peliculas(item) -## # Cattura la eccezione così non interrompe la ricerca globle se il canale si rompe! -## except: -## import sys -## for line in sys.exc_info(): -## logger.error("%s Sono qua: %s" % (__channel__, line)) -## return [] -## -### =========== def per le novità nel menu principale ============= -## -##def newest(categoria): -## support.log(categoria) -## itemlist = [] -## item = Item() -## try: -## if categoria == "peliculas": -## item.url = host -## item.action = "peliculas" -## itemlist = peliculas(item) -## -## if itemlist[-1].action == "peliculas": -## itemlist.pop() -## # Continua la ricerca in caso di errore -## except: -## import sys -## for line in sys.exc_info(): -## logger.error("{0}".format(line)) -## return [] -## -## return itemlist + + return itemlist