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

Fixed error messages.

Browse Source
This commit is contained in:
Joel Torstensson 2015-02-13 12:40:37 +01:00
parent cd5d4f4fee
commit 049a360abc
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qutebrowser/browser/downloads.py
View File

@ -741,6 +741,16 @@ class DownloadManager(QAbstractListModel):
return download return download
def raise_no_download(self, index):
"""Raise an exception that the download doesn't exist
Args:
index: The index of the download
"""
if not index:
raise cmdexc.CommandError("There's no download!")
raise cmdexc.CommandError("There's no download {}!".format(index))
@cmdutils.register(instance='download-manager', scope='window') @cmdutils.register(instance='download-manager', scope='window')
def download_cancel(self, count: {'special': 'count'}=0): def download_cancel(self, count: {'special': 'count'}=0):
"""Cancel the last/[count]th download. """Cancel the last/[count]th download.
@ -751,8 +761,10 @@ class DownloadManager(QAbstractListModel):
try: try:
download = self.downloads[count - 1] download = self.downloads[count - 1]
except IndexError: except IndexError:
raise cmdexc.CommandError("There's no download {}!".format(count)) self.raise_no_download(count)
if download.done: if download.done:
if not count:
count = len(self.downloads)
raise cmdexc.CommandError("Download {} is already done!" raise cmdexc.CommandError("Download {} is already done!"
.format(count)) .format(count))
download.cancel() download.cancel()
@ -767,8 +779,10 @@ class DownloadManager(QAbstractListModel):
try: try:
download = self.downloads[count - 1] download = self.downloads[count - 1]
except IndexError: except IndexError:
raise cmdexc.CommandError("There's no download {}!".format(count)) self.raise_no_download(count)
if not download.successful: if not download.successful:
if not count:
count = len(self.downloads)
raise cmdexc.CommandError("Download {} is not done!".format(count)) raise cmdexc.CommandError("Download {} is not done!".format(count))
download.delete() download.delete()
self.remove_item(download) self.remove_item(download)
@ -793,8 +807,10 @@ class DownloadManager(QAbstractListModel):
try: try:
download = self.downloads[count - 1] download = self.downloads[count - 1]
except IndexError: except IndexError:
raise cmdexc.CommandError("There's no download {}!".format(count)) self.raise_no_download(count)
if not download.successful: if not download.successful:
if not count:
count = len(self.downloads)
raise cmdexc.CommandError("Download {} is not done!".format(count)) raise cmdexc.CommandError("Download {} is not done!".format(count))
download.open_file() download.open_file()
@ -872,9 +888,10 @@ class DownloadManager(QAbstractListModel):
try: try:
download = self.downloads[count - 1] download = self.downloads[count - 1]
except IndexError: except IndexError:
raise cmdexc.CommandError("There's no download {}!" self.raise_no_download(count)
.format(count))
if not download.done: if not download.done:
if not count:
count = len(self.downloads)
raise cmdexc.CommandError("Download {} is not done!" raise cmdexc.CommandError("Download {} is not done!"
.format(count)) .format(count))
self.remove_item(download) self.remove_item(download)
@ -933,7 +950,7 @@ class DownloadManager(QAbstractListModel):
"""Update indexes of all DownloadItems""" """Update indexes of all DownloadItems"""
first_idx = None first_idx = None
for i, d in enumerate(self.downloads, 1): for i, d in enumerate(self.downloads, 1):
if not first_idx and d.index != i: if first_idx is not None and d.index != i:
first_idx = i - 1 first_idx = i - 1
d.index = i d.index = i
if first_idx: if first_idx: