Compare commits

...

1 Commits

Author SHA1 Message Date
pictuga 7f4589c578 crawler: return dict instead of tuple 2020-04-28 22:10:20 +02:00
4 changed files with 26 additions and 20 deletions

View File

@ -55,7 +55,7 @@ PROTOCOL = ['http', 'https']
def get(*args, **kwargs): def get(*args, **kwargs):
return adv_get(*args, **kwargs)[0] return adv_get(*args, **kwargs)['data']
def adv_get(url, timeout=None, *args, **kwargs): def adv_get(url, timeout=None, *args, **kwargs):
@ -72,7 +72,13 @@ def adv_get(url, timeout=None, *args, **kwargs):
contenttype = con.info().get('Content-Type', '').split(';')[0] contenttype = con.info().get('Content-Type', '').split(';')[0]
encoding= detect_encoding(data, con) encoding= detect_encoding(data, con)
return data, con, contenttype, encoding return {
'data':data,
'url': con.geturl(),
'con': con,
'contenttype': contenttype,
'encoding': encoding
}
def custom_handler(follow=None, delay=None, encoding=None): def custom_handler(follow=None, delay=None, encoding=None):
@ -624,4 +630,4 @@ if __name__ == '__main__':
data, con, contenttype, encoding = adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it') data, con, contenttype, encoding = adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it')
if not sys.flags.interactive: if not sys.flags.interactive:
print(data.decode(encoding)) print(req['data'].decode(req['encoding']))

View File

@ -759,8 +759,8 @@ class ItemJSON(Item, ParserJSON):
if __name__ == '__main__': if __name__ == '__main__':
from . import crawler from . import crawler
data, con, contenttype, encoding = crawler.adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://www.nytimes.com/', follow='rss') req = crawler.adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://www.nytimes.com/', follow='rss')
feed = parse(data, url=con.geturl(), encoding=encoding) feed = parse(req['data'], url=req['url'], encoding=req['encoding'])
if not sys.flags.interactive: if not sys.flags.interactive:
for item in feed.items: for item in feed.items:

View File

@ -248,17 +248,17 @@ def ItemFill(item, options, feedurl='/', fast=False):
delay = -2 delay = -2
try: try:
data, con, contenttype, encoding = crawler.adv_get(url=link, delay=delay, timeout=TIMEOUT) req = crawler.adv_get(url=link, delay=delay, timeout=TIMEOUT)
except (IOError, HTTPException) as e: except (IOError, HTTPException) as e:
log('http error') log('http error')
return False # let's just delete errors stuff when in cache mode return False # let's just delete errors stuff when in cache mode
if contenttype not in crawler.MIMETYPE['html'] and contenttype != 'text/plain': if req['contenttype'] not in crawler.MIMETYPE['html'] and req['contenttype'] != 'text/plain':
log('non-text page') log('non-text page')
return True return True
out = readabilite.get_article(data, url=con.geturl(), encoding_in=encoding, encoding_out='unicode') out = readabilite.get_article(req['data'], url=req['url'], encoding_in=req['encoding'], encoding_out='unicode')
if out is not None: if out is not None:
item.content = out item.content = out
@ -303,14 +303,14 @@ def FeedFetch(url, options):
delay = 0 delay = 0
try: try:
xml, con, contenttype, encoding = crawler.adv_get(url=url, follow='rss', delay=delay, timeout=TIMEOUT * 2) req = crawler.adv_get(url=url, follow='rss', delay=delay, timeout=TIMEOUT * 2)
except (IOError, HTTPException): except (IOError, HTTPException):
raise MorssException('Error downloading feed') raise MorssException('Error downloading feed')
if options.items: if options.items:
# using custom rules # using custom rules
rss = feeds.FeedHTML(xml, encoding=encoding) rss = feeds.FeedHTML(req['data'], encoding=req['encoding'])
rss.rules['title'] = options.title if options.title else '//head/title' rss.rules['title'] = options.title if options.title else '//head/title'
rss.rules['desc'] = options.desc if options.desc else '//head/meta[@name="description"]/@content' rss.rules['desc'] = options.desc if options.desc else '//head/meta[@name="description"]/@content'
@ -330,13 +330,13 @@ def FeedFetch(url, options):
else: else:
try: try:
rss = feeds.parse(xml, url, encoding=encoding) rss = feeds.parse(req['data'], url=url, encoding=req['encoding'])
rss = rss.convert(feeds.FeedXML) rss = rss.convert(feeds.FeedXML)
# contains all fields, otherwise much-needed data can be lost # contains all fields, otherwise much-needed data can be lost
except TypeError: except TypeError:
log('random page') log('random page')
log(contenttype) log(req['contenttype'])
raise MorssException('Link provided is not a valid feed') raise MorssException('Link provided is not a valid feed')
return rss return rss
@ -594,12 +594,12 @@ def cgi_get(environ, start_response):
url, options = cgi_parse_environ(environ) url, options = cgi_parse_environ(environ)
# get page # get page
data, con, contenttype, encoding = crawler.adv_get(url=url, timeout=TIMEOUT) req = crawler.adv_get(url=url, timeout=TIMEOUT)
if contenttype in ['text/html', 'application/xhtml+xml', 'application/xml']: if req['contenttype'] in ['text/html', 'application/xhtml+xml', 'application/xml']:
if options.get == 'page': if options.get == 'page':
html = readabilite.parse(data, encoding=encoding) html = readabilite.parse(req['data'], encoding=req['encoding'])
html.make_links_absolute(con.geturl()) html.make_links_absolute(req['url'])
kill_tags = ['script', 'iframe', 'noscript'] kill_tags = ['script', 'iframe', 'noscript']
@ -610,13 +610,13 @@ def cgi_get(environ, start_response):
output = lxml.etree.tostring(html.getroottree(), encoding='utf-8') output = lxml.etree.tostring(html.getroottree(), encoding='utf-8')
elif options.get == 'article': elif options.get == 'article':
output = readabilite.get_article(data, url=con.geturl(), encoding_in=encoding, encoding_out='utf-8', debug=options.debug) output = readabilite.get_article(req['data'], url=req['url'], encoding_in=req['encoding'], encoding_out='utf-8', debug=options.debug)
else: else:
raise MorssException('no :get option passed') raise MorssException('no :get option passed')
else: else:
output = data output = req['data']
# return html page # return html page
headers = {'status': '200 OK', 'content-type': 'text/html; charset=utf-8'} headers = {'status': '200 OK', 'content-type': 'text/html; charset=utf-8'}

View File

@ -348,8 +348,8 @@ if __name__ == '__main__':
import sys import sys
from . import crawler from . import crawler
data, con, contenttype, encoding = crawler.adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it') req = crawler.adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it')
article = get_article(data, url=con.geturl(), encoding_in=encoding, encoding_out='unicode') article = get_article(req['data'], url=req['url'], encoding_in=req['encoding'], encoding_out='unicode')
if not sys.flags.interactive: if not sys.flags.interactive:
print(article) print(article)