Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-31 12:14:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move the 'supports_file_requests' attribute into the actual modes rather than the Web class

Browse source
This commit is contained in:
Miguel Jacq 2021-05-11 09:25:22 +10:00
parent 9aedb0cc00
commit aa7a6e321b
4 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/onionshare_cli/web/chat_mode.py
View file

@ -39,6 +39,12 @@ class ChatModeWeb:
# This tracks the history id # This tracks the history id
self.cur_history_id = 0 self.cur_history_id = 0
# Whether or not we can send REQUEST_INDIVIDUAL_FILE_STARTED
# and maybe other events when requests come in to this mode
# Chat mode has no concept of individual file requests that
# turn into history widgets in the GUI, so set it to False
self.supports_file_requests = False
self.define_routes() self.define_routes()
def define_routes(self): def define_routes(self):

4
cli/onionshare_cli/web/receive_mode.py
View file

@ -64,6 +64,10 @@ class ReceiveModeWeb:
# This tracks the history id # This tracks the history id
self.cur_history_id = 0 self.cur_history_id = 0
# Whether or not we can send REQUEST_INDIVIDUAL_FILE_STARTED
# and maybe other events when requests come in to this mode
self.supports_file_requests = True
self.define_routes() self.define_routes()
def define_routes(self): def define_routes(self):

4
cli/onionshare_cli/web/send_base_mode.py
View file

@ -52,6 +52,10 @@ class SendBaseModeWeb:
# This tracks the history id # This tracks the history id
self.cur_history_id = 0 self.cur_history_id = 0
# Whether or not we can send REQUEST_INDIVIDUAL_FILE_STARTED
# and maybe other events when requests come in to this mode
self.supports_file_requests = True
self.define_routes() self.define_routes()
self.init() self.init()

13
cli/onionshare_cli/web/web.py
View file

@ -152,7 +152,6 @@ class Web:
self.receive_mode = None self.receive_mode = None
self.website_mode = None self.website_mode = None
self.chat_mode = None self.chat_mode = None
self.mode_supports_file_requests = True
if self.mode == "share": if self.mode == "share":
self.share_mode = ShareModeWeb(self.common, self) self.share_mode = ShareModeWeb(self.common, self)
elif self.mode == "receive": elif self.mode == "receive":
@ -163,9 +162,6 @@ class Web:
self.socketio = SocketIO() self.socketio = SocketIO()
self.socketio.init_app(self.app) self.socketio.init_app(self.app)
self.chat_mode = ChatModeWeb(self.common, self) self.chat_mode = ChatModeWeb(self.common, self)
# Chat mode has no concept of individual file requests that
# turn into history widgets in the GUI
self.mode_supports_file_requests = False
self.cleanup_filenames = [] self.cleanup_filenames = []
@ -298,7 +294,8 @@ class Web:
return self.add_security_headers(r) return self.add_security_headers(r)
def error404(self, history_id): def error404(self, history_id):
if self.mode_supports_file_requests: mode = self.get_mode()
if mode.supports_file_requests:
self.add_request( self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED, self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path, request.path,
@ -312,7 +309,8 @@ class Web:
return self.add_security_headers(r) return self.add_security_headers(r)
def error405(self, history_id): def error405(self, history_id):
if self.mode_supports_file_requests: mode = self.get_mode()
if mode.supports_file_requests:
self.add_request( self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED, self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path, request.path,
@ -326,7 +324,8 @@ class Web:
return self.add_security_headers(r) return self.add_security_headers(r)
def error500(self, history_id): def error500(self, history_id):
if self.mode_supports_file_requests: mode = self.get_mode()
if mode.supports_file_requests:
self.add_request( self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED, self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path, request.path,