Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved newline config to self.settings

Browse Source
This commit is contained in:
computergeek125 2024-06-17 22:06:09 -05:00
parent e0d2446f95
commit 4fefae56af
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/classes/shared/server.py
View File

@ -161,11 +161,10 @@ class ServerInstance:
stats: Stats stats: Stats
stats_helper: HelperServerStats stats_helper: HelperServerStats
def __init__(self, server_id, helper, management_helper, stats, file_helper, newline=os.linesep): def __init__(self, server_id, helper, management_helper, stats, file_helper):
self.helper = helper self.helper = helper
self.file_helper = file_helper self.file_helper = file_helper
self.management_helper = management_helper self.management_helper = management_helper
self.newline = newline
# holders for our process # holders for our process
self.process = None self.process = None
self.line = False self.line = False
@ -232,6 +231,7 @@ class ServerInstance:
def reload_server_settings(self): def reload_server_settings(self):
server_data = HelperServers.get_server_data_by_id(self.server_id) server_data = HelperServers.get_server_data_by_id(self.server_id)
self.settings = server_data self.settings = server_data
self.settings['newline'] = self.settings.get('newline', os.linesep)
def do_server_setup(self, server_data_obj): def do_server_setup(self, server_data_obj):
server_id = server_data_obj["server_id"] server_id = server_data_obj["server_id"]
@ -579,7 +579,7 @@ class ServerInstance:
self.stats_helper.finish_import() self.stats_helper.finish_import()
return False return False
out_buf = ServerOutBuf(self.helper, self.process, self.server_id, newline=self.newline) out_buf = ServerOutBuf(self.helper, self.process, self.server_id, newline=self.settings['newline'])
logger.debug(f"Starting virtual terminal listener for server {self.name}") logger.debug(f"Starting virtual terminal listener for server {self.name}")
threading.Thread( threading.Thread(
@ -986,7 +986,7 @@ class ServerInstance:
logger.debug(f"Sending command {command} to server") logger.debug(f"Sending command {command} to server")
# send it # send it
self.process.stdin.write(f"{command}{self.newline}".encode("utf-8")) self.process.stdin.write(f"{command}{self.settings['newline']}".encode("utf-8"))
self.process.stdin.flush() self.process.stdin.flush()
return True return True