Skip to content

Commit

Permalink
[#791] added support for absolute paths in Firefox autoimport
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeXofLeviafan
LeXofLeviafan committed Nov 8, 2024
1 parent 48bf29e commit 0f453a9
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 63 deletions.
88 changes: 25 additions & 63 deletions buku
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2865,50 +2865,31 @@ class BukuDb:
True on success, False on failure.
"""

ff_bm_db_paths = {}
firefox_profile = firefox_profile and [firefox_profile]

if sys.platform.startswith(('linux', 'freebsd', 'openbsd')):
gc_bm_db_path = '~/.config/google-chrome/Default/Bookmarks'
cb_bm_db_path = '~/.config/chromium/Default/Bookmarks'
vi_bm_db_path = '~/.config/vivaldi/Default/Bookmarks'

default_ff_folder = os.path.expanduser('~/.mozilla/firefox')
profiles = firefox_profile or get_firefox_profile_names(default_ff_folder)
if profiles:
ff_bm_db_paths = {s: '~/.mozilla/firefox/{}/places.sqlite'.format(s)
for s in profiles}

me_bm_db_path = '~/.config/microsoft-edge/Default/Bookmarks'
default_ff_folder = '~/.mozilla/firefox'
elif sys.platform == 'darwin':
gc_bm_db_path = '~/Library/Application Support/Google/Chrome/Default/Bookmarks'
cb_bm_db_path = '~/Library/Application Support/Chromium/Default/Bookmarks'
vi_bm_db_path = '~/Library/Application Support/Vivaldi/Default/Bookmarks'

default_ff_folder = os.path.expanduser('~/Library/Application Support/Firefox')
profiles = firefox_profile or get_firefox_profile_names(default_ff_folder)
if profiles:
ff_bm_db_paths = {s: '~/Library/Application Support/Firefox/{}/places.sqlite'.format(s)
for s in profiles}

me_bm_db_path = '~/Library/Application Support/Microsoft Edge/Default/Bookmarks'
default_ff_folder = '~/Library/Application Support/Firefox'
elif sys.platform == 'win32':
gc_bm_db_path = os.path.expandvars('%LOCALAPPDATA%/Google/Chrome/User Data/Default/Bookmarks')
cb_bm_db_path = os.path.expandvars('%LOCALAPPDATA%/Chromium/User Data/Default/Bookmarks')
vi_bm_db_path = os.path.expandvars('%LOCALAPPDATA%/Vivaldi/User Data/Default/Bookmarks')

default_ff_folder = os.path.expandvars('%APPDATA%/Mozilla/Firefox/')
profiles = firefox_profile or get_firefox_profile_names(default_ff_folder)
if profiles:
ff_bm_db_paths = {s: os.path.join(default_ff_folder, '{}/places.sqlite'.format(s))
for s in profiles}

me_bm_db_path = os.path.expandvars('%LOCALAPPDATA%/Microsoft/Edge/User Data/Default/Bookmarks')
default_ff_folder = os.path.expandvars('%APPDATA%/Mozilla/Firefox/')
else:
LOGERR('buku does not support {} yet'.format(sys.platform))
self.close_quit(1)
return # clarifying execution interrupt for the linter

ff_bm_db_paths = get_firefox_db_paths(default_ff_folder, firefox_profile)

if self.chatty:
resp = input('Generate auto-tag (YYYYMonDD)? (y/n): ')
if resp == 'y':
Expand All @@ -2924,44 +2905,20 @@ class BukuDb:
with self.lock:
resp = 'y'

try:
if os.path.isfile(os.path.expanduser(gc_bm_db_path)):
if self.chatty:
resp = input('Import bookmarks from google chrome? (y/n): ')
if resp == 'y':
bookmarks_database = os.path.expanduser(gc_bm_db_path)
if not os.path.exists(bookmarks_database):
raise FileNotFoundError
self.load_chrome_database(bookmarks_database, newtag, add_parent_folder_as_tag)
except Exception as e:
LOGERR(e)
print('Could not import bookmarks from google-chrome')

try:
if os.path.isfile(os.path.expanduser(cb_bm_db_path)):
if self.chatty:
resp = input('Import bookmarks from chromium? (y/n): ')
if resp == 'y':
bookmarks_database = os.path.expanduser(cb_bm_db_path)
if not os.path.exists(bookmarks_database):
raise FileNotFoundError
self.load_chrome_database(bookmarks_database, newtag, add_parent_folder_as_tag)
except Exception as e:
LOGERR(e)
print('Could not import bookmarks from chromium')

try:
if os.path.isfile(os.path.expanduser(vi_bm_db_path)):
if self.chatty:
resp = input('Import bookmarks from Vivaldi? (y/n): ')
if resp == 'y':
bookmarks_database = os.path.expanduser(vi_bm_db_path)
if not os.path.exists(bookmarks_database):
raise FileNotFoundError
self.load_chrome_database(bookmarks_database, newtag, add_parent_folder_as_tag)
except Exception as e:
LOGERR(e)
print('Could not import bookmarks from Vivaldi')
chrome_based = {'Google Chrome': gc_bm_db_path, 'Chromium': cb_bm_db_path, 'Vivaldi': vi_bm_db_path}
for name, path in chrome_based.items():
try:
if os.path.isfile(os.path.expanduser(path)):
if self.chatty:
resp = input(f'Import bookmarks from {name}? (y/n): ')
if resp == 'y':
bookmarks_database = os.path.expanduser(path)
if not os.path.exists(bookmarks_database):
raise FileNotFoundError
self.load_chrome_database(bookmarks_database, newtag, add_parent_folder_as_tag)
except Exception as e:
LOGERR(e)
print(f'Could not import bookmarks from {name}')

try:
ff_bm_db_paths = {k: s for k, s in ff_bm_db_paths.items() if os.path.isfile(os.path.expanduser(s))}
Expand Down Expand Up @@ -3612,7 +3569,7 @@ def get_firefox_profile_names(path):
from configparser import ConfigParser, NoOptionError

profiles = []
profile_path = os.path.join(path, 'profiles.ini')
profile_path = os.path.expanduser(os.path.join(path, 'profiles.ini'))
if os.path.exists(profile_path):
config = ConfigParser()
config.read(profile_path)
Expand Down Expand Up @@ -3648,6 +3605,11 @@ def get_firefox_profile_names(path):
LOGDBG('get_firefox_profile_names(): {} does not exist'.format(path))
return profiles

def get_firefox_db_paths(default_ff_folder, specified=None):
profiles = ([specified] if specified else get_firefox_profile_names(default_ff_folder))
_profile_path = lambda s: (s if os.path.isabs(s) else os.path.join(default_ff_folder, s))
return {s: os.path.join(_profile_path(s), 'places.sqlite') for s in profiles}


def walk(root):
"""Recursively iterate over JSON.
Expand Down
76 changes: 76 additions & 0 deletions tests/test_buku.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import signal
import unittest
from itertools import product
from textwrap import dedent
from configparser import ConfigParser
from unittest import mock
from urllib.parse import urlparse

Expand Down Expand Up @@ -812,6 +814,80 @@ def test_import_html_and_new_tag():
assert res[0] == exp_res


@pytest.mark.parametrize('profiles, expected', [
(dedent('''
[Profile3]
Name=ABCD
IsRelative=0
Path=/path/to/removable/drive/ABCD
Default=1
[Install4F96D1932A9F858E]
Default=/path/to/custom/path/my-main-profile
Locked=1
[Profile1]
Name=Main
IsRelative=0
Path=/path/to/custom/path/main-profile
[Profile0]
Name=default
IsRelative=1
Path=zsq8tck1.default-release
[InstallD087BC9767A4CB84]
Default=1koqf71l.default-nightly
Locked=1
[General]
StartWithLastProfile=1
Version=2
'''), ['/path/to/custom/path/my-main-profile', '1koqf71l.default-nightly']),
(dedent('''
[Profile3]
Name=ABCD
IsRelative=0
Path=/path/to/removable/drive/ABCD
Default=1
[Profile1]
Name=Main
IsRelative=0
Path=/path/to/custom/path/my-main-profile
[Profile0]
Name=default
IsRelative=1
Path=zsq8tck1.default-release
[General]
StartWithLastProfile=1
Version=2
'''), ['/path/to/removable/drive/ABCD', 'zsq8tck1.default-release']),
('', []), (None, []),
])
@mock.patch('os.path.exists')
def test_get_firefox_profile_names(_os_path_exists, profiles, expected):
_os_path_exists.return_value = profiles is not None
with mock.patch.object(ConfigParser, 'read', lambda self, _: self.read_string(profiles)):
import buku
assert buku.get_firefox_profile_names('') == expected

@pytest.mark.parametrize('profiles, specified, expected', [
(['foo', '/bar/baz'], None, {
'foo': os.path.join('~/profiles', 'foo', 'places.sqlite'),
'/bar/baz': os.path.join('/bar/baz', 'places.sqlite'),
}),
(['foo', '/bar/baz'], 'qux', {'qux': os.path.join('~/profiles', 'qux', 'places.sqlite')}),
([], '/grue/xyzzy', {'/grue/xyzzy': os.path.join('/grue/xyzzy', 'places.sqlite')}),
])
def test_get_firefox_db_paths(profiles, specified, expected):
with mock.patch('buku.get_firefox_profile_names', return_value=profiles):
import buku
assert buku.get_firefox_db_paths('~/profiles', specified) == expected


@pytest.mark.parametrize(
"platform, params",
[
Expand Down

0 comments on commit 0f453a9

Please sign in to comment.