diff --git a/woodwind/tasks.py b/woodwind/tasks.py index 86c1765..18ae449 100644 --- a/woodwind/tasks.py +++ b/woodwind/tasks.py @@ -171,7 +171,7 @@ def process_xml_feed_for_new_entries(session, feed): def process_html_feed_for_new_entries(session, feed): - logger.debug('fetching html feed: %s', feed) + logger.info('fetching html feed: %s', feed) now = datetime.datetime.utcnow() parsed = mf2util.interpret_feed( @@ -181,6 +181,7 @@ def process_html_feed_for_new_entries(session, feed): for hentry in hfeed: permalink = url = hentry.get('url') uid = hentry.get('uid') or url + logger.debug('processing permalink %s. uid %s', permalink, uid) if not uid: continue diff --git a/woodwind/templates/feeds.jinja2 b/woodwind/templates/feeds.jinja2 index 4a3e7a9..7092a91 100644 --- a/woodwind/templates/feeds.jinja2 +++ b/woodwind/templates/feeds.jinja2 @@ -32,9 +32,9 @@
+ action="{{ url_for('.unsubscribe_feed') }}" method="POST"> - +

View posts from this feed diff --git a/woodwind/views.py b/woodwind/views.py index 259e8b8..710efab 100644 --- a/woodwind/views.py +++ b/woodwind/views.py @@ -96,14 +96,17 @@ def update_all(): return flask.redirect(flask.url_for('.feeds')) -@views.route('/delete_feed', methods=['POST']) +@views.route('/unsubscribe_feed', methods=['POST']) @flask_login.login_required -def delete_feed(): +def unsubscribe_feed(): feed_id = flask.request.form.get('id') feed = Feed.query.get(feed_id) - db.session.delete(feed) + + feeds = flask_login.current_user.feeds + feeds.remove(feed) + db.session.commit() - flask.flash('Deleted {} ({})'.format(feed.name, feed.feed)) + flask.flash('Unsubscribed {} ({})'.format(feed.name, feed.feed)) return flask.redirect(flask.url_for('.feeds'))