From 45cbccbc6bbf9d34857a8f630845b494331ea5ae Mon Sep 17 00:00:00 2001 From: Intel1 Date: Wed, 3 Apr 2019 10:55:58 -0500 Subject: [PATCH] Actualizados MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - allcalidad: Cambio de dominio - animeflv: Correción - streamcloud - Actualización interna --- plugin.video.alfa/channels/allcalidad.py | 8 +- plugin.video.alfa/channels/animeflv.py | 12 +- plugin.video.alfa/channels/beeg.json | 22 - plugin.video.alfa/channels/beeg.py | 146 - .../channels/descargacineclasico.py | 2 +- plugin.video.alfa/channels/discoverymx.py | 2 +- plugin.video.alfa/channels/gmobi.py | 2 +- plugin.video.alfa/channels/hdfull.py | 16 +- plugin.video.alfa/channels/hdzog.py | 4 +- plugin.video.alfa/channels/infoplus.py | 17 +- plugin.video.alfa/channels/peliculasgratis.py | 4 +- plugin.video.alfa/channels/seriesdanko.py | 4 +- plugin.video.alfa/channels/serviporno.py | 4 +- plugin.video.alfa/channels/submityouflicks.py | 2 +- plugin.video.alfa/channels/trailertools.py | 74 +- plugin.video.alfa/core/cloudflare.py | 86 +- plugin.video.alfa/core/downloadtools.py | 2 +- plugin.video.alfa/lib/btserver/client.py | 4 +- plugin.video.alfa/lib/js2py/__init__.py | 75 + plugin.video.alfa/lib/js2py/base.py | 3280 + .../lib/js2py/constructors/__init__.py | 1 + .../lib/js2py/constructors/jsarray.py | 48 + .../lib/js2py/constructors/jsarraybuffer.py | 41 + .../lib/js2py/constructors/jsboolean.py | 16 + .../lib/js2py/constructors/jsdate.py | 405 + .../lib/js2py/constructors/jsfloat32array.py | 87 + .../lib/js2py/constructors/jsfloat64array.py | 87 + .../lib/js2py/constructors/jsfunction.py | 52 + .../lib/js2py/constructors/jsint16array.py | 87 + .../lib/js2py/constructors/jsint32array.py | 87 + .../lib/js2py/constructors/jsint8array.py | 79 + .../lib/js2py/constructors/jsmath.py | 157 + .../lib/js2py/constructors/jsnumber.py | 23 + .../lib/js2py/constructors/jsobject.py | 198 + .../lib/js2py/constructors/jsregexp.py | 16 + .../lib/js2py/constructors/jsstring.py | 40 + .../lib/js2py/constructors/jsuint16array.py | 87 + .../lib/js2py/constructors/jsuint32array.py | 95 + .../lib/js2py/constructors/jsuint8array.py | 79 + .../js2py/constructors/jsuint8clampedarray.py | 79 + .../lib/js2py/constructors/time_helpers.py | 207 + plugin.video.alfa/lib/js2py/es6/__init__.py | 41 + plugin.video.alfa/lib/js2py/es6/babel.js | 6 + plugin.video.alfa/lib/js2py/es6/babel.py | 52077 ++++++++++++++++ plugin.video.alfa/lib/js2py/es6/buildBabel | 12 + plugin.video.alfa/lib/js2py/evaljs.py | 265 + plugin.video.alfa/lib/js2py/host/__init__.py | 0 plugin.video.alfa/lib/js2py/host/console.py | 15 + .../lib/js2py/host/dom/__init__.py | 0 plugin.video.alfa/lib/js2py/host/jseval.py | 51 + .../lib/js2py/host/jsfunctions.py | 176 + .../lib/js2py/internals/__init__.py | 0 plugin.video.alfa/lib/js2py/internals/base.py | 925 + .../lib/js2py/internals/byte_trans.py | 752 + plugin.video.alfa/lib/js2py/internals/code.py | 197 + .../js2py/internals/constructors/__init__.py | 1 + .../js2py/internals/constructors/jsarray.py | 28 + .../js2py/internals/constructors/jsboolean.py | 14 + .../js2py/internals/constructors/jsconsole.py | 11 + .../js2py/internals/constructors/jsdate.py | 405 + .../internals/constructors/jsfunction.py | 75 + .../js2py/internals/constructors/jsmath.py | 157 + .../js2py/internals/constructors/jsnumber.py | 27 + .../js2py/internals/constructors/jsobject.py | 204 + .../js2py/internals/constructors/jsregexp.py | 41 + .../js2py/internals/constructors/jsstring.py | 23 + .../internals/constructors/time_helpers.py | 209 + .../lib/js2py/internals/conversions.py | 148 + plugin.video.alfa/lib/js2py/internals/desc.py | 90 + .../lib/js2py/internals/fill_space.py | 284 + .../lib/js2py/internals/func_utils.py | 73 + plugin.video.alfa/lib/js2py/internals/gen.py | 0 .../lib/js2py/internals/opcodes.py | 805 + .../lib/js2py/internals/operations.py | 314 + .../js2py/internals/prototypes/__init__.py | 1 + .../lib/js2py/internals/prototypes/jsarray.py | 489 + .../js2py/internals/prototypes/jsboolean.py | 22 + .../lib/js2py/internals/prototypes/jserror.py | 15 + .../js2py/internals/prototypes/jsfunction.py | 61 + .../lib/js2py/internals/prototypes/jsjson.py | 205 + .../js2py/internals/prototypes/jsnumber.py | 163 + .../js2py/internals/prototypes/jsobject.py | 48 + .../js2py/internals/prototypes/jsregexp.py | 56 + .../js2py/internals/prototypes/jsstring.py | 323 + .../lib/js2py/internals/prototypes/jsutils.py | 149 + .../lib/js2py/internals/seval.py | 32 + .../lib/js2py/internals/simplex.py | 133 + .../lib/js2py/internals/space.py | 92 + .../lib/js2py/internals/speed.py | 62 + .../lib/js2py/internals/trans_utils.py | 28 + .../lib/js2py/legecy_translators/__init__.py | 1 + .../lib/js2py/legecy_translators/constants.py | 308 + .../lib/js2py/legecy_translators/exps.py | 83 + .../lib/js2py/legecy_translators/flow.py | 480 + .../lib/js2py/legecy_translators/functions.py | 98 + .../lib/js2py/legecy_translators/jsparser.py | 326 + .../js2py/legecy_translators/nodevisitor.py | 562 + .../lib/js2py/legecy_translators/nparser.py | 3209 + .../lib/js2py/legecy_translators/objects.py | 300 + .../lib/js2py/legecy_translators/tokenize.py | 4 + .../js2py/legecy_translators/translator.py | 151 + .../lib/js2py/legecy_translators/utils.py | 91 + plugin.video.alfa/lib/js2py/node_import.py | 113 + .../lib/js2py/prototypes/__init__.py | 1 + .../lib/js2py/prototypes/jsarray.py | 476 + .../lib/js2py/prototypes/jsarraybuffer.py | 19 + .../lib/js2py/prototypes/jsboolean.py | 10 + .../lib/js2py/prototypes/jserror.py | 10 + .../lib/js2py/prototypes/jsfunction.py | 52 + .../lib/js2py/prototypes/jsjson.py | 219 + .../lib/js2py/prototypes/jsnumber.py | 146 + .../lib/js2py/prototypes/jsobject.py | 28 + .../lib/js2py/prototypes/jsregexp.py | 45 + .../lib/js2py/prototypes/jsstring.py | 306 + .../lib/js2py/prototypes/jstypedarray.py | 344 + .../lib/js2py/py_node_modules/__init__.py | 1 + plugin.video.alfa/lib/js2py/pyjs.py | 100 + plugin.video.alfa/lib/js2py/test_internals.py | 9 + .../lib/js2py/translators/__init__.py | 38 + .../lib/js2py/translators/friendly_nodes.py | 375 + .../lib/js2py/translators/jsregexps.py | 211 + .../js2py/translators/translating_nodes.py | 688 + .../lib/js2py/translators/translator.py | 189 + plugin.video.alfa/lib/js2py/utils/__init__.py | 0 plugin.video.alfa/lib/js2py/utils/injector.py | 235 + plugin.video.alfa/lib/pyjsparser/__init__.py | 4 + plugin.video.alfa/lib/pyjsparser/parser.py | 2917 + .../lib/pyjsparser/pyjsparserdata.py | 303 + plugin.video.alfa/lib/pyjsparser/std_nodes.py | 470 + plugin.video.alfa/lib/six.py | 891 + plugin.video.alfa/platformcode/mct.py | 7 +- .../resources/language/English/strings.po | 4 - .../resources/language/Italian/strings.po | 4 - .../language/Spanish (Argentina)/strings.po | 4 - .../language/Spanish (Mexico)/strings.po | 4 - .../resources/language/Spanish/strings.po | 4 - .../servers/debriders/realdebrid.py | 17 +- plugin.video.alfa/servers/decrypters/adfly.py | 5 +- .../servers/decrypters/linkbucks.py | 6 +- .../servers/decrypters/longurl.py | 11 +- plugin.video.alfa/servers/streamcloud.py | 7 +- plugin.video.alfa/servers/uploadedto.py | 26 +- plugin.video.alfa/servers/xvideos.py | 11 +- plugin.video.alfa/servers/youwatch.py | 2 +- 144 files changed, 78567 insertions(+), 400 deletions(-) delete mode 100755 plugin.video.alfa/channels/beeg.json delete mode 100755 plugin.video.alfa/channels/beeg.py create mode 100644 plugin.video.alfa/lib/js2py/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/base.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsarray.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsarraybuffer.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsboolean.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsdate.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsfloat32array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsfloat64array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsfunction.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsint16array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsint32array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsint8array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsmath.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsnumber.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsobject.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsregexp.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsstring.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsuint16array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsuint32array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsuint8array.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/jsuint8clampedarray.py create mode 100644 plugin.video.alfa/lib/js2py/constructors/time_helpers.py create mode 100644 plugin.video.alfa/lib/js2py/es6/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/es6/babel.js create mode 100644 plugin.video.alfa/lib/js2py/es6/babel.py create mode 100644 plugin.video.alfa/lib/js2py/es6/buildBabel create mode 100644 plugin.video.alfa/lib/js2py/evaljs.py create mode 100644 plugin.video.alfa/lib/js2py/host/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/host/console.py create mode 100644 plugin.video.alfa/lib/js2py/host/dom/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/host/jseval.py create mode 100644 plugin.video.alfa/lib/js2py/host/jsfunctions.py create mode 100644 plugin.video.alfa/lib/js2py/internals/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/internals/base.py create mode 100644 plugin.video.alfa/lib/js2py/internals/byte_trans.py create mode 100644 plugin.video.alfa/lib/js2py/internals/code.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsarray.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsboolean.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsconsole.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsdate.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsfunction.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsmath.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsnumber.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsobject.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsregexp.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/jsstring.py create mode 100644 plugin.video.alfa/lib/js2py/internals/constructors/time_helpers.py create mode 100644 plugin.video.alfa/lib/js2py/internals/conversions.py create mode 100644 plugin.video.alfa/lib/js2py/internals/desc.py create mode 100644 plugin.video.alfa/lib/js2py/internals/fill_space.py create mode 100644 plugin.video.alfa/lib/js2py/internals/func_utils.py create mode 100644 plugin.video.alfa/lib/js2py/internals/gen.py create mode 100644 plugin.video.alfa/lib/js2py/internals/opcodes.py create mode 100644 plugin.video.alfa/lib/js2py/internals/operations.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsarray.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsboolean.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jserror.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsfunction.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsjson.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsnumber.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsobject.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsregexp.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsstring.py create mode 100644 plugin.video.alfa/lib/js2py/internals/prototypes/jsutils.py create mode 100644 plugin.video.alfa/lib/js2py/internals/seval.py create mode 100644 plugin.video.alfa/lib/js2py/internals/simplex.py create mode 100644 plugin.video.alfa/lib/js2py/internals/space.py create mode 100644 plugin.video.alfa/lib/js2py/internals/speed.py create mode 100644 plugin.video.alfa/lib/js2py/internals/trans_utils.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/constants.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/exps.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/flow.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/functions.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/jsparser.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/nodevisitor.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/nparser.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/objects.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/tokenize.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/translator.py create mode 100644 plugin.video.alfa/lib/js2py/legecy_translators/utils.py create mode 100644 plugin.video.alfa/lib/js2py/node_import.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsarray.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsarraybuffer.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsboolean.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jserror.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsfunction.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsjson.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsnumber.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsobject.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsregexp.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jsstring.py create mode 100644 plugin.video.alfa/lib/js2py/prototypes/jstypedarray.py create mode 100644 plugin.video.alfa/lib/js2py/py_node_modules/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/pyjs.py create mode 100644 plugin.video.alfa/lib/js2py/test_internals.py create mode 100644 plugin.video.alfa/lib/js2py/translators/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/translators/friendly_nodes.py create mode 100644 plugin.video.alfa/lib/js2py/translators/jsregexps.py create mode 100644 plugin.video.alfa/lib/js2py/translators/translating_nodes.py create mode 100644 plugin.video.alfa/lib/js2py/translators/translator.py create mode 100644 plugin.video.alfa/lib/js2py/utils/__init__.py create mode 100644 plugin.video.alfa/lib/js2py/utils/injector.py create mode 100644 plugin.video.alfa/lib/pyjsparser/__init__.py create mode 100644 plugin.video.alfa/lib/pyjsparser/parser.py create mode 100644 plugin.video.alfa/lib/pyjsparser/pyjsparserdata.py create mode 100644 plugin.video.alfa/lib/pyjsparser/std_nodes.py create mode 100644 plugin.video.alfa/lib/six.py 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, "