diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 3cd981d8..f9469bdc 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -19,7 +19,7 @@ list_servers = ['rapidvideo', 'streamango', 'fastplay', 'flashx', 'openload', 'v __channel__='allcalidad' -host = "https://allcalidad.net/" +host = "https://allcalidad.io/" try: __modo_grafico__ = config.get_setting('modo_grafico', __channel__) @@ -29,6 +29,12 @@ except: def mainlist(item): logger.info() + import ast + from core import jsontools + data = '{"country_code":"PE","country_name":"Peru","city":null,"postal":null,"latitude":-12.0433,"longitude":-77.0283,"IPv4":"190.41.210.15","state":null}' + data = data.replace("null",'"null"') + logger.info("Intel22 %s" %data) + user_loc = ast.literal_eval(data) autoplay.init(item.channel, list_servers, list_quality) itemlist = [] itemlist.append(Item(channel = item.channel, title = "Novedades", action = "peliculas", url = host, thumbnail = get_thumb("newest", auto = True))) diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py index fed22711..dda183df 100644 --- a/plugin.video.alfa/channels/animeflv.py +++ b/plugin.video.alfa/channels/animeflv.py @@ -215,16 +215,18 @@ def findvideos(item): itemlist = [] data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", httptools.downloadpage(item.url).data) videos = scrapertools.find_single_match(data, 'var videos = (.*?);') + videos_json = jsontools.load(videos) for video_lang in videos_json.items(): language = video_lang[0] - matches = scrapertools.find_multiple_matches(str(video_lang[1]), 'src="([^"]+)"') - for source in matches: - new_data = httptools.downloadpage(source).data - if 'redirector' in source: + matches = scrapertools.find_multiple_matches(str(video_lang[1]), "code': '(.*?)'") + for source in matches: + url = source + if 'redirector' in source: + new_data = httptools.downloadpage(source).data url = scrapertools.find_single_match(new_data, 'window.location.href = "([^"]+)"') - elif 'embed' in source: + elif 'animeflv.net/embed' in source: source = source.replace('embed', 'check') new_data = httptools.downloadpage(source).data json_data = jsontools.load(new_data) diff --git a/plugin.video.alfa/channels/beeg.json b/plugin.video.alfa/channels/beeg.json deleted file mode 100755 index 85c878fe..00000000 --- a/plugin.video.alfa/channels/beeg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "beeg", - "name": "Beeg", - "active": true, - "adult": true, - "language": ["*"], - "thumbnail": "beeg.png", - "banner": "beeg.png", - "categories": [ - "adult" - ], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": true, - "enabled": true, - "visible": true - } - ] -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/beeg.py b/plugin.video.alfa/channels/beeg.py deleted file mode 100755 index 36e3f020..00000000 --- a/plugin.video.alfa/channels/beeg.py +++ /dev/null @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import urllib - -from core import jsontools as json, httptools -from core import scrapertools -from core.item import Item -from platformcode import logger - -url_api = "" -beeg_salt = "" -Host = "https://beeg.com" - - -def get_api_url(): - global url_api - global beeg_salt - data = scrapertools.downloadpage(Host) - version = re.compile('") + id = scrapertools.find_single_match(data, "") url_targets = url_targets.replace('###0', '###' + id) str = get_status(status, "shows", id) if str != "" and account and item.category != "Series" and "XBMC" not in item.title: @@ -357,8 +357,8 @@ def episodios(item): matches = re.compile(patron, re.DOTALL).findall(data) for scrapedurl in matches: data = agrupa_datos(httptools.downloadpage(scrapedurl).data) - sid = scrapertools.get_match(data, "