[jarun#711] fixed profile detection for multiple Firefox installs #716

LeXofLeviafan · 2024-02-05T20:59:43Z

fixes #711:

changing Firefox profile detection from single to multiple when multiple installs are found (asking which one to pick until one is chosen)
adding support for environment variable (FIREFOX_PROFILE) in CLI & parameter (firefox_profile) in API

also:

skipping nonexistent bookmark files
stripping commas (tag delimiter) from imported tags (particularly parent folder ones)

LeXofLeviafan · 2024-02-05T21:03:47Z

buku

+            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}


Keys are printed in prompt (when more than 1 profiles were found).

Dicts retain insertion order (since Python 3.7).

LeXofLeviafan · 2024-02-05T21:07:50Z

buku

-                if not os.path.exists(bookmarks_database):
-                    raise FileNotFoundError
-                self.load_chrome_database(bookmarks_database, newtag, add_parent_folder_as_tag)
+            if os.path.isfile(os.path.expanduser(gc_bm_db_path)):


Adding a file existence check to avoid asking about nonexistent bookmark files.
(expanduser() is required to handle ~ in paths)

LeXofLeviafan · 2024-02-05T21:08:54Z

buku

+                if self.chatty:
+                    profile = ('' if len(ff_bm_db_paths) < 2 else
+                               f' profile {name} [{idx}/{len(ff_bm_db_paths)}]')
+                    resp = input(f'Import bookmarks from Firefox{profile}? (y/n): ')


Asking which profile to import from (when multiple were detected).

LeXofLeviafan · 2024-02-05T21:09:44Z

buku

+                    if not os.path.exists(bookmarks_database):
+                        raise FileNotFoundError
+                    self.load_firefox_database(bookmarks_database, newtag, add_parent_folder_as_tag)
+                    break


Only one Firefox profile is imported, others are skipped (this means falling back to original behaviour in library mode).

LeXofLeviafan · 2024-02-05T21:10:38Z

buku

            except NoOptionError:
                pass
+        if profiles:
+            return profiles


When any installs are found, their default profiles are returned, in order.

LeXofLeviafan · 2024-02-05T21:10:54Z

buku


        profiles_names = [section for section in config.sections() if section.startswith('Profile')]
-        if not profiles_names:
-            return None


This is a noop anyway.

LeXofLeviafan · 2024-02-05T21:11:29Z

buku

-                    profile_path = config.get(name, 'path')
-                    return profile_path
+                    profiles += [config.get(name, 'path')]
+                    continue


Not adding the same profile twice

LeXofLeviafan · 2024-02-05T21:12:06Z

buku

            except NoOptionError:
                pass
            try:
                # alternative way to detect default profile
                if config.get(name, 'name').lower() == "default":
-                    profile_path = config.get(name, 'path')
-                    return profile_path
+                    profiles += [config.get(name, 'path')]
            except NoOptionError:
                pass


When no installs were found, all profiles detected as "default" are returned.

LeXofLeviafan · 2024-02-05T21:12:47Z

buku

+
+    # There are no default profiles
+    LOGDBG('get_firefox_profile_names(): {} does not exist'.format(path))
+    return profiles


Empty list is both valid and falsey.

LeXofLeviafan · 2024-02-05T21:13:33Z

buku

@@ -2304,7 +2306,7 @@ class BukuDb:

        for item in sublist:
            if item['type'] == 'folder':
-                next_folder_name = folder_name + ',' + item['name']
+                next_folder_name = folder_name + DELIM + strip_delim(item['name'])


Stripping commas from imported bookmark folder tags

LeXofLeviafan · 2024-02-05T21:15:19Z

buku

@@ -5986,7 +6002,7 @@ POSITIONAL ARGUMENTS:

    # Import bookmarks from browser
    if args.ai:
-        bdb.auto_import_from_browser()
+        bdb.auto_import_from_browser(firefox_profile=os.environ.get('FIREFOX_PROFILE'))


Overriding Firefox profile detection with an environment variable (if found).

LeXofLeviafan · 2024-02-05T21:17:53Z

