Clean up a few bugs

2 files changed, 95 insertions, 24 deletions

diff --git a/app.py b/app.py
index 755d55c..1740f51 100755
--- a/app.py
+++ b/app.py
@@ -8,6 +8,7 @@ from collections import defaultdict
 
 from flask import Flask, render_template, jsonify, request, make_response
 
+DB_PATH = "/home/mcrute/.newsbeuter/cache.db"
 app = Flask(__name__)
 
 
@@ -95,15 +96,14 @@ class DBReader(object):
         '''
 
     def __init__(self, db_path):
-        self.db_path = db_path
+        self.con = sqlite3.connect(db_path)
+        self.con.row_factory = RSSItem.from_db_row
 
-    def _get_connection(self):
-        conn = sqlite3.connect(self.db_path)
-        conn.row_factory = RSSItem.from_db_row
-        return conn
+    def close(self):
+        return self.con.close()
 
     def _fetch(self, where=None, params=()):
-        with self._get_connection() as con:
+        with self.con as con:
             curs = con.cursor()
             args = { 'where': '', 'where_cond': '' }
 
@@ -114,7 +114,7 @@ class DBReader(object):
             return curs.fetchall()
 
     def update_unread(self, id, unread=True):
-        with self._get_connection() as con:
+        with self.con as con:
             con.execute(
                 'UPDATE rss_item SET unread = ? WHERE id = ?',
                 [1 if unread else 0, id])
@@ -139,14 +139,14 @@ class DBReader(object):
             return self._fetch("i.feedurl = ?", [RSSFeed.parse_token(token)])
 
     def get_feeds(self):
-        with self._get_connection() as con:
+        with self.con as con:
             con.row_factory = RSSFeed.from_db_row
             curs = con.cursor()
             curs.execute('SELECT rssurl, url, title FROM rss_feed')
             return curs.fetchall()
 
     def get_feed(self, token):
-        with self._get_connection() as con:
+        with self.con as con:
             con.row_factory = RSSFeed.from_db_row
             curs = con.cursor()
             curs.execute('SELECT rssurl, url, title FROM rss_feed WHERE rssurl = ?', [RSSFeed.parse_token(token)])
@@ -159,38 +159,40 @@ def json_list(data):
 
 @app.route('/')
 def index():
-    reader = DBReader('../../cache.db')
+    reader = DBReader(DB_PATH)
     return render_template('items.html', items=reader.get_unread())
 
 
 @app.route('/feed/')
 def feed_list():
-    reader = DBReader('../../cache.db')
+    reader = DBReader(DB_PATH)
     return jsonify({ 'feeds': json_list(reader.get_feeds()) })
 
 
 @app.route('/feed/<token>')
 def feed(token):
-    reader = DBReader('../../cache.db')
+    reader = DBReader(DB_PATH)
     return jsonify(reader.get_feed(token).to_json())
 
 
 @app.route('/feed/<token>/items')
 def feed_items(token):
-    reader = DBReader('../../cache.db')
-    return jsonify({ 'items': json_list(reader.get_unread_for_feed(token)) })
+    reader = DBReader(DB_PATH)
+    unread = reader.get_unread_for_feed(token)
+    return jsonify({ 'items': json_list(unread), "count": len(unread) })
 
 
 @app.route('/feed/<token>/items/unread')
 def unread_feed_items(token):
-    reader = DBReader('../../cache.db')
-    return jsonify({ 'items': json_list(reader.get_unread_for_feed(token, True)) })
+    reader = DBReader(DB_PATH)
+    unread = reader.get_unread_for_feed(token, True)
+    return jsonify({ 'items': json_list(unread), "count": len(unread) })
 
 
 @app.route("/item/<int:entry_id>", methods=["GET", "POST"])
 def item(entry_id):
     #post read=1
-    reader = DBReader('../../cache.db')
+    reader = DBReader(DB_PATH)
 
     if request.method == 'POST':
         try:
diff --git a/templates/items.html b/templates/items.html
index 093b211..22adbba 100644
--- a/templates/items.html
+++ b/templates/items.html
@@ -64,10 +64,71 @@
         </script>
 
         <script type="text/javascript">
+            /*
+             * Viewport - jQuery selectors for finding elements in viewport
+             *
+             * Copyright (c) 2008-2009 Mika Tuupola
+             *
+             * Licensed under the MIT license:
+             *   http://www.opensource.org/licenses/mit-license.php
+             *
+             * Project home:
+             *  http://www.appelsiini.net/projects/viewport
+             *
+             */
+            (function($) {
+
+                $.belowthefold = function(element, settings) {
+                    var fold = $(window).height() + $(window).scrollTop();
+                    return fold <= $(element).offset().top - settings.threshold;
+                };
+
+                $.abovethetop = function(element, settings) {
+                    var top = $(window).scrollTop();
+                    return top >= $(element).offset().top + $(element).height() - settings.threshold;
+                };
+
+                $.rightofscreen = function(element, settings) {
+                    var fold = $(window).width() + $(window).scrollLeft();
+                    return fold <= $(element).offset().left - settings.threshold;
+                };
+
+                $.leftofscreen = function(element, settings) {
+                    var left = $(window).scrollLeft();
+                    return left >= $(element).offset().left + $(element).width() - settings.threshold;
+                };
+
+                $.inviewport = function(element, settings) {
+                    return !$.rightofscreen(element, settings) && !$.leftofscreen(element, settings) && !$.belowthefold(element, settings) && !$.abovethetop(element, settings);
+                };
+
+                $.extend($.expr[':'], {
+                    "below-the-fold": function(a, i, m) {
+                        return $.belowthefold(a, {threshold : 0});
+                    },
+                    "above-the-top": function(a, i, m) {
+                        return $.abovethetop(a, {threshold : 0});
+                    },
+                    "left-of-screen": function(a, i, m) {
+                        return $.leftofscreen(a, {threshold : 0});
+                    },
+                    "right-of-screen": function(a, i, m) {
+                        return $.rightofscreen(a, {threshold : 0});
+                    },
+                    "in-viewport": function(a, i, m) {
+                        return $.inviewport(a, {threshold : 0});
+                    }
+                });
+            })(jQuery);
+        </script>
+
+        <script type="text/javascript">
             $(document).ready(function() {
                 $("a.headline").on("click", function(event) {
                     event.preventDefault();
                     var target = $(event.target);
+                    $(".entries .highlighted").removeClass("highlighted");
+                    target.parents("li").addClass("highlighted");
                     target.off("click");
                     $.ajax(target.parents("li").attr("data-url")).done(function(data) {
                         if (data.no_content) {
@@ -115,9 +176,13 @@
                     var element = $(".entries .highlighted");
 
                     switch (event.keyCode) {
-                        case 74: // J
+                        case 74: // j
                             element.removeClass("highlighted");
 
+                            if (event.shiftKey) {
+                                element.find("a.headline").trigger("mark-read");
+                            }
+
                             if (element.length == 0) {
                                 $(".entries li:first-child").first().addClass("highlighted");
                             } else {
@@ -129,9 +194,11 @@
                                 }
                             }
 
-                            $.scrollTo(".highlighted", { margin: true, offset: -50 });
+                            if (!$(".entries .highlighted").is(":in-viewport")) {
+                                $.scrollTo(".entries .highlighted", { margin: true, offset: -50 });
+                            }
                         break;
-                        case 75: // K
+                        case 75: // k
                             element.removeClass("highlighted");
 
                             if (element.length == 0) {
@@ -145,9 +212,11 @@
                                 }
                             }
 
-                            $.scrollTo(".highlighted", { margin: true, offset: -50 });
+                            if (!$(".entries .highlighted").is(":in-viewport")) {
+                                $.scrollTo(".entries .highlighted", { margin: true, offset: -50 });
+                            }
                         break;
-                        case 79: // O
+                        case 79: // o
                             var target = $(element).attr("data-target-url");
                             if (target) {
                                 window.open(target, "_blank");
@@ -155,7 +224,7 @@
                                 element.find("a.headline").trigger("click");
                             }
                         break;
-                        case 82: // R
+                        case 82: // r
                             element.find("a.headline").trigger("mark-read");
                         break;
                     }
@@ -167,7 +236,7 @@
         <h1>RSS Entries</h1>
         {% for feed, records in items %}
         <div class="feed">
-            <h2>{{ feed }} <a href="#" class="mark-all-read">Mark All Read</a></h2>
+            <h2>{{ feed }} ({{ records|length }}) <a href="#" class="mark-all-read">Mark All Read</a></h2>
             <ul class="entries">
                 {% for record in records %}
                 <li data-url="{{ record.self_link }}" >