Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/readdb.py
diff options
context:
space:
mode:
authorSayamindu Dasgupta <sayamindu@gmail.com>2009-02-16 20:26:44 (GMT)
committer Sayamindu Dasgupta <sayamindu@gmail.com>2009-02-16 20:26:44 (GMT)
commitc3b22d8ad925638783f1708dda28666bb2082afe (patch)
treeeb56d2dee146ffee734a736c114285f982683f0f /readdb.py
parentc0b297f6f2bfa1adf84203ec92ed123612693b3b (diff)
Use the variable name filehash instead of hash
Diffstat (limited to 'readdb.py')
-rw-r--r--readdb.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/readdb.py b/readdb.py
index 592313b..3166205 100644
--- a/readdb.py
+++ b/readdb.py
@@ -10,8 +10,8 @@ from readbookmark import Bookmark
_logger = logging.getLogger('read-activity')
class BookmarkManager:
- def __init__(self, hash, dbpath='read.db'):
- self._hash = hash
+ def __init__(self, filehash, dbpath='read.db'):
+ self._filehash = filehash
self._conn = sqlite3.connect(dbpath)
self._cur = self._conn.cursor()
@@ -26,7 +26,7 @@ class BookmarkManager:
user = client.get_string("/desktop/sugar/user/nick")
color = client.get_string("/desktop/sugar/user/color")
- t = (self._hash, page, title, timestamp, user, color, local)
+ t = (self._filehash, page, title, timestamp, user, color, local)
self._cur.execute('insert into bookmarks values (?, ?, ?, ?, ?, ?, ?)', t)
self._conn.commit()
@@ -38,7 +38,7 @@ class BookmarkManager:
# We delete only the locally made bookmark
- t = (self._hash, page, user)
+ t = (self._filehash, page, user)
self._cur.execute('delete from bookmarks where md5=? and page=? and user=?', t)
self._conn.commit()
@@ -46,7 +46,7 @@ class BookmarkManager:
def _populate_bookmarks(self):
# TODO: Figure out if caching the entire set of bookmarks is a good idea or not
- self._cur.execute('select * from bookmarks where md5=?', (self._hash,))
+ self._cur.execute('select * from bookmarks where md5=?', (self._filehash,))
for row in self._cur:
self._bookmarks.append(Bookmark(row))
@@ -62,4 +62,4 @@ class BookmarkManager:
def _resync_bookmark_cache(self):
# To be called when a new bookmark has been added/removed
self._bookmarks = []
- self._populate_bookmarks() \ No newline at end of file
+ self._populate_bookmarks()