mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'economist_none' of https://github.com/xxyzz/calibre
This commit is contained in:
commit
0c5e5d38d3
@ -59,15 +59,14 @@ def load_article_from_json(raw, root):
|
|||||||
E(article, 'h1', data['headline'], style='font-size: x-large')
|
E(article, 'h1', data['headline'], style='font-size: x-large')
|
||||||
E(article, 'div', data['description'], style='font-style: italic')
|
E(article, 'div', data['description'], style='font-style: italic')
|
||||||
E(article, 'div', (data['datePublishedString'] or '') + ' | ' + (data['dateline'] or ''), style='color: gray; margin: 1em')
|
E(article, 'div', (data['datePublishedString'] or '') + ' | ' + (data['dateline'] or ''), style='color: gray; margin: 1em')
|
||||||
images = data['image']
|
main_image_url = data.get('image', {}).get('main', {}).get('url', {}).get('canonical')
|
||||||
if 'main' in images:
|
if main_image_url:
|
||||||
div = E(article, 'div')
|
div = E(article, 'div')
|
||||||
try:
|
try:
|
||||||
E(div, 'img', src=images['main']['url']['canonical'])
|
E(div, 'img', src=main_image_url)
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
text = data['text']
|
for node in data.get('text', []):
|
||||||
for node in text:
|
|
||||||
process_node(node, article)
|
process_node(node, article)
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,15 +59,14 @@ def load_article_from_json(raw, root):
|
|||||||
E(article, 'h1', data['headline'], style='font-size: x-large')
|
E(article, 'h1', data['headline'], style='font-size: x-large')
|
||||||
E(article, 'div', data['description'], style='font-style: italic')
|
E(article, 'div', data['description'], style='font-style: italic')
|
||||||
E(article, 'div', (data['datePublishedString'] or '') + ' | ' + (data['dateline'] or ''), style='color: gray; margin: 1em')
|
E(article, 'div', (data['datePublishedString'] or '') + ' | ' + (data['dateline'] or ''), style='color: gray; margin: 1em')
|
||||||
images = data['image']
|
main_image_url = data.get('image', {}).get('main', {}).get('url', {}).get('canonical')
|
||||||
if 'main' in images:
|
if main_image_url:
|
||||||
div = E(article, 'div')
|
div = E(article, 'div')
|
||||||
try:
|
try:
|
||||||
E(div, 'img', src=images['main']['url']['canonical'])
|
E(div, 'img', src=main_image_url)
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
text = data['text']
|
for node in data.get('text', []):
|
||||||
for node in text:
|
|
||||||
process_node(node, article)
|
process_node(node, article)
|
||||||
|
|
||||||
|
|
||||||
@ -236,7 +235,7 @@ class Economist(BasicNewsRecipe):
|
|||||||
|
|
||||||
def parse_index(self):
|
def parse_index(self):
|
||||||
# return [('Articles', [{'title':'test',
|
# return [('Articles', [{'title':'test',
|
||||||
# 'url':'file:///t/raw.html'
|
# 'url':'https://www.economist.com/briefing/2021/09/11/how-america-wasted-its-unipolar-moment'
|
||||||
# }])]
|
# }])]
|
||||||
if edition_date:
|
if edition_date:
|
||||||
url = 'https://www.economist.com/weeklyedition/' + edition_date
|
url = 'https://www.economist.com/weeklyedition/' + edition_date
|
||||||
|
Loading…
x
Reference in New Issue
Block a user