default to new search format

This commit is contained in:
Ryan Farley 2017-09-22 17:27:36 -05:00
parent 898dde566d
commit 799fe5deb3

View File

@ -32,8 +32,8 @@ def main():
output_format = '' output_format = ''
if args.search_query or args.search_output: if args.search_query or args.search_output:
bookmark_types = ['search'] bookmark_types = ['search']
if args.newconfig: if args.oldconfig:
output_format = 'ncsearch' output_format = 'oldsearch'
else: else:
output_format = 'search' output_format = 'search'
else: else:
@ -88,8 +88,8 @@ def get_args():
default=False, default=False,
required=False) required=False)
parser.add_argument( parser.add_argument(
'--newconfig', '--oldconfig',
help="Output search engine format for new config.py format", help="Output search engine format for old qutebrowser.conf format",
default=False, default=False,
action='store_true', action='store_true',
required=False) required=False)
@ -142,12 +142,12 @@ def import_netscape_bookmarks(bookmarks_file, bookmark_types, output_format):
(tag.string)), (tag.string)),
} }
output_template = { output_template = {
'ncsearch': { 'search': {
'search': 'search':
"c.url.searchengines['{tag[shortcuturl]}'] = " "c.url.searchengines['{tag[shortcuturl]}'] = "
"'{tag[href]}' #{tag.string}" "'{tag[href]}' #{tag.string}"
}, },
'search': { 'oldsearch': {
'search': '{tag[shortcuturl]} = {tag[href]} #{tag.string}', 'search': '{tag[shortcuturl]} = {tag[href]} #{tag.string}',
}, },
'bookmark': { 'bookmark': {