Merge branch 'master' of https://github.com/kodiondemand/addon
This commit is contained in:
Alhaziel01
@@ -23,16 +23,16 @@ def mainlist(item):
|
||||
top = [('Ultimi Episodi', ['', 'news'])]
|
||||
|
||||
menu = [('Anime {bullet bold}',['', 'menu', {}, 'tvshow']),
|
||||
('Film {submenu}',['', 'menu', {'type':'Movie'}]),
|
||||
('TV {submenu}',['', 'menu', {'type':'TV'}, 'tvshow']),
|
||||
('OVA {submenu} {tv}',['', 'menu', ['type','OVA'], 'tvshow']),
|
||||
('ONA {submenu} {tv}',['', 'menu', ['type','ONA'], 'tvshow']),
|
||||
('Special {submenu} {tv}',['', 'menu', ['type','Special'], 'tvshow'])]
|
||||
('Film {submenu}',['', 'menu', {'type': 'Movie'}]),
|
||||
('TV {submenu}',['', 'menu', {'type': 'TV'}, 'tvshow']),
|
||||
('OVA {submenu} {tv}',['', 'menu', {'type': 'OVA'}, 'tvshow']),
|
||||
('ONA {submenu} {tv}',['', 'menu', {'type': 'ONA'}, 'tvshow']),
|
||||
('Special {submenu} {tv}',['', 'menu', {'type': 'Special'}, 'tvshow'])]
|
||||
search =''
|
||||
return locals()
|
||||
|
||||
def menu(item):
|
||||
item.action='peliculas'
|
||||
item.action = 'peliculas'
|
||||
ITA = copy.copy(item.args)
|
||||
ITA['title'] = '(ita)'
|
||||
InCorso = copy.copy(item.args)
|
||||
@@ -52,13 +52,14 @@ def menu(item):
|
||||
|
||||
def genres(item):
|
||||
support.log()
|
||||
# support.dbg()
|
||||
itemlist = []
|
||||
|
||||
genres = json.loads(support.match(response.text, patron='genres="([^"]+)').match.replace('"','"'))
|
||||
|
||||
for genre in genres:
|
||||
item.args['genres'] = [genre]
|
||||
itemlist.append(item.clone(title=support.typo(genre,'bold'), action='peliculas'))
|
||||
itemlist.append(item.clone(title=support.typo(genre['name'],'bold'), action='peliculas'))
|
||||
return support.thumb(itemlist)
|
||||
|
||||
def years(item):
|
||||
|
||||
+23
-23
@@ -488,7 +488,7 @@ class UnshortenIt(object):
|
||||
|
||||
|
||||
def _unshorten_vcrypt(self, uri):
|
||||
uri = uri.replace('.net','.pw')
|
||||
uri = uri.replace('.net', '.pw')
|
||||
try:
|
||||
headers = {}
|
||||
if 'myfoldersakstream.php' in uri or '/verys/' in uri:
|
||||
@@ -564,7 +564,7 @@ class UnshortenIt(object):
|
||||
elif '/speedx/' in uri:
|
||||
uri = uri.replace('http://linkup.pro/speedx', 'http://speedvideo.net')
|
||||
else:
|
||||
r = httptools.downloadpage(uri, follow_redirect=True, timeout=self._timeout, cookies=False)
|
||||
r = httptools.downloadpage(uri, follow_redirects=True, timeout=self._timeout, cookies=False)
|
||||
uri = r.url
|
||||
link = re.findall("<iframe[^<>]*src=\\'([^'>]*)\\'[^<>]*>", r.data)
|
||||
# fix by greko inizio
|
||||
@@ -576,8 +576,8 @@ class UnshortenIt(object):
|
||||
if short:
|
||||
uri = short[0]
|
||||
if not r:
|
||||
r = httptools.downloadpage(uri, follow_redirect=True, timeout=self._timeout, cookies=False)
|
||||
uri = r.url
|
||||
r = httptools.downloadpage(uri, follow_redirects=False, timeout=self._timeout, cookies=False)
|
||||
uri = r.headers['location']
|
||||
if "4snip" in uri:
|
||||
if 'out_generator' in uri:
|
||||
uri = re.findall('url=(.*)$', uri)[0]
|
||||
@@ -668,7 +668,7 @@ def unshorten_only(uri, type=None, timeout=10):
|
||||
|
||||
def unshorten(uri, type=None, timeout=10):
|
||||
unshortener = UnshortenIt()
|
||||
uri, status = unshortener.unwrap_30x(uri, timeout=timeout)
|
||||
# uri, status = unshortener.unwrap_30x(uri, timeout=timeout)
|
||||
uri, status = unshortener.unshorten(uri, type=type)
|
||||
if status == 200:
|
||||
uri, status = unshortener.unwrap_30x(uri, timeout=timeout)
|
||||
@@ -688,22 +688,22 @@ def findlinks(text):
|
||||
text += '\n' + unshorten(matches[0])[0]
|
||||
elif matches:
|
||||
# non threaded for webpdb
|
||||
# for match in matches:
|
||||
# sh = unshorten(match)[0]
|
||||
# text += '\n' + sh
|
||||
import sys
|
||||
if sys.version_info[0] >= 3:
|
||||
from concurrent import futures
|
||||
else:
|
||||
from concurrent_py2 import futures
|
||||
with futures.ThreadPoolExecutor() as executor:
|
||||
unshList = [executor.submit(unshorten, match) for match in matches]
|
||||
for link in futures.as_completed(unshList):
|
||||
if link.result()[0] not in matches:
|
||||
links = link.result()[0]
|
||||
if type(links) == list:
|
||||
for l in links:
|
||||
text += '\n' + l
|
||||
else:
|
||||
text += '\n' + str(link.result()[0])
|
||||
for match in matches:
|
||||
sh = unshorten(match)[0]
|
||||
text += '\n' + sh
|
||||
# import sys
|
||||
# if sys.version_info[0] >= 3:
|
||||
# from concurrent import futures
|
||||
# else:
|
||||
# from concurrent_py2 import futures
|
||||
# with futures.ThreadPoolExecutor() as executor:
|
||||
# unshList = [executor.submit(unshorten, match) for match in matches]
|
||||
# for link in futures.as_completed(unshList):
|
||||
# if link.result()[0] not in matches:
|
||||
# links = link.result()[0]
|
||||
# if type(links) == list:
|
||||
# for l in links:
|
||||
# text += '\n' + l
|
||||
# else:
|
||||
# text += '\n' + str(link.result()[0])
|
||||
return text
|
||||
@@ -4,16 +4,12 @@
|
||||
"ignore_urls": ["http://akvideo.stream/video", "http://akvideo.stream/video/api"],
|
||||
"patterns": [
|
||||
{
|
||||
"pattern": "akvideo\\.stream/((?:api/vcmod/fastredirect/streaming\\.php\\?id=|swembedid/)[$0-9]+)",
|
||||
"url": "http://akvideo.stream/\\1"
|
||||
"pattern": "https?://(?:akvideo\\.stream|akvi\\.club)/[^\\s]+[/=]([$0-9]+)(?:[\\s<]|$|\\.html)",
|
||||
"url": "http://akvideo.stream/swembedid/\\1"
|
||||
},
|
||||
{
|
||||
"pattern": "(https://akvideo\\.stream/api/vcmod/fastredirect/embed_ak\\.php\\?id=[0-9]+)",
|
||||
"url": "\\1"
|
||||
},
|
||||
{
|
||||
"pattern": "akvideo.stream/(?:video/|video\\.php\\?file_code=)?(?:embed-)?([a-zA-Z0-9]+)",
|
||||
"url": "http://akvideo.stream/video/\\1"
|
||||
"pattern": "https?://(?:akvideo\\.stream|akvi\\.club)/(?:embed-|video\\.php\\?file_code=)?([a-z0-9]+)(?:[\\s<]|$|\\.html)",
|
||||
"url": "http://akvi.club/embed-\\1.html"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user