[jarun#791] added support for absolute paths in Firefox autoimport #792
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LeXofLeviafan
commented
Nov 8, 2024
| 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} |
There was a problem hiding this comment.
This got moved into a separate function, since it's exactly the same processing other than the prefix.
(Also it's easier to test for correctness this way.)
LeXofLeviafan
commented
Nov 8, 2024
| 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}') |
There was a problem hiding this comment.
These 3 blocks were identical, sans the browser name and the DB path
LeXofLeviafan
commented
Nov 8, 2024
| @@ -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')) | |||
There was a problem hiding this comment.
Since the expansion is necessary either way, it's more reliable to just do it within the function, instead of relying on it be done by the invoking code.
LeXofLeviafan
commented
Nov 8, 2024
| StartWithLastProfile=1 | ||
| Version=2 | ||
| '''), ['/path/to/removable/drive/ABCD', 'zsq8tck1.default-release']), | ||
| ('', []), (None, []), |
There was a problem hiding this comment.
Paths from Installs, paths from Profiles, empty file, no file.
LeXofLeviafan
commented
Nov 8, 2024
| '/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')}), |
There was a problem hiding this comment.
No custom profile path, directory name, absolute path.
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #791:
profiles.inior supplied withFIREFOX_PROFILE=)Also cleaned up some duplicate code in
.auto_import_from_browser().