Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename Downloads method names to remove the word "download"

Browse Source
This commit is contained in:
Micah Lee 2018-05-04 18:08:23 -07:00
parent be36f3a4b6
commit a0db6d0ee7
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare_gui/share_mode/__init__.py
View File

@ -239,7 +239,7 @@ class ShareMode(Mode):
"""
Handle REQUEST_DOWNLOAD event.
"""
self.downloads.add_download(event["data"]["id"], self.web.zip_filesize)
self.downloads.add(event["data"]["id"], self.web.zip_filesize)
self.downloads_in_progress += 1
self.update_downloads_in_progress()
@ -249,7 +249,7 @@ class ShareMode(Mode):
"""
Handle REQUEST_PROGRESS event.
"""
self.downloads.update_download(event["data"]["id"], event["data"]["bytes"])
self.downloads.update(event["data"]["id"], event["data"]["bytes"])
# Is the download complete?
if event["data"]["bytes"] == self.web.zip_filesize:
@ -269,7 +269,7 @@ class ShareMode(Mode):
self.server_status_label.setText(strings._('closing_automatically', True))
else:
if self.server_status.status == self.server_status.STATUS_STOPPED:
self.downloads.cancel_download(event["data"]["id"])
self.downloads.cancel(event["data"]["id"])
self.downloads_in_progress = 0
self.update_downloads_in_progress()
@ -277,7 +277,7 @@ class ShareMode(Mode):
"""
Handle REQUEST_CANCELED event.
"""
self.downloads.cancel_download(event["data"]["id"])
self.downloads.cancel(event["data"]["id"])
# Update the 'in progress downloads' info
self.downloads_in_progress -= 1
@ -338,7 +338,7 @@ class ShareMode(Mode):
self.update_downloads_completed()
self.update_downloads_in_progress()
self.info_show_downloads.setIcon(QtGui.QIcon(self.common.get_resource_path('images/download_window_gray.png')))
self.downloads.reset_downloads()
self.downloads.reset()
def update_downloads_completed(self):
"""

8
onionshare_gui/share_mode/downloads.py
View File

@ -126,7 +126,7 @@ class Downloads(QtWidgets.QScrollArea):
widget.setLayout(layout)
self.setWidget(widget)
def add_download(self, download_id, total_bytes):
def add(self, download_id, total_bytes):
"""
Add a new download progress bar.
"""
@ -141,19 +141,19 @@ class Downloads(QtWidgets.QScrollArea):
# Scroll to the bottom
self.vbar.setValue(self.vbar.maximum())
def update_download(self, download_id, downloaded_bytes):
def update(self, download_id, downloaded_bytes):
"""
Update the progress of a download progress bar.
"""
self.downloads[download_id].update(downloaded_bytes)
def cancel_download(self, download_id):
def cancel(self, download_id):
"""
Update a download progress bar to show that it has been canceled.
"""
self.downloads[download_id].cancel()
def reset_downloads(self):
def reset(self):
"""
Reset the downloads back to zero
"""