jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

when updating post, don't bother deleting the old one

Browse source
This commit is contained in:
Kyle Mahan 2015-02-27 15:58:28 +00:00
parent fff53125dd
commit 903b4ce4ee
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
woodwind/tasks.py
View file

@ -98,7 +98,7 @@ def process_feed(session, feed):
if old: if old:
feed.entries.remove(old) feed.entries.remove(old)
session.delete(old) #session.delete(old)
feed.entries.append(entry) feed.entries.append(entry)
session.commit() session.commit()
@ -133,6 +133,7 @@ def check_push_subscription(session, feed, response):
'hub.mode': mode, 'hub.mode': mode,
'hub.topic': topic, 'hub.topic': topic,
'hub.callback': build_callback_url(), 'hub.callback': build_callback_url(),
'hub.verify': 'async', # backcompat with 0.3
# TODO secret should only be used over HTTPS # TODO secret should only be used over HTTPS
# 'hub.secret': secret, # 'hub.secret': secret,
}) })
@ -155,12 +156,14 @@ def check_push_subscription(session, feed, response):
topic = self_link and self_link.get('href') topic = self_link and self_link.get('href')
elif feed.type == 'xml': elif feed.type == 'xml':
parsed = feedparser.parse(get_response_content(response)) parsed = feedparser.parse(get_response_content(response))
if not hub: links = parsed.feed.get('links')
hub = next((link['href'] for link in parsed.feed.links if links:
if 'hub' in link['rel']), None) if not hub:
if not topic: hub = next((link['href'] for link in links
topic = next((link['href'] for link in parsed.feed.links if 'hub' in link['rel']), None)
if 'self' in link['rel']), None) if not topic:
topic = next((link['href'] for link in links
if 'self' in link['rel']), None)
if hub != old_hub or topic != old_topic or not feed.push_verified: if hub != old_hub or topic != old_topic or not feed.push_verified:
feed.push_hub = hub feed.push_hub = hub
@ -222,9 +225,9 @@ def process_xml_feed_for_new_entries(session, feed, response):
logger.debug('found {} entries'.format(len(parsed.entries))) logger.debug('found {} entries'.format(len(parsed.entries)))
for p_entry in parsed.entries: for p_entry in parsed.entries:
logger.debug('processing entry {}'.format(p_entry)) logger.debug('processing entry {}'.format(str(p_entry)[:256]))
permalink = p_entry.link permalink = p_entry.get('link')
uid = p_entry.id or permalink uid = p_entry.get('id') or permalink
if not uid: if not uid:
continue continue