DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

ruff update

Browse Source
This commit is contained in:
shenjack 2023-02-25 09:18:41 +08:00
parent 6d9b2282a3
commit 61059f7ab4
12 changed files with 187 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -7,6 +7,9 @@ trytry/
#pdm files
__pypackages__
# ruff
.ruff_cache
# nuitka build
build/
.github/workflows/env.ps1

2
DR.py
View File

@ -42,7 +42,7 @@ def main() -> None:
print(hi) # hi！
from Difficult_Rocket.exception import TestError
from Difficult_Rocket.crash import crash
from Difficult_Rocket import crash
from Difficult_Rocket import DR_option
try:
from libs import pyglet # 导入pyglet

2
Difficult_Rocket/__init__.py
View File

@ -16,7 +16,7 @@ import contextlib
import sys
import warnings
import traceback
from typing import List, Dict, Union, Optional
from typing import Optional
from Difficult_Rocket.api.types import Options

2
Difficult_Rocket/api/__init__.py
View File

@ -12,6 +12,6 @@ gitee: @shenjackyuanjie
"""
# 单独导入的(或者就这一个有用的)
from .delivery import Delivery
# from .delivery import Delivery
# lazy之后之前全部导入的(太多了写不动__all__了

6
Difficult_Rocket/client/fps/fps_log.py
View File

@ -13,7 +13,7 @@ gitee: @shenjackyuanjie
import statistics
from typing import Union
from typing import Union, List
from decimal import Decimal
@ -25,8 +25,8 @@ class FpsLogger:
self.count = count
self._fps = stable_fps
self.middle_fps = stable_fps
self.fps_list = [stable_fps] # type: list[Union[int, float]]
self.get_fps_list = [stable_fps] # type: list[Union[int, float]]
self.fps_list: List[Union[int, float]] = [stable_fps]
self.get_fps_list: List[Union[int, float]] = [stable_fps]
self._max_fps = stable_fps
self._min_fps = stable_fps

6
Difficult_Rocket/client/guis/widgets.py
View File

@ -14,7 +14,7 @@ gitee: @shenjackyuanjie
from typing import Optional, Union, Tuple
# from libs import pyglet
from pyglet import font
# from pyglet import font
from pyglet.text import Label, HTMLLabel
# from pyglet.window import key
from pyglet.gui import widgets
@ -23,14 +23,14 @@ from pyglet.shapes import Rectangle
# from pyglet.image import AbstractImage
from pyglet.graphics import Batch, Group
from pyglet.text.caret import Caret
from pyglet.text.document import FormattedDocument, UnformattedDocument
from pyglet.text.document import UnformattedDocument
from pyglet.text.layout import IncrementalTextLayout
# from libs import pyperclip
# from libs.pyperclip import paste
from Difficult_Rocket.api.types import FontData, Fonts
from Difficult_Rocket.client.guis.format import html
# from Difficult_Rocket.client.guis.format import html
from Difficult_Rocket import DR_option
__all__ = ['InputBox']

2
Difficult_Rocket/client/render/sr1_ship.py
View File

@ -8,7 +8,7 @@ import time
import contextlib
from xml.etree import ElementTree
from xml.etree.ElementTree import Element
from typing import List, TYPE_CHECKING, Union, Dict, Optional, Callable, Generator
from typing import List, TYPE_CHECKING, Union, Dict, Optional, Generator
# third party package
from defusedxml.ElementTree import parse

4
Difficult_Rocket/client/screen.py
View File

@ -12,9 +12,9 @@ from pyglet.clock import get_frequency
# Difficult Rocket function
from Difficult_Rocket.api.types import Fonts
from Difficult_Rocket.utils import translate
# from Difficult_Rocket.utils import translate
from Difficult_Rocket.api.screen import BaseScreen
from Difficult_Rocket.command.tree import CommandTree
# from Difficult_Rocket.command.tree import CommandTree
if typing.TYPE_CHECKING:
from Difficult_Rocket.client import ClientWindow

149
Difficult_Rocket/crash/__init__.py
View File

@ -11,8 +11,149 @@ github: @shenjackyuanjie
gitee: @shenjackyuanjie
"""
from .crash import *
import io
import os
import time
import platform
import traceback
import threading
import multiprocessing
from pathlib import Path
from typing import Optional, TextIO
__all__ = ['all_thread',
'all_process',
'crash']
# import psutil
# for more system info
# where the crash report from
# this can't be crash , or the game will really crash!
import Difficult_Rocket
Head_message = """# ----- Difficult Rocket Crash Report -----
## Time: {now_time}
## Traceback
"""
Run_message = """\n## Difficult Rocket running status\n"""
DR_configs = """\n### game config\n"""
Process_message = """\n## Process info\n"""
Thread_message = """\n## Thread info\n"""
Python_message = """\n## Python info\n"""
System_message = """\n## System info\n"""
all_thread = [threading.main_thread()]
all_process = [multiprocessing.current_process()]
def crash_info_handler(info: str = None) -> str:
if not info:
info = traceback.format_exc().replace('<', '< ')
format_info = f"<pre>\n{info}</pre>\n"
format_info.replace('<module>', '< module>')
return format_info
def markdown_line_handler(string: Optional[str or bool or int or float], code: bool = False, level: int = 1,
end: str = '\n') -> str:
lvl = '- ' * level
f_string = string
if code:
f_string = f'`{f_string}`'
return f'{lvl}{f_string}{end}'
def to_code(string: str):
return f'`{string}`'
def write_markdown_tablet(crash_file: TextIO, tablet: list) -> None:
a_len = max(tablet[1], 6)
b_len = max(tablet[2], 5)
c_len = max(tablet[3], 10)
crash_file.write(f'\n| Option{" " * (a_len - 4)} | Value{" " * (b_len - 3)} | Value Type{" " * (c_len - 8)} |\n')
crash_file.write(f'|:{"-" * (a_len + 3)}|:{"-" * (b_len + 3)}|:{"-" * (c_len + 3)}|\n')
for a, b, c in tablet[0]:
b, c = str(b), str(c)
crash_file.write(
f'| `{a}`{" " * (a_len - len(a))} | `{b}`{" " * (b_len - len(b))} | `{c}`{" " * (c_len - len(c))} |\n')
def create_crash_report(info: str = None) -> None:
crash_info = crash_info_handler(info)
if 'crash_report' not in os.listdir('./'):
os.mkdir('./crash_report')
date_time = time.strftime('%Y-%m-%d %H-%M-%S', time.gmtime(time.time()))
filename = f'crash-{date_time}.md'
cache_stream = io.StringIO()
try:
write_cache(cache_stream, crash_info)
finally:
get_cache = cache_stream.getvalue()
cache_stream.close()
with open(f'./crash_report/{filename}', 'w+', encoding='utf-8') as crash_file:
crash_file.write(get_cache)
def write_cache(cache_stream, crash_info):
# 开头信息
cache_stream.write(Head_message.format(now_time=time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(time.time()))))
# 崩溃信息
cache_stream.write(crash_info)
# 运行状态信息
from Difficult_Rocket import DR_option, DR_runtime
cache_stream.write(Run_message)
cache_stream.write(markdown_line_handler(f'DR Version: {Difficult_Rocket.game_version}', level=1))
cache_stream.write(markdown_line_handler(f'DR language: {DR_runtime.language}', level=1))
cache_stream.write(markdown_line_handler(f'Running Dir: {Path(os.curdir).resolve()}', level=1))
write_options(DR_runtime, cache_stream, DR_configs)
write_options(DR_option, cache_stream, Process_message)
for process in all_process:
process: multiprocessing.Process
cache_stream.write(markdown_line_handler(f'{process.name}', code=True))
cache_stream.write(markdown_line_handler(f'Ident: {process.ident}', level=2))
cache_stream.write(markdown_line_handler(f'Running: {process.is_alive()}', level=2))
# 运行线程信息
cache_stream.write(Thread_message)
for thread in all_thread:
thread: threading.Thread
cache_stream.write(markdown_line_handler(f'{thread.name}', code=True))
cache_stream.write(markdown_line_handler(f'order: {all_thread.index(thread)}', level=2))
cache_stream.write(markdown_line_handler(f'Ident: {thread.ident}', level=2))
cache_stream.write(markdown_line_handler(f'Daemon: {thread.daemon}', level=2))
cache_stream.write(markdown_line_handler(f'Running: {thread.is_alive()}', level=2))
# Python 信息
cache_stream.write(Python_message)
cache_stream.write(markdown_line_handler(f'Version: {to_code(platform.python_version())}', level=1))
cache_stream.write(markdown_line_handler(f'Branch: {to_code(platform.python_branch())}', level=1))
cache_stream.write(markdown_line_handler(f'Implementation: {to_code(platform.python_implementation())}', level=1))
cache_stream.write(markdown_line_handler(f'Compiler: {to_code(platform.python_compiler())}', level=1))
# 电脑系统信息
cache_stream.write(System_message)
cache_stream.write(markdown_line_handler(f'System: {to_code(platform.platform())}', level=1))
cache_stream.write(markdown_line_handler(f'Computer name: {to_code(platform.node())}', level=1))
cache_stream.write(markdown_line_handler(f'machine: {to_code(platform.machine())}', level=1))
cache_stream.write(markdown_line_handler(f'processor: {to_code(platform.processor())}', level=1))
cache_stream.write(markdown_line_handler(f'release: {to_code(platform.release())}', level=1))
cache_stream.write(markdown_line_handler(f'version: {to_code(platform.version())}', level=1))
def write_options(arg0, cache_stream, arg2):
result = arg0.option_with_len()
write_markdown_tablet(crash_file=cache_stream, tablet=result)
# # DR 的游戏设置
cache_stream.write(arg2)
if __name__ == '__main__':
os.chdir('../../')
try:
raise FileNotFoundError('abc')
except FileNotFoundError:
create_crash_report()

