pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clarifying method name since we're getting a dir, not the actual file path. This is in preparation of upcoming tests.

Browse Source
This commit is contained in:
toyg 2016-05-25 11:52:38 +01:00
parent 04bfc4cc57
commit 2a76b4e253
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buku
View File

@ -100,8 +100,8 @@ class BukuDb:
@staticmethod
def get_dbfile_path():
"""Determine the DB file path:
def get_dbdir_path():
"""Determine the directory path where dbfile will be stored:
if $XDG_DATA_HOME is defined, use it
else if $HOME exists, use it
else use the current directory
@ -116,7 +116,6 @@ class BukuDb:
return os.path.join(data_home, 'buku')
@staticmethod
def move_legacy_dbfile():
"""Move database file from earlier path used in versions <= 1.8
@ -129,7 +128,7 @@ class BukuDb:
if not os.path.exists(olddbfile):
return
newdbpath = BukuDb.get_dbfile_path()
newdbpath = BukuDb.get_dbdir_path()
newdbfile = os.path.join(newdbpath, 'bookmarks.db')
if os.path.exists(newdbfile):
@ -153,7 +152,7 @@ class BukuDb:
Returns: connection, cursor
"""
dbpath = BukuDb.get_dbfile_path()
dbpath = BukuDb.get_dbdir_path()
if not os.path.exists(dbpath):
os.makedirs(dbpath)
@ -1034,7 +1033,7 @@ def get_filehash(filepath):
def encrypt_file(iterations):
"""Encrypt the bookmarks database file"""
dbpath = os.path.join(BukuDb.get_dbfile_path(), 'bookmarks.db')
dbpath = os.path.join(BukuDb.get_dbdir_path(), 'bookmarks.db')
encpath = dbpath + '.enc'
if not os.path.exists(dbpath):
print('%s missing. Already encrypted?' % dbpath)
@ -1094,7 +1093,7 @@ def encrypt_file(iterations):
def decrypt_file(iterations):
"""Decrypt the bookmarks database file"""
dbpath = os.path.join(BukuDb.get_dbfile_path(), 'bookmarks.db')
dbpath = os.path.join(BukuDb.get_dbdir_path(), 'bookmarks.db')
encpath = dbpath + '.enc'
if not os.path.exists(encpath):
printmsg((encpath + ' missing'), 'ERROR')