tests/test_buku.py

 <DL><p>
 <DT><A HREF="http://example.com/"></A>"""
-    exp_res = ("http://example.com/", None, ",1s,", None, 0, True, False)
+    exp_res = ("http://example.com/", None, ",1s (blah blah),", None, 0, True, False)


Ensuring that a bookmark folder with commas won't be split into multiple tags

LeXofLeviafan · 2024-02-05T21:18:52Z

tests/test_bukuDb/Bookmarks

@@ -287,7 +287,7 @@
            "date_added": "13149362306507580",
            "date_modified": "13149362306507581",
            "id": "41",
-            "name": "Imported From Firefox",
+            "name": "Imported From Firefox (2011-09-02, 06:03:50)",


Actual example of a comma in a bookmark folder name.

jarun · 2024-02-07T01:14:05Z

buku

-            if profile:
-                ff_bm_db_path = ('~/Library/Application Support/Firefox/'
-                                 '{}/places.sqlite'.format(profile))
+            profiles = firefox_profile or get_firefox_profile_names(default_ff_folder)


Why only Firefox? Tomorrow another users may request the same for another browser. Why not do it now?

AFAIK no other browser has multiple switchable profiles that the import code has to pick one from (and may do so incorrectly).

For all other browsers, the bookmark files are always in fixed location – that is certainly the case according to buku code.

jarun · 2024-02-17T03:22:27Z

Thank you!

jarun · 2024-02-17T03:22:50Z

@LeXofLeviafan can we make a release?

LeXofLeviafan · 2024-02-17T03:42:03Z

@jarun I was thinking of dealing with #702 first – it's been open for a while, come to think of it.

Also, you'll need to fork (and release on PyPI) the package that's been blocking buku from releasing updates on PyPI (it should be maintained by you to avoid repeating the issue). …Or alternatively its code could be included in bukuserver files – thus removing the external dependency altogether.

Additionally, the fix could also be applied to v4.8 (e.g. in a separate branch) to publish a post-release to PyPI as well (i.e. 4.8.0.post1), to avoid "missing" versions from release history.

jarun · 2024-02-17T03:43:25Z

I was thinking of dealing with #702 first – it's been open for a while, come to think of it.

Sure thing!

Or alternatively its code could be included in bukuserver files – thus removing the external dependency altogether.

This works for me.

Please raise the PRs.

jarun · 2024-02-19T13:23:04Z

Would you be able to make the next release?
The instructions are here: https://github.com/jarun/buku/wiki/Release-checklist

I can add you to Pypi.

jarun · 2024-02-20T13:41:21Z

@LeXofLeviafan tagging in case you have missed my responses above.

LeXofLeviafan commented Feb 5, 2024

View reviewed changes

LeXofLeviafan force-pushed the fix-import branch from 1ff6ed9 to b7ce595 Compare February 5, 2024 21:06

LeXofLeviafan commented Feb 5, 2024

View reviewed changes

[jarun#711] fixed profile detection for multiple Firefox installs

a4accd2

LeXofLeviafan commented Feb 5, 2024

View reviewed changes

LeXofLeviafan force-pushed the fix-import branch from b7ce595 to a4accd2 Compare February 5, 2024 21:16

LeXofLeviafan commented Feb 5, 2024

View reviewed changes

jarun requested changes Feb 7, 2024

View reviewed changes

jarun merged commit c83362e into jarun:master Feb 17, 2024
1 check passed

github-actions bot locked and limited conversation to collaborators Mar 22, 2024

LeXofLeviafan deleted the fix-import branch August 24, 2024 17:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[jarun#711] fixed profile detection for multiple Firefox installs #716

[jarun#711] fixed profile detection for multiple Firefox installs #716

LeXofLeviafan commented Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

LeXofLeviafan Feb 5, 2024

jarun Feb 7, 2024

LeXofLeviafan Feb 7, 2024 •

edited

Loading

jarun commented Feb 17, 2024

jarun commented Feb 17, 2024

LeXofLeviafan commented Feb 17, 2024

jarun commented Feb 17, 2024

jarun commented Feb 19, 2024

jarun commented Feb 20, 2024

[jarun#711] fixed profile detection for multiple Firefox installs #716

[jarun#711] fixed profile detection for multiple Firefox installs #716

Conversation

LeXofLeviafan commented Feb 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LeXofLeviafan Feb 7, 2024 • edited Loading

Choose a reason for hiding this comment

jarun commented Feb 17, 2024

jarun commented Feb 17, 2024

LeXofLeviafan commented Feb 17, 2024

jarun commented Feb 17, 2024

jarun commented Feb 19, 2024

jarun commented Feb 20, 2024

LeXofLeviafan Feb 7, 2024 •

edited

Loading