159
Difficult_Rocket/crash/crash.py
View File

@ -1,159 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
"""
writen by shenjackyuanjie
mail: 3695888@qq.com
github: @shenjackyuanjie
gitee: @shenjackyuanjie
"""
import io
import os
import time
import platform
import traceback
import threading
import multiprocessing
from pathlib import Path
from typing import Optional, TextIO
# import psutil
# for more system info
# where the crash report from
# this can't be crash , or the game will really crash!
import Difficult_Rocket
Head_message = """# ----- Difficult Rocket Crash Report -----
## Time: {now_time}
## Traceback
"""
Run_message = """\n## Difficult Rocket running status\n"""
DR_configs = """\n### game config\n"""
Process_message = """\n## Process info\n"""
Thread_message = """\n## Thread info\n"""
Python_message = """\n## Python info\n"""
System_message = """\n## System info\n"""
all_thread = [threading.main_thread()]
all_process = [multiprocessing.current_process()]
def crash_info_handler(info: str = None) -> str:
if not info:
info = traceback.format_exc().replace('<', '< ')
format_info = f"<pre>\n{info}</pre>\n"
format_info.replace('<module>', '< module>')
return format_info
def markdown_line_handler(string: Optional[str or bool or int or float], code: bool = False, level: int = 1,
end: str = '\n') -> str:
lvl = '- ' * level
f_string = string
if code:
f_string = f'`{f_string}`'
return f'{lvl}{f_string}{end}'
def to_code(string: str):
return f'`{string}`'
def write_markdown_tablet(crash_file: TextIO, tablet: list) -> None:
a_len = max(tablet[1], 6)
b_len = max(tablet[2], 5)
c_len = max(tablet[3], 10)
crash_file.write(f'\n| Option{" " * (a_len - 4)} | Value{" " * (b_len - 3)} | Value Type{" " * (c_len - 8)} |\n')
crash_file.write(f'|:{"-" * (a_len + 3)}|:{"-" * (b_len + 3)}|:{"-" * (c_len + 3)}|\n')
for a, b, c in tablet[0]:
b, c = str(b), str(c)
crash_file.write(
f'| `{a}`{" " * (a_len - len(a))} | `{b}`{" " * (b_len - len(b))} | `{c}`{" " * (c_len - len(c))} |\n')
def create_crash_report(info: str = None) -> None:
crash_info = crash_info_handler(info)
if 'crash_report' not in os.listdir('./'):
os.mkdir('./crash_report')
date_time = time.strftime('%Y-%m-%d %H-%M-%S', time.gmtime(time.time()))
filename = f'crash-{date_time}.md'
cache_stream = io.StringIO()
try:
write_cache(cache_stream, crash_info)
finally:
get_cache = cache_stream.getvalue()
cache_stream.close()
with open(f'./crash_report/{filename}', 'w+', encoding='utf-8') as crash_file:
crash_file.write(get_cache)
def write_cache(cache_stream, crash_info):
# 开头信息
cache_stream.write(Head_message.format(now_time=time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(time.time()))))
# 崩溃信息
cache_stream.write(crash_info)
# 运行状态信息
from Difficult_Rocket import DR_option, DR_runtime
cache_stream.write(Run_message)
cache_stream.write(markdown_line_handler(f'DR Version: {Difficult_Rocket.game_version}', level=1))
cache_stream.write(markdown_line_handler(f'DR language: {DR_runtime.language}', level=1))
cache_stream.write(markdown_line_handler(f'Running Dir: {Path(os.curdir).resolve()}', level=1))
write_options(DR_runtime, cache_stream, DR_configs)
write_options(DR_option, cache_stream, Process_message)
for process in all_process:
process: multiprocessing.Process
cache_stream.write(markdown_line_handler(f'{process.name}', code=True))
cache_stream.write(markdown_line_handler(f'Ident: {process.ident}', level=2))
cache_stream.write(markdown_line_handler(f'Running: {process.is_alive()}', level=2))
# 运行线程信息
cache_stream.write(Thread_message)
for thread in all_thread:
thread: threading.Thread
cache_stream.write(markdown_line_handler(f'{thread.name}', code=True))
cache_stream.write(markdown_line_handler(f'order: {all_thread.index(thread)}', level=2))
cache_stream.write(markdown_line_handler(f'Ident: {thread.ident}', level=2))
cache_stream.write(markdown_line_handler(f'Daemon: {thread.daemon}', level=2))
cache_stream.write(markdown_line_handler(f'Running: {thread.is_alive()}', level=2))
# Python 信息
cache_stream.write(Python_message)
cache_stream.write(markdown_line_handler(f'Version: {to_code(platform.python_version())}', level=1))
cache_stream.write(markdown_line_handler(f'Branch: {to_code(platform.python_branch())}', level=1))
cache_stream.write(markdown_line_handler(f'Implementation: {to_code(platform.python_implementation())}', level=1))
cache_stream.write(markdown_line_handler(f'Compiler: {to_code(platform.python_compiler())}', level=1))
# 电脑系统信息
cache_stream.write(System_message)
cache_stream.write(markdown_line_handler(f'System: {to_code(platform.platform())}', level=1))
cache_stream.write(markdown_line_handler(f'Computer name: {to_code(platform.node())}', level=1))
cache_stream.write(markdown_line_handler(f'machine: {to_code(platform.machine())}', level=1))
cache_stream.write(markdown_line_handler(f'processor: {to_code(platform.processor())}', level=1))
cache_stream.write(markdown_line_handler(f'release: {to_code(platform.release())}', level=1))
cache_stream.write(markdown_line_handler(f'version: {to_code(platform.version())}', level=1))
def write_options(arg0, cache_stream, arg2):
result = arg0.option_with_len()
write_markdown_tablet(crash_file=cache_stream, tablet=result)
# # DR 的游戏设置
cache_stream.write(arg2)
if __name__ == '__main__':
os.chdir('../../')
try:
raise FileNotFoundError('abc')
except FileNotFoundError:
create_crash_report()

7
libs/Difficult_Rocket_rs/src/src/sr1_data.rs
View File

@ -97,8 +97,11 @@ pub mod part_list {
#[pyo3(name = "part_list_read_test", signature = (file_name = "./configs/PartList.xml".to_string()))]
pub fn read_part_list_py(_py: Python, file_name: Option<String>) -> PyResult<()> {
let file_name = file_name.unwrap_or("./configs/PartList.xml".to_string());
// let parts = read_part_list(file_name);
read_part_list(file_name);
let _parts = read_part_list(file_name);
if let Some(parts) = _parts {
println!("{:?}", parts)
}
// read_part_list(file_name);
Ok(())
}

22
pyproject.toml
View File

@ -34,3 +34,25 @@ build = [
"ordered-set>=4.1.0",
"imageio>=2.25.0",
]
[tool.ruff]
target-version = "py38"
line-length = 150
src = [
"Difficult_Rocket",
"libs/Difficult_Rocket"
]
exclude = [
'libs/pyglet',
'libs/pyperclicp',
'libs/MCDR/serializer.py'
]
format = "grouped"
[tool.ruff.per-file-ignores]
"Difficult_Rocket/api/exception/*.py" = [ "F405", "F403" ]