From 81ce9b818f27b4362b133d9dea38d31e05772320 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 24 Mar 2016 18:58:08 -0700 Subject: [PATCH 1/3] Fix importer script to output bookmarks in the right format for qutebrowser to use --- scripts/importer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/importer.py b/scripts/importer.py index 44453ea92..a30fd5ba8 100755 --- a/scripts/importer.py +++ b/scripts/importer.py @@ -61,7 +61,7 @@ def import_netscape_bookmarks(bookmarks_file): bookmarks = [] for tag in html_tags: if tag['href'] not in bookmarks: - bookmarks.append('{tag.string} {tag[href]}'.format(tag=tag)) + bookmarks.append('{tag[href]} {tag.string}'.format(tag=tag)) for bookmark in bookmarks: print(bookmark) From 8addc19d47855e4ba3bd44d72e4ab712ad217de1 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 25 Mar 2016 13:01:21 -0700 Subject: [PATCH 2/3] Added option to output in "bookmark" format, clarified some "help" msgs --- scripts/importer.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/importer.py b/scripts/importer.py index a30fd5ba8..5e0883cd2 100755 --- a/scripts/importer.py +++ b/scripts/importer.py @@ -31,23 +31,27 @@ import argparse def main(): args = get_args() if args.browser in ['chromium', 'firefox', 'ie']: - import_netscape_bookmarks(args.bookmarks) + import_netscape_bookmarks(args.bookmarks, args.bookmark_format) def get_args(): """Get the argparse parser.""" parser = argparse.ArgumentParser( epilog="To import bookmarks from Chromium, Firefox or IE, " - "export them to HTML in your browsers bookmark manager.") - parser.add_argument('browser', help="Which browser?", + "export them to HTML in your browsers bookmark manager. " + "By default, this script will output in a quickmarks format.") + parser.add_argument('browser', help="Which browser? (chromium, firefox)", choices=['chromium', 'firefox', 'ie'], metavar='browser') - parser.add_argument('bookmarks', help="Bookmarks file") + parser.add_argument('-b', help="Output in bookmark format.", + dest='bookmark_format', action='store_true', + default=False, required=False) + parser.add_argument('bookmarks', help="Bookmarks file (html format)") args = parser.parse_args() return args -def import_netscape_bookmarks(bookmarks_file): +def import_netscape_bookmarks(bookmarks_file, is_bookmark_format): """Import bookmarks from a NETSCAPE-Bookmark-file v1. Generated by Chromium, Firefox, IE and possibly more browsers @@ -57,11 +61,15 @@ def import_netscape_bookmarks(bookmarks_file): soup = bs4.BeautifulSoup(f, 'html.parser') html_tags = soup.findAll('a') + if is_bookmark_format: + output_template = '{tag[href]} {tag.string}' + else: + output_template = '{tag.string} {tag[href]}' bookmarks = [] for tag in html_tags: if tag['href'] not in bookmarks: - bookmarks.append('{tag[href]} {tag.string}'.format(tag=tag)) + bookmarks.append(output_template.format(tag=tag)) for bookmark in bookmarks: print(bookmark) From af54255cee3bf72362a90a72a97c6b6355a995b0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 25 Mar 2016 21:47:46 +0100 Subject: [PATCH 3/3] Regenerate authors --- README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 181bd11aa..a9f5fb236 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -182,6 +182,7 @@ Contributors, sorted by the number of commits in descending order: * rikn00 * Michael Ilsaas * Martin Zimmermann +* Clayton Craft * Brian Jackson * sbinix * neeasade @@ -199,7 +200,6 @@ Contributors, sorted by the number of commits in descending order: * Fritz V155 Reichwald * Franz Fellner * Corentin Jule -* Clayton Craft * zwarag * xd1le * haxwithaxe