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

Remove move_legacy_dbfile() API. We have mergedb().

Browse Source
This commit is contained in:
Arun Prakash Jana 2016-11-08 08:45:11 +05:30
parent 15892e9eea
commit 0b819944b8
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
buku.py
View File

@ -326,35 +326,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
to new path. Errors out if both the old and new DB files exist.
'''
old_db_path = os.path.join(os.environ.get('HOME'), '.cache', 'buku')
old_db_file = os.path.join(old_db_path, 'bookmarks.db')
if not os.path.exists(old_db_file):
return
new_db_path = BukuDb.get_dbdir_path()
new_db_file = os.path.join(new_db_path, 'bookmarks.db')
if os.path.exists(new_db_file):
logger.error('Both old (%s) and new (%s) DB files exist',
old_db_file, new_db_file)
sys.exit(1)
if not os.path.exists(new_db_path):
os.makedirs(new_db_path)
os.rename(old_db_file, new_db_file)
print('Database was moved from old (%s) to new (%s) location.\n'
% (old_db_file, new_db_file))
os.rmdir(old_db_path)
@staticmethod
def initdb():
'''Initialize the database connection. Create DB
@ -1962,9 +1933,6 @@ def main():
else:
logging.disable(logging.WARNING)
# Move pre-1.9 database to new location
# BukuDb.move_legacy_dbfile()
# Handle encrypt/decrypt options at top priority
if args.lock is not None:
BukuCrypt.encrypt_file(args.lock)