Fix guardaserieicu
This commit is contained in:
@@ -146,9 +146,7 @@ def findvideos(item):
|
|||||||
matchData = item.data if item.data else item
|
matchData = item.data if item.data else item
|
||||||
links = support.match(matchData, patron=r'(?:SRC|href)="([^"]+)"', patronBlock=r'<div class="col-md-10">(.+?)<div class="ads">').matches
|
links = support.match(matchData, patron=r'(?:SRC|href)="([^"]+)"', patronBlock=r'<div class="col-md-10">(.+?)<div class="ads">').matches
|
||||||
data = ''
|
data = ''
|
||||||
from lib.unshortenit import unshorten_only
|
|
||||||
for link in links:
|
for link in links:
|
||||||
support.info('URL=',link)
|
support.info('URL=',link)
|
||||||
url, c = unshorten_only(link.replace('#', 'speedvideo.net'))
|
data += link + '\n'
|
||||||
data += url + '\n'
|
|
||||||
return support.server(item, data)
|
return support.server(item, data)
|
||||||
|
|||||||
@@ -18,27 +18,32 @@ host = config.get_channel_url()
|
|||||||
headers = [['Referer', host]]
|
headers = [['Referer', host]]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@support.menu
|
@support.menu
|
||||||
def mainlist(item):
|
def mainlist(item):
|
||||||
tvshow = ['/serie']
|
tvshow = ['/serie']
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
|
||||||
@support.scrape
|
@support.scrape
|
||||||
def peliculas(item):
|
def peliculas(item):
|
||||||
|
# debug = True
|
||||||
patronBlock = r'movies-list movies-list-full(?P<block>.*?)footer>'
|
patronBlock = r'movies-list movies-list-full(?P<block>.*?)footer>'
|
||||||
patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+><img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*)'
|
if item.args == 'search':
|
||||||
|
patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>\s*<img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*).*?"f-desc">\s*<p>(?P<plot>[^<]+)'
|
||||||
|
else:
|
||||||
|
patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+><img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*)'
|
||||||
patronNext = '<li class=.active.>.*?href=.(.*?).>'
|
patronNext = '<li class=.active.>.*?href=.(.*?).>'
|
||||||
action = 'episodios'
|
action = 'episodios'
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
|
||||||
@support.scrape
|
@support.scrape
|
||||||
def episodios(item):
|
def episodios(item):
|
||||||
patronBlock = r'<strong>Stagione (?P<season>[0-9]+)(?P<block>.*?)</div></div>'
|
patronBlock = r'<strong>Stagione (?P<season>[0-9]+)(?P<block>.*?)</div></div>'
|
||||||
patron = r'<a href="(?P<url>[^"]+)">\s*Episodio\s*(?P<episode>[0-9]+)'
|
patron = r'<a href="(?P<url>[^"]+)">\s*Episodio\s*(?P<episode>[0-9]+)'
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
|
||||||
def search(item, text):
|
def search(item, text):
|
||||||
info(text)
|
info(text)
|
||||||
item.contentType = 'tvshow'
|
item.contentType = 'tvshow'
|
||||||
@@ -53,6 +58,7 @@ def search(item, text):
|
|||||||
|
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
def findvideos(item):
|
def findvideos(item):
|
||||||
support.info('findvideos', item)
|
support.info('findvideos', item)
|
||||||
data = support.match(item, headers=headers, patron=r'div class="movieplay">([^>]+)').matches
|
data = support.match(item, headers=headers, patron=r'div class="movieplay">([^>]+)').matches
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ def test_video_exists(page_url):
|
|||||||
logger.debug("(page_url='%s')" % page_url)
|
logger.debug("(page_url='%s')" % page_url)
|
||||||
global data
|
global data
|
||||||
data = httptools.downloadpage(page_url).data
|
data = httptools.downloadpage(page_url).data
|
||||||
if "as it expired or has been deleted" in data:
|
if "as it expired or has been deleted" in data or "Video is processing now" in data:
|
||||||
return False, config.get_localized_string(70449) % "UPstream"
|
return False, config.get_localized_string(70449) % "UPstream"
|
||||||
return True, ""
|
return True, ""
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user