rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged :download and :download-page.

Browse Source 
Fix #449
This commit is contained in:
Joel Torstensson 2015-02-08 22:08:16 +01:00
parent 6f89ab628b
commit 9428338389
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qutebrowser/browser/commands.py
View File

@ -911,11 +911,21 @@ class CommandDispatcher:
cur.inspector.show() cur.inspector.show()
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
def download_page(self): def download(self, url=None, dest=None):
"""Download the current page.""" """Download a given URL, or current page if none given.
page = self._current_widget().page()
Args:
url: The URL to download, or None to download current page.
dest: The file path to write the download to, or None to ask.
"""
download_manager = objreg.get('download-manager', scope='window', download_manager = objreg.get('download-manager', scope='window',
window=self._win_id) window=self._win_id)
if (url):
url = urlutils.qurl_from_user_input(url)
urlutils.raise_cmdexc_if_invalid(url)
download_manager.get(url, filename=dest)
else:
page = self._current_widget().page()
download_manager.get(self._current_url(), page) download_manager.get(self._current_url(), page)
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')

12
qutebrowser/browser/downloads.py
View File

@ -580,18 +580,6 @@ class DownloadManager(QAbstractListModel):
self.questions.append(q) self.questions.append(q)
return q return q
@cmdutils.register(instance='download-manager', scope='window')
def download(self, url, dest=None):
"""Download a given URL, given as string.
Args:
url: The URL to download
dest: The file path to write the download to, or None to ask.
"""
url = urlutils.qurl_from_user_input(url)
urlutils.raise_cmdexc_if_invalid(url)
self.get(url, filename=dest)
@pyqtSlot('QUrl', 'QWebPage') @pyqtSlot('QUrl', 'QWebPage')
def get(self, url, page=None, fileobj=None, filename=None, def get(self, url, page=None, fileobj=None, filename=None,
auto_remove=False): auto_remove=False):

2
qutebrowser/config/configdata.py
View File

@ -1028,7 +1028,7 @@ KEY_DATA = collections.OrderedDict([
('navigate increment', ['<Ctrl-A>']), ('navigate increment', ['<Ctrl-A>']),
('navigate decrement', ['<Ctrl-X>']), ('navigate decrement', ['<Ctrl-X>']),
('inspector', ['wi']), ('inspector', ['wi']),
('download-page', ['gd']), ('download', ['gd']),
('download-cancel', ['ad']), ('download-cancel', ['ad']),
('view-source', ['gf']), ('view-source', ['gf']),
('tab-focus last', ['<Ctrl-Tab>']), ('tab-focus last', ['<Ctrl-Tab>']),