RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed what settings are being extracted from logs

Browse Source
This commit is contained in:
13xforever
2018-02-25 21:28:16 +05:00
parent 360ae6617e
commit 445221d8dc
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -5,9 +5,9 @@
"name": "Python",
"type": "python",
"request": "launch",
"stopOnEntry": true,
"stopOnEntry": false,
"pythonPath": "${config:python.pythonPath}",
"program": "${file}",
"program": "${workspaceFolder}/bot.py",
"args": [
"put_bot_user_token_here"
],

2
api/response.py
View File

@@ -79,7 +79,7 @@ class ApiResponse(object):
results_string_part += "```"
results_string += results_string_part
footer_string = "Retrieved from: *{request_url}* in {milliseconds} milliseconds!"
footer_string = "Retrieved from: *<{request_url}>* in {milliseconds} milliseconds!"
if return_codes[self.code]["display_results"]:
return "{}{}{}{}{}".format(
header_string + '\n' + return_codes[self.code]["info"],

2
bot.py
View File

@@ -34,7 +34,7 @@ file_handlers = (
'handler': stream_text_log
},
{
'ext': '.gz',
'ext': '.log.gz',
'handler': stream_gzip_decompress
},
# {

31
phases.py → log_analyzer.py
View File

@@ -78,11 +78,10 @@ class LogAnalyzer(object):
'functions: (?P<hook_static_functions>.*?)\n.*',
flags=re.DOTALL | re.MULTILINE),
'string_format':
'PPU Decoder: {ppu_decoder:>21s} | PPU Threads: {ppu_threads}\n'
'PPU Decoder: {ppu_decoder:>21s} | Thread Scheduler: {thread_scheduler}\n'
'SPU Decoder: {spu_decoder:>21s} | SPU Threads: {spu_threads}\n'
'SPU Lower Thread Priority: {spu_lower_thread_priority:>7s} | SPU Delay Penalty: {spu_delay_penalty}\n'
'SPU Loop Detection: {spu_loop_detection:>14s} | Hook Static Functions: {hook_static_functions}\n'
'Thread Scheduler: {thread_scheduler:>16s} | Lib Loader: {lib_loader}\n\n',
'SPU Lower Thread Priority: {spu_lower_thread_priority:>7s} | Hook Static Functions: {hook_static_functions}\n'
'SPU Loop Detection: {spu_loop_detection:>14s} | Lib Loader: {lib_loader}\n\n',
'function': get_libraries
},
{
@@ -95,15 +94,20 @@ class LogAnalyzer(object):
'end_trigger': 'Audio:',
'regex': re.compile('Renderer: (?P<renderer>.*?)\n.*?'
'Resolution: (?P<resolution>.*?)\n.*?'
'limit: (?P<frame_limit>.*?)\n.*?'
'Color Buffers: (?P<write_color_buffers>.*?)\n.*?'
'Frame limit: (?P<frame_limit>.*?)\n.*?'
'Write Color Buffers: (?P<write_color_buffers>.*?)\n.*?'
'VSync: (?P<vsync>.*?)\n.*?'
'Rendering Mode: (?P<strict_rendering_mode>.*?)\n.*?',
'Use GPU texture scaling: (?P<gpu_texture_scaling>.*?)\n.*?'
'Strict Rendering Mode: (?P<strict_rendering_mode>.*?)\n.*?'
'Resolution Scale: (?P<resolution_scale>.*?)\n.*?'
'Anisotropic Filter Override: (?P<af_override>.*?)\n.*?'
'Minimum Scalable Dimension: (?P<texture_scale_threshold>.*?)\n.*?',
flags=re.DOTALL | re.MULTILINE),
'string_format':
'Renderer: {renderer:>24s} | Resolution: {resolution}\n'
'Frame Limit: {frame_limit:>21s} | Write Color Buffers: {write_color_buffers}\n'
'VSync: {vsync:>27s} | Strict Rendering Mode: {strict_rendering_mode}\n'
'Renderer: {renderer:>24s} | Frame Limit: {frame_limit}\n'
'Resolution: {resolution:>22s} | Write Color Buffers: {write_color_buffers}\n'
'Resolution Scale: {resolution_scale:>16s} | Use GPU texture scaling: {gpu_texture_scaling}\n'
'Resolution Scale Threshold: {texture_scale_threshold:>6s} | Anisotropic Filter Override: {af_override}\n'
},
{
'end_trigger': 'Log:',
@@ -139,9 +143,10 @@ class LogAnalyzer(object):
current_phase = self.phase[self.phase_index]
if current_phase['regex'] is not None and current_phase['string_format'] is not None:
try:
self.report += current_phase['string_format'].format(
**re.search(current_phase['regex'], self.buffer).groupdict()
)
group_args = re.search(current_phase['regex'], self.buffer).groupdict()
if 'strict_rendering_mode' in group_args and group_args['strict_rendering_mode'] == 'true':
group_args['resolution_scale'] = "Strict Mode"
self.report += current_phase['string_format'].format(**group_args)
except AttributeError as ae:
print("Regex failed!")
return self.ERROR_FAIL