NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-31 21:06:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove-world' into 'dev'

Browse Source 
Remove minecraft specific naming/stats

See merge request crafty-controller/crafty-commander!177
This commit is contained in:
Andrew 2022-03-02 02:47:55 +00:00
commit c3e23358a0
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/classes/minecraft/stats.py
View File

@ -111,21 +111,15 @@ class Stats:
return disk_data return disk_data
@staticmethod @staticmethod
def get_world_size(world_path): def get_world_size(server_path):
total_size = 0 total_size = 0
# do a scan of the directories in the server path. # do a scan of the directories in the server path.
for root, dirs, _files in os.walk(world_path, topdown=False): for root, dirs, _files in os.walk(server_path, topdown=False):
# for each directory we find # for each directory we find
for name in dirs: for name in dirs:
# if the directory name is "region"
if str(name) == "region":
# log it!
logger.debug("Path %s is called region. Getting directory size", os.path.join(root, name))
# get this directory size, and add it to the total we have running. # get this directory size, and add it to the total we have running.
total_size += helper.get_dir_size(os.path.join(root, name)) total_size += helper.get_dir_size(os.path.join(root, name))
@ -229,12 +223,10 @@ class Stats:
# get our server object, settings and data dictionaries # get our server object, settings and data dictionaries
server_obj = s.get('server_obj', None) server_obj = s.get('server_obj', None)
server_obj.reload_server_settings() server_obj.reload_server_settings()
server_settings = s.get('server_settings', {})
server_data = self.controller.get_server_data(server_id)
# world data # world data
world_name = server_settings.get('level-name', 'Unknown') server_name = server['server_name']
world_path = os.path.join(server_data.get('path', None), world_name) server_path = server['path']
# process stats # process stats
p_stats = self._get_process_stats(server_obj.process) p_stats = self._get_process_stats(server_obj.process)
@ -269,8 +261,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': ping_data.get("online", False), 'online': ping_data.get("online", False),
@ -287,8 +279,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': False, 'online': False,
@ -337,12 +329,10 @@ class Stats:
# get our server object, settings and data dictionaries # get our server object, settings and data dictionaries
server_obj = self.controller.get_server_obj(server_id) server_obj = self.controller.get_server_obj(server_id)
server_obj.reload_server_settings() server_obj.reload_server_settings()
server_settings = self.controller.get_server_settings(server_id)
server_data = self.controller.get_server_data(server_id)
# world data # world data
world_name = server_settings.get('level-name', 'Unknown') server_name = server_dt['server_name']
world_path = os.path.join(server_data.get('path', None), world_name) server_path = server_dt['path']
# process stats # process stats
p_stats = self._get_process_stats(server_obj.process) p_stats = self._get_process_stats(server_obj.process)
@ -377,8 +367,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': ping_data.get("online", False), 'online': ping_data.get("online", False),
@ -406,8 +396,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': ping_data['online'], 'online': ping_data['online'],
@ -425,8 +415,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': False, 'online': False,
@ -444,8 +434,8 @@ class Stats:
'cpu': p_stats.get('cpu_usage', 0), 'cpu': p_stats.get('cpu_usage', 0),
'mem': p_stats.get('memory_usage', 0), 'mem': p_stats.get('memory_usage', 0),
"mem_percent": p_stats.get('mem_percentage', 0), "mem_percent": p_stats.get('mem_percentage', 0),
'world_name': world_name, 'world_name': server_name,
'world_size': self.get_world_size(world_path), 'world_size': self.get_world_size(server_path),
'server_port': server_port, 'server_port': server_port,
'int_ping_results': int_data, 'int_ping_results': int_data,
'online': False, 'online': False,

2
app/translations/en_EN.json
View File

@ -89,7 +89,7 @@
"allServers": "All Servers", "allServers": "All Servers",
"server": "Server", "server": "Server",
"actions": "Actions", "actions": "Actions",
"world": "World", "size": "Server Dir Size",
"motd": "MOTD", "motd": "MOTD",
"version": "Version", "version": "Version",
"status": "Status", "status": "Status",