diff --git a/channels/seriehd.py b/channels/seriehd.py index 945aa3cb..0da31041 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -25,14 +25,15 @@ list_quality = ['1080p', '720p', '480p', '360'] def mainlist(item): findhost() tvshow = [('Genere', ['', 'genre']), - ('Americane', ['serie-tv-streaming/serie-tv-americane', 'peliculas']), - ('Italiane', ['serie-tv-streaming/serie-tv-italiane', 'peliculas']),] + ('Americane', ['/serie-tv-streaming/serie-tv-americane', 'peliculas']), + ('Italiane', ['/serie-tv-streaming/serie-tv-italiane', 'peliculas']),] return locals() @support.scrape def peliculas(item): #findhost() + debug=True patron = r'

(?P.*?)</h2>\s*<img src="(?P<thumb>[^"]+)" alt="[^"]*" />\s*<A HREF="(?P<url>[^"]+)">.*?<span class="year">(?:(?P<year>[0-9]{4}))?.*?<span class="calidad">(?:(?P<quality>[A-Z]+))?.*?</span>' patronNext=r'<span class="current">\d+</span><a rel="nofollow" class="page larger" href="([^"]+)">\d+</a>' action='episodios' diff --git a/servers/mixdrop.py b/servers/mixdrop.py index 4f146ebe..bdc2e5e9 100644 --- a/servers/mixdrop.py +++ b/servers/mixdrop.py @@ -26,7 +26,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data = re.sub(r'>\s\s*<', '><', data) jsCode = scrapertoolsV2.find_single_match(data, r'<script>\s*MDCore\.ref = "[a-z0-9]+"; (.*?) </script>') jsUnpacked = jsunpack.unpack(jsCode) - url = "https://" + scrapertoolsV2.find_single_match(jsUnpacked, r'MDCore\.vsrc="//([^"]+)') + url = "https://" + scrapertoolsV2.find_single_match(jsUnpacked, r'MDCore\.vsr(?:c)?="//([^"]+)') itemlist.append([".mp4 [MixDrop]", url]) diff --git a/specials/community.py b/specials/community.py index 8735fd89..9dd6b1c8 100644 --- a/specials/community.py +++ b/specials/community.py @@ -116,6 +116,7 @@ def show_menu(item): title = menu[key] thumbnail = item.thumbnail plot = '' + url = '' itemlist.append(Item(channel=item.channel, title=typo(title,'submenu' if not url else 'bold'), @@ -243,16 +244,16 @@ def submenu(item): for filter in filter_list: thumbnail = '' + plot = '' if item.filterkey in ['director','actors']: load_info = load_json('http://api.themoviedb.org/3/search/person/?api_key=' + tmdb_api + '&language=' + lang + '&query=' + filter) - if load_info: - id = str(load_info['results'][0]['id']) + id = str(load_info['results'][0]['id']) if load_info.has_key('results') else '' if id: - info = load_json('http://api.themoviedb.org/3/person/'+ id + '?api_key=' + tmdb_api + '&language=' + lang) - if not info['biography']: - bio = load_json('http://api.themoviedb.org/3/person/'+ id + '?api_key=' + tmdb_api + '&language=en')['biography'] - thumbnail = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' + info['profile_path'] if info['profile_path'] else item.thumbnail - plot += info['biography'] if info['biography'] else bio if bio else '' + info = load_json('http://api.themoviedb.org/3/person/'+ id + '?api_key=' + tmdb_api + '&language=' + lang) if id else '' + if info.has_key('biography') and not info['biography']: + bio = load_json('http://api.themoviedb.org/3/person/'+ id + '?api_key=' + tmdb_api + '&language=en')['biography'] + thumbnail = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' + info['profile_path'] if info['profile_path'] else item.thumbnail + plot += info['biography'] if info['biography'] else bio if bio else '' itemlist.append(Item(channel=item.channel, title=typo(filter, 'bold'),