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

Add basename to "download finished" message

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-09 15:15:10 +02:00
parent 0053548036
commit 7611281563
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/webkit/downloads.py
View File

@ -657,7 +657,7 @@ class DownloadItem(QObject):
self.reply = None self.reply = None
self.finished.emit() self.finished.emit()
self.done = True self.done = True
log.downloads.debug("Download finished") log.downloads.debug("Download {} finished".format(self.basename))
self.data_changed.emit() self.data_changed.emit()
@pyqtSlot() @pyqtSlot()

2
tests/end2end/features/misc.feature
View File

@ -308,7 +308,7 @@ Feature: Various utility commands.
When I set content -> enable-pdfjs to false When I set content -> enable-pdfjs to false
And I set storage -> prompt-download-directory to false And I set storage -> prompt-download-directory to false
And I open data/misc/test.pdf And I open data/misc/test.pdf
Then "Download finished" should be logged Then "Download test.pdf finished" should be logged
@qtwebengine_todo: pdfjs is not implemented yet @qtwebengine_todo: pdfjs is not implemented yet
Scenario: Downloading a pdf via pdf.js button (issue 1214) Scenario: Downloading a pdf via pdf.js button (issue 1214)

8
tests/end2end/features/test_downloads_bdd.py
View File

@ -45,7 +45,13 @@ def clean_old_downloads(quteproc):
@bdd.when("I wait until the download is finished") @bdd.when("I wait until the download is finished")
def wait_for_download_finished(quteproc): def wait_for_download_finished(quteproc):
quteproc.wait_for(category='downloads', message='Download finished') quteproc.wait_for(category='downloads', message='Download * finished')
@bdd.when(bdd.parsers.parse("I wait until the download {name} is finished"))
def wait_for_download_finished_name(quteproc, name):
quteproc.wait_for(category='downloads',
message='Download {} finished'.format(name))
@bdd.when("I download an SSL page") @bdd.when("I download an SSL page")

6
tests/end2end/test_invocations.py
View File

@ -98,14 +98,16 @@ def test_ascii_locale(request, httpbin, tmpdir, quteproc_new):
url = 'http://localhost:{port}/data/downloads/ä-issue908.bin'.format( url = 'http://localhost:{port}/data/downloads/ä-issue908.bin'.format(
port=httpbin.port) port=httpbin.port)
quteproc_new.send_cmd(':download {}'.format(url)) quteproc_new.send_cmd(':download {}'.format(url))
quteproc_new.wait_for(category='downloads', message='Download finished') quteproc_new.wait_for(category='downloads',
message='Download ?-issue908.bin finished')
# Test :prompt-open-download # Test :prompt-open-download
quteproc_new.set_setting('storage', 'prompt-download-directory', 'true') quteproc_new.set_setting('storage', 'prompt-download-directory', 'true')
quteproc_new.send_cmd(':download {}'.format(url)) quteproc_new.send_cmd(':download {}'.format(url))
quteproc_new.send_cmd(':prompt-open-download "{}" -c pass' quteproc_new.send_cmd(':prompt-open-download "{}" -c pass'
.format(sys.executable)) .format(sys.executable))
quteproc_new.wait_for(category='downloads', message='Download finished') quteproc_new.wait_for(category='downloads',
message='Download ä-issue908.bin finished')
quteproc_new.wait_for(category='downloads', quteproc_new.wait_for(category='downloads',
message='Opening * with [*python*]') message='Opening * with [*python*]')