fix unsubscribe bug -- feeds should be unsubscribed, not deleted

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
 

woodwind/templates/feeds.jinja2

@@ -32,9 +32,9 @@
             <button type="submit">Update</button>
       </form>
       <form style="display:inline;"
-            action="{{ url_for('.delete_feed') }}" method="POST">
+            action="{{ url_for('.unsubscribe_feed') }}" method="POST">
             <input type="hidden" name="id" value="{{ feed.id }}"/>
-            <button type="submit">Delete</button>
+            <button type="submit">Unsubscribe</button>
       </form>
       <br/>
       <a href="{{ url_for('.index', feed=feed.get_feed_code()) }}">View posts from this feed</a>

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'))