Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-07 22:02:35 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update ReceiveMode to use History directly, and now all GUI tests pass

Browse source
This commit is contained in:
Micah Lee 2018-10-07 21:14:20 -07:00
parent c316be91f0
commit 38e7738543
3 changed files with 234 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

97
onionshare_gui/mode/receive_mode/__init__.py
View file

@ -22,8 +22,7 @@ from PyQt5 import QtCore, QtWidgets, QtGui
from onionshare import strings
from onionshare.web import Web
from .uploads import Uploads
from .info import ReceiveModeInfo
from ..history import History, ToggleHistory, UploadHistoryItem
from .. import Mode
class ReceiveMode(Mode):
@ -47,26 +46,36 @@ class ReceiveMode(Mode):
self.server_status.web = self.web
self.server_status.update()
# Uploads
self.uploads = Uploads(self.common)
self.uploads.hide()
self.uploads_in_progress = 0
self.uploads_completed = 0
self.new_upload = False # For scrolling to the bottom of the uploads list
# Upload history
self.history = History(
self.common,
QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/uploads_transparent.png'))),
strings._('gui_no_uploads'),
strings._('gui_uploads')
)
self.history.hide()
# Information about share, and show uploads button
self.info = ReceiveModeInfo(self.common, self)
self.info.show_less()
# Toggle history
self.toggle_history = ToggleHistory(
self.common, self, self.history,
QtGui.QIcon(self.common.get_resource_path('images/uploads_toggle.png')),
QtGui.QIcon(self.common.get_resource_path('images/uploads_toggle_selected.png'))
)
# Receive mode info
self.receive_info = QtWidgets.QLabel(strings._('gui_receive_mode_warning', True))
self.receive_info.setMinimumHeight(80)
self.receive_info.setWordWrap(True)
# Receive mode warning
receive_warning = QtWidgets.QLabel(strings._('gui_receive_mode_warning', True))
receive_warning.setMinimumHeight(80)
receive_warning.setWordWrap(True)
# Top bar
top_bar_layout = QtWidgets.QHBoxLayout()
top_bar_layout.addStretch()
top_bar_layout.addWidget(self.toggle_history)
# Main layout
self.main_layout = QtWidgets.QVBoxLayout()
self.main_layout.addWidget(self.info)
self.main_layout.addWidget(self.receive_info)
self.main_layout.addLayout(top_bar_layout)
self.main_layout.addWidget(receive_warning)
self.main_layout.addWidget(self.primary_action)
self.main_layout.addStretch()
self.main_layout.addWidget(self.min_width_widget)
@ -74,7 +83,7 @@ class ReceiveMode(Mode):
# Wrapper layout
self.wrapper_layout = QtWidgets.QHBoxLayout()
self.wrapper_layout.addLayout(self.main_layout)
self.wrapper_layout.addWidget(self.uploads)
self.wrapper_layout.addWidget(self.history)
self.setLayout(self.wrapper_layout)
def get_stop_server_shutdown_timeout_text(self):
@ -114,7 +123,7 @@ class ReceiveMode(Mode):
Connection to Tor broke.
"""
self.primary_action.hide()
self.info.show_less()
#self.info.show_less()
def handle_request_load(self, event):
"""
@ -126,10 +135,11 @@ class ReceiveMode(Mode):
"""
Handle REQUEST_STARTED event.
"""
self.uploads.add(event["data"]["id"], event["data"]["content_length"])
self.info.update_indicator(True)
self.uploads_in_progress += 1
self.info.update_uploads_in_progress()
item = UploadHistoryItem(self.common, event["data"]["id"], event["data"]["content_length"])
self.history.add(event["data"]["id"], item)
self.toggle_history.update_indicator(True)
self.history.in_progress_count += 1
self.history.update_in_progress()
self.system_tray.showMessage(strings._('systray_upload_started_title', True), strings._('systray_upload_started_message', True))
@ -137,7 +147,10 @@ class ReceiveMode(Mode):
"""
Handle REQUEST_PROGRESS event.
"""
self.uploads.update(event["data"]["id"], event["data"]["progress"])
self.history.update(event["data"]["id"], {
'action': 'progress',
'progress': event["data"]["progress"]
})
def handle_request_close_server(self, event):
"""
@ -150,51 +163,45 @@ class ReceiveMode(Mode):
"""
Handle REQUEST_UPLOAD_FILE_RENAMED event.
"""
self.uploads.rename(event["data"]["id"], event["data"]["old_filename"], event["data"]["new_filename"])
self.history.update(event["data"]["id"], {
'action': 'rename',
'old_filename': event["data"]["old_filename"],
'new_filename': event["data"]["new_filename"]
})
def handle_request_upload_finished(self, event):
"""
Handle REQUEST_UPLOAD_FINISHED event.
"""
self.uploads.finished(event["data"]["id"])
# Update the total 'completed uploads' info
self.uploads_completed += 1
self.info.update_uploads_completed()
# Update the 'in progress uploads' info
self.uploads_in_progress -= 1
self.info.update_uploads_in_progress()
self.history.update(event["data"]["id"], {
'action': 'finished'
})
self.history.completed_count += 1
self.history.in_progress_count -= 1
self.history.update_completed()
self.history.update_in_progress()
def on_reload_settings(self):
"""
We should be ok to re-enable the 'Start Receive Mode' button now.
"""
self.primary_action.show()
self.info.show_more()
#self.info.show_more()
def reset_info_counters(self):
"""
Set the info counters back to zero.
"""
self.uploads_completed = 0
self.uploads_in_progress = 0
self.info.update_uploads_completed()
self.info.update_uploads_in_progress()
self.uploads.reset()
self.history.reset()
def update_primary_action(self):
self.common.log('ReceiveMode', 'update_primary_action')
# Show the info widget when the server is active
if self.server_status.status == self.server_status.STATUS_STARTED:
self.info.show_more()
else:
self.info.show_less()
# Resize window
self.resize_window()
def resize_window(self):
min_width = self.common.min_window_width
if self.uploads.isVisible():
if self.history.isVisible():
min_width += 300
self.adjust_size.emit(min_width)