pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

crawler: replace ContentNegoHandler with AlternateHandler 

More basic. Sends the same headers no matter what. Make requests more "replicable".
Also, drop "text/xml" from RSS contenttype, too broad, matches garbage
master
pictuga 2020-04-05 16:05:59 +02:00
parent 8a4d68d72c
commit d20f6237bd
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
morss/crawler.py
View File

@ -27,13 +27,14 @@ except NameError:
MIMETYPE = { MIMETYPE = {
'xml': ['text/xml', 'application/xml', 'application/rss+xml', 'application/rdf+xml', 'application/atom+xml', 'application/xhtml+xml'], 'xml': ['text/xml', 'application/xml', 'application/rss+xml', 'application/rdf+xml', 'application/atom+xml', 'application/xhtml+xml'],
'rss': ['application/rss+xml', 'application/rdf+xml', 'application/atom+xml'],
'html': ['text/html', 'application/xhtml+xml', 'application/xml']} 'html': ['text/html', 'application/xhtml+xml', 'application/xml']}
DEFAULT_UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:25.0) Gecko/20100101 Firefox/25.0' DEFAULT_UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:25.0) Gecko/20100101 Firefox/25.0'
def custom_handler(accept=None, strict=False, delay=None, encoding=None): def custom_handler(follow=None, delay=None, encoding=None):
handlers = [] handlers = []
# as per urllib2 source code, these Handelers are added first # as per urllib2 source code, these Handelers are added first
@ -55,8 +56,8 @@ def custom_handler(accept=None, strict=False, delay=None, encoding=None):
handlers.append(EncodingFixHandler(encoding)) handlers.append(EncodingFixHandler(encoding))
if accept: if follow:
handlers.append(ContentNegociationHandler(MIMETYPE[accept], strict)) handlers.append(AlternateHandler(MIMETYPE[follow]))
handlers.append(CacheHandler(force_min=delay)) handlers.append(CacheHandler(force_min=delay))
@ -202,37 +203,22 @@ class AutoRefererHandler(BaseHandler):
https_request = http_request https_request = http_request
class ContentNegociationHandler(BaseHandler): class AlternateHandler(BaseHandler):
" Handler for content negociation. Also parses <link rel='alternate' type='application/rss+xml' href='...' /> " " Follow <link rel='alternate' type='application/rss+xml' href='...' /> "
def __init__(self, accept=None, strict=False): def __init__(self, follow=None):
self.accept = accept self.follow = follow or []
self.strict = strict
def http_request(self, req):
if self.accept is not None:
if isinstance(self.accept, basestring):
self.accept = (self.accept,)
string = ','.join(self.accept)
if self.strict:
string += ',*/*;q=0.9'
req.add_unredirected_header('Accept', string)
return req
def http_response(self, req, resp): def http_response(self, req, resp):
contenttype = resp.info().get('Content-Type', '').split(';')[0] contenttype = resp.info().get('Content-Type', '').split(';')[0]
if 200 <= resp.code < 300 and self.accept is not None and self.strict and contenttype in MIMETYPE['html'] and contenttype not in self.accept: if 200 <= resp.code < 300 and len(self.follow) and contenttype in MIMETYPE['html'] and contenttype not in self.follow:
# opps, not what we were looking for, let's see if the html page suggests an alternative page of the right types # opps, not what we were looking for, let's see if the html page suggests an alternative page of the right types
data = resp.read() data = resp.read()
links = lxml.html.fromstring(data[:10000]).findall('.//link[@rel="alternate"]') links = lxml.html.fromstring(data[:10000]).findall('.//link[@rel="alternate"]')
for link in links: for link in links:
if link.get('type', '') in self.accept: if link.get('type', '') in self.follow:
resp.code = 302 resp.code = 302
resp.msg = 'Moved Temporarily' resp.msg = 'Moved Temporarily'
resp.headers['location'] = link.get('href') resp.headers['location'] = link.get('href')
@ -244,7 +230,6 @@ class ContentNegociationHandler(BaseHandler):
return resp return resp
https_request = http_request
https_response = http_response https_response = http_response

5
morss/morss.py
View File

@ -252,7 +252,7 @@ def ItemFill(item, options, feedurl='/', fast=False):
delay = -2 delay = -2
try: try:
con = crawler.custom_handler('html', False, delay, options.encoding).open(link, timeout=TIMEOUT) con = crawler.custom_handler(delay=delay, encoding=options.encoding).open(link, timeout=TIMEOUT)
data = con.read() data = con.read()
except (IOError, HTTPException) as e: except (IOError, HTTPException) as e:
@ -335,8 +335,7 @@ def FeedFetch(url, options):
delay = 0 delay = 0
try: try:
con = crawler.custom_handler(accept='xml', strict=True, delay=delay, con = crawler.custom_handler(follow='rss', delay=delay, encoding=options.encoding) \
encoding=options.encoding) \
.open(url, timeout=TIMEOUT * 2) .open(url, timeout=TIMEOUT * 2)
xml = con.read() xml = con.read()