Actualizados
- allcalidad: Cambio de dominio - animeflv: Correción - streamcloud - Actualización interna
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
from base64 import b64decode
|
||||
|
||||
from core import httptools
|
||||
from core import scrapertools
|
||||
from platformcode import logger
|
||||
|
||||
@@ -9,7 +10,7 @@ from platformcode import logger
|
||||
def get_long_url(short_url):
|
||||
logger.info("short_url = '%s'" % short_url)
|
||||
|
||||
data = scrapertools.downloadpage(short_url)
|
||||
data = httptools.downloadpage(short_url).data
|
||||
ysmm = scrapertools.find_single_match(data, "var ysmm = '([^']+)';")
|
||||
b64 = ""
|
||||
for i in reversed(range(len(ysmm))):
|
||||
@@ -21,7 +22,7 @@ def get_long_url(short_url):
|
||||
decoded_uri = b64decode(b64)[2:]
|
||||
|
||||
if "adf.ly/redirecting" in decoded_uri:
|
||||
data = scrapertools.downloadpage(decoded_uri)
|
||||
data = httptools.downloadpage(decoded_uri).data
|
||||
decoded_uri = scrapertools.find_single_match(data, "window.location = '([^']+)'")
|
||||
|
||||
return decoded_uri
|
||||
|
||||
@@ -25,15 +25,15 @@ def get_long_url(short_url):
|
||||
for name, value in response_headers:
|
||||
if name == "set-cookie":
|
||||
logger.info("Set-Cookie: " + value)
|
||||
cookie_name = scrapertools.get_match(value, '(.*?)\=.*?\;')
|
||||
cookie_value = scrapertools.get_match(value, '.*?\=(.*?)\;')
|
||||
cookie_name = scrapertools.scrapertools.find_single_match(value, '(.*?)\=.*?\;')
|
||||
cookie_value = scrapertools.scrapertools.find_single_match(value, '.*?\=(.*?)\;')
|
||||
request_headers.append(["Cookie", cookie_name + "=" + cookie_value])
|
||||
|
||||
body, response_headers = scrapertools.read_body_and_headers(url, headers=request_headers)
|
||||
logger.info("body=" + body)
|
||||
|
||||
try:
|
||||
location = scrapertools.get_match(body, '<textarea.*?class="caja_des">([^<]+)</textarea>')
|
||||
location = scrapertools.scrapertools.find_single_match(body, '<textarea.*?class="caja_des">([^<]+)</textarea>')
|
||||
logger.info("location=" + location)
|
||||
break
|
||||
except:
|
||||
|
||||
@@ -3,15 +3,16 @@
|
||||
import re
|
||||
import urllib
|
||||
|
||||
from core import httptools
|
||||
from core import scrapertools
|
||||
from platformcode import logger
|
||||
|
||||
|
||||
def get_server_list():
|
||||
servers = []
|
||||
data = scrapertools.downloadpage("http://longurl.org/services")
|
||||
data = httptools.downloadpage("http://longurl.org/services").data
|
||||
data = scrapertools.unescape(data)
|
||||
data = scrapertools.get_match(data, '<ol>(.*?)</ol>')
|
||||
data = scrapertools.find_single_match(data, '<ol>(.*?)</ol>')
|
||||
patron = '<li>(.*?)</li>'
|
||||
matches = re.compile(patron, re.DOTALL).findall(data)
|
||||
|
||||
@@ -33,11 +34,11 @@ def get_long_urls(data):
|
||||
for short_url in matches:
|
||||
if short_url.startswith(tuple(servers)):
|
||||
logger.info(": " + short_url)
|
||||
longurl_data = scrapertools.downloadpage(
|
||||
"http://api.longurl.org/v2/expand?url=" + urllib.quote_plus(short_url))
|
||||
longurl_data = httptools.downloadpage(
|
||||
"http://api.longurl.org/v2/expand?url=" + urllib.quote_plus(short_url)).data
|
||||
logger.info(longurl_data)
|
||||
try:
|
||||
long_url = scrapertools.get_match(longurl_data, '<long-url><!\[CDATA\[(.*?)\]\]></long-url>')
|
||||
long_url = scrapertools.scrapertools.find_single_match(longurl_data, '<long-url><!\[CDATA\[(.*?)\]\]></long-url>')
|
||||
except:
|
||||
long_url = ""
|
||||
if (long_url <> ""): data = data.replace(short_url, long_url)
|
||||
|
||||
Reference in New Issue
Block a user