From c76221c14e15e5339e06e793d98c964a494dbf72 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 02:07:20 +0200 Subject: [PATCH 1/4] Use a specific 'qutebrowser_editor_' prefix for instead of 'tmp'. Why does this matter? In my vimrc I have this: " When using dwb ; assume markdown, and don't store in viminfo since these are " temporary files autocmd BufRead,BufNewFile /home/martin/.cache/dwb/edit* setlocal ft=markdown viminfo= I would like to do the same with qutebrowser, but this is not possible with a file name like '/tmp/tmpSJsgSG4' --- qutebrowser/misc/editor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py index 81323bf5e..fc27b922c 100644 --- a/qutebrowser/misc/editor.py +++ b/qutebrowser/misc/editor.py @@ -122,7 +122,8 @@ class ExternalEditor(QObject): raise ValueError("Already editing a file!") self._text = text try: - self._oshandle, self._filename = tempfile.mkstemp(text=True) + self._oshandle, self._filename = tempfile.mkstemp(text=True, + prefix='qutebrowser_editor_') if text: encoding = config.get('general', 'editor-encoding') with open(self._filename, 'w', encoding=encoding) as f: From d20872d576482d15d632e06c79696b68c45c46fe Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 14:49:52 +0200 Subject: [PATCH 2/4] Fix feedback from #690 --- misc/userscripts/qutebrowser_viewsource | 2 +- qutebrowser/app.py | 2 +- qutebrowser/misc/editor.py | 4 ++-- qutebrowser/utils/urlutils.py | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/misc/userscripts/qutebrowser_viewsource b/misc/userscripts/qutebrowser_viewsource index 0985297d7..a1e40c67d 100755 --- a/misc/userscripts/qutebrowser_viewsource +++ b/misc/userscripts/qutebrowser_viewsource @@ -27,6 +27,6 @@ path=/tmp/qutebrowser_$(mktemp XXXXXXXX).html curl "$QUTE_URL" > $path -urxvt -e vim "$path" +xterm -e vim "$path" rm "$path" diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 64c277c9f..9b0ab3ba0 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -70,7 +70,7 @@ def run(args): sys.exit(usertypes.Exit.ok) if args.temp_basedir: - args.basedir = tempfile.mkdtemp() + args.basedir = tempfile.mkdtemp(prefix='qutebrowser-prefix-') quitter = Quitter(args) objreg.register('quitter', quitter) diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py index fc27b922c..32e4100ca 100644 --- a/qutebrowser/misc/editor.py +++ b/qutebrowser/misc/editor.py @@ -122,8 +122,8 @@ class ExternalEditor(QObject): raise ValueError("Already editing a file!") self._text = text try: - self._oshandle, self._filename = tempfile.mkstemp(text=True, - prefix='qutebrowser_editor_') + self._oshandle, self._filename = tempfile.mkstemp( + text=True, prefix='qutebrowser-editor-') if text: encoding = config.get('general', 'editor-encoding') with open(self._filename, 'w', encoding=encoding) as f: diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 143e7cfc5..22b84cf2b 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -166,6 +166,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True): path = None stripped = urlstr.strip() + if path is not None and os.path.exists(path): log.url.debug("URL is a local file") url = QUrl.fromLocalFile(path) @@ -181,6 +182,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True): url = qurl_from_user_input(stripped) log.url.debug("Converting fuzzy term {} to URL -> {}".format( urlstr, url.toDisplayString())) + if do_search and config.get('general', 'auto-search'): qtutils.ensure_valid(url) else: From f7b517f3aadfa56eb9de78b7db1919a0a8676b42 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 17:08:01 +0200 Subject: [PATCH 3/4] Revert some accidental changes >_< --- misc/userscripts/qutebrowser_viewsource | 2 +- qutebrowser/utils/urlutils.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/misc/userscripts/qutebrowser_viewsource b/misc/userscripts/qutebrowser_viewsource index a1e40c67d..0985297d7 100755 --- a/misc/userscripts/qutebrowser_viewsource +++ b/misc/userscripts/qutebrowser_viewsource @@ -27,6 +27,6 @@ path=/tmp/qutebrowser_$(mktemp XXXXXXXX).html curl "$QUTE_URL" > $path -xterm -e vim "$path" +urxvt -e vim "$path" rm "$path" diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 22b84cf2b..143e7cfc5 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -166,7 +166,6 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True): path = None stripped = urlstr.strip() - if path is not None and os.path.exists(path): log.url.debug("URL is a local file") url = QUrl.fromLocalFile(path) @@ -182,7 +181,6 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True): url = qurl_from_user_input(stripped) log.url.debug("Converting fuzzy term {} to URL -> {}".format( urlstr, url.toDisplayString())) - if do_search and config.get('general', 'auto-search'): qtutils.ensure_valid(url) else: From c1dadeff6fb8f1d3f68db2e906acf0152be750af Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 20:48:43 +0200 Subject: [PATCH 4/4] Fix silly mistake... --- qutebrowser/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 9b0ab3ba0..d125d1d1a 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -70,7 +70,7 @@ def run(args): sys.exit(usertypes.Exit.ok) if args.temp_basedir: - args.basedir = tempfile.mkdtemp(prefix='qutebrowser-prefix-') + args.basedir = tempfile.mkdtemp(prefix='qutebrowser-basedir-') quitter = Quitter(args) objreg.register('quitter', quitter)