1 files changed, 19 insertions, 17 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: