Skip to content

Quality of extracted shape regions #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danila-schelkov merged 2 commits into from
Feb 5, 2023
Merged

Quality of extracted shape regions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a691ea
feat(rendering): rendering shape regions with original size
danila-schelkov Feb 5, 2023
8ed47bd
refactor: black applied
danila-schelkov Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
try:
from loguru import logger
except ImportError:
raise RuntimeError('Please, install loguru using pip')
raise RuntimeError("Please, install loguru using pip")

from system import clear
from system.lib import config, locale, refill_menu, menu
Expand All @@ -29,14 +29,16 @@ def main():
start_time = time.time()
with logger.catch():
handler()
logger.opt(colors=True).info(f'<green>{locale.done % (time.time() - start_time)}</green>')
logger.opt(colors=True).info(
f"<green>{locale.done % (time.time() - start_time)}</green>"
)
input(locale.to_continue)
clear()


if __name__ == '__main__':
if __name__ == "__main__":
try:
main()
except KeyboardInterrupt:
logger.info('Exit.')
logger.info("Exit.")
pass
13 changes: 8 additions & 5 deletions system/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@

from loguru import logger

is_windows = platform.system() == 'Windows'
null_output = f'{"nul" if is_windows else "/dev/null"} 2>&1'
is_windows = platform.system() == "Windows"
null_output = f"{'nul' if is_windows else '/dev/null'} 2>&1"


def run(command: str, output_path: str = null_output):
return os.system(f'{command} > {output_path}')
return os.system(f"{command} > {output_path}")


if is_windows:
with logger.catch():
try:
import colorama

colorama.init()
except Exception as e:
logger.exception(e)

def clear():
os.system('cls')
os.system("cls")

else:

def clear():
os.system('clear')
os.system("clear")
8 changes: 5 additions & 3 deletions system/bytestream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@


class Reader(io.BytesIO):
def __init__(self, buffer: bytes = b'', endian: Literal['little', 'big'] = 'little'):
def __init__(
self, buffer: bytes = b"", endian: Literal["little", "big"] = "little"
):
super().__init__(buffer)

self.buffer = buffer
Expand Down Expand Up @@ -37,11 +39,11 @@ def read_string(self) -> str:
length = self.read_uchar()
if length != 255:
return self.read(length).decode()
return ''
return ""


class Writer(io.BytesIO):
def __init__(self, endian: Literal['little', 'big'] = 'little'):
def __init__(self, endian: Literal["little", "big"] = "little"):
super().__init__()
self.endian = endian

Expand Down
166 changes: 88 additions & 78 deletions system/lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@

logger.remove()
logger.add(
'./logs/info/{time:YYYY-MM-DD}.log',
format='[{time:HH:mm:ss}] [{level}]: {message}',
"./logs/info/{time:YYYY-MM-DD}.log",
format="[{time:HH:mm:ss}] [{level}]: {message}",
encoding="utf8",
level='INFO'
level="INFO",
)
logger.add(
'./logs/errors/{time:YYYY-MM-DD}.log',
format='[{time:HH:mm:ss}] [{level}]: {message}',
"./logs/errors/{time:YYYY-MM-DD}.log",
format="[{time:HH:mm:ss}] [{level}]: {message}",
backtrace=True,
diagnose=True,
encoding="utf8",
level='ERROR'
level="ERROR",
)
logger.add(sys.stdout, format='<lvl>[{level}] {message}</lvl>', level='INFO')
logger.add(sys.stdout, format="<lvl>[{level}] {message}</lvl>", level="INFO")


locale.load(config.language)
Expand All @@ -36,6 +36,7 @@
try:
# noinspection PyUnresolvedReferences
import requests

del requests

if config.auto_update and time.time() - config.last_update > 60 * 60 * 24 * 7:
Expand All @@ -46,8 +47,8 @@
if config.has_update:
logger.opt(colors=True).info(f'<green>{locale.update_done % ""}</green>')
if Console.question(locale.done_qu):
latest_tag = get_tags('vorono4ka', 'xcoder')[0]
latest_tag_name = latest_tag['name'][1:]
latest_tag = get_tags("vorono4ka", "xcoder")[0]
latest_tag_name = latest_tag["name"][1:]

config.has_update = False
config.version = latest_tag_name
Expand All @@ -66,13 +67,15 @@ def refill_menu():

try:
import sc_compression

del sc_compression

from system.lib.features.csv.compress import compress_csv
from system.lib.features.csv.decompress import decompress_csv

try:
import PIL

del PIL

from system.lib.features.sc.decode import sc_decode
Expand All @@ -81,87 +84,94 @@ def refill_menu():
from system.lib.features.sc.assembly_encode import sc1_encode

sc_category = Menu.Category(0, locale.sc_label)
sc_category.add(Menu.Item(
locale.decode_sc,
locale.decode_sc_description,
sc_decode
))
sc_category.add(Menu.Item(
locale.encode_sc,
locale.encode_sc_description,
sc_encode
))
sc_category.add(Menu.Item(
locale.decode_by_parts,
locale.decode_by_parts_description,
decode_and_cut
))
sc_category.add(Menu.Item(
locale.encode_by_parts,
locale.encode_by_parts_description,
sc1_encode
))
sc_category.add(Menu.Item(
locale.overwrite_by_parts,
locale.overwrite_by_parts_description,
lambda: sc1_encode(True)
))
sc_category.add(
Menu.Item(locale.decode_sc, locale.decode_sc_description, sc_decode)
)
sc_category.add(
Menu.Item(locale.encode_sc, locale.encode_sc_description, sc_encode)
)
sc_category.add(
Menu.Item(
locale.decode_by_parts,
locale.decode_by_parts_description,
decode_and_cut,
)
)
sc_category.add(
Menu.Item(
locale.encode_by_parts,
locale.encode_by_parts_description,
sc1_encode,
)
)
sc_category.add(
Menu.Item(
locale.overwrite_by_parts,
locale.overwrite_by_parts_description,
lambda: sc1_encode(True),
)
)
menu.add_category(sc_category)
except ImportError:
logger.warning(locale.install_to_unlock % 'PILLOW')
logger.warning(locale.install_to_unlock % "PILLOW")

csv_category = Menu.Category(1, locale.csv_label)
csv_category.add(Menu.Item(
locale.decompress_csv,
locale.decompress_csv_description,
decompress_csv
))
csv_category.add(Menu.Item(
locale.compress_csv,
locale.compress_csv_description,
compress_csv
))
csv_category.add(
Menu.Item(
locale.decompress_csv, locale.decompress_csv_description, decompress_csv
)
)
csv_category.add(
Menu.Item(
locale.compress_csv, locale.compress_csv_description, compress_csv
)
)
menu.add_category(csv_category)
except ImportError:
logger.warning(locale.install_to_unlock % 'sc-compression')
logger.warning(locale.install_to_unlock % "sc-compression")

other = Menu.Category(10, locale.other_features_label)
try:
import requests

del requests

other.add(Menu.Item(
locale.check_update,
locale.version % config.version,
check_update
))
other.add(
Menu.Item(
locale.check_update, locale.version % config.version, check_update
)
)
except ImportError:
logger.warning(locale.install_to_unlock % 'requests')

other.add(Menu.Item(
locale.check_for_outdated,
None,
check_for_outdated
))
other.add(Menu.Item(
locale.reinit,
locale.reinit_description,
lambda: (initialize(), refill_menu())
))
other.add(Menu.Item(
locale.change_language,
locale.change_lang_description % config.language,
lambda: (config.change_language(locale.change()), refill_menu())
))
other.add(Menu.Item(
locale.clear_directories,
locale.clean_dirs_description,
lambda: clear_directories() if Console.question(locale.clear_qu) else -1
))
other.add(Menu.Item(
locale.toggle_update_auto_checking,
locale.enabled if config.auto_update else locale.disabled,
lambda: (config.toggle_auto_update(), refill_menu())
))
logger.warning(locale.install_to_unlock % "requests")

other.add(Menu.Item(locale.check_for_outdated, None, check_for_outdated))
other.add(
Menu.Item(
locale.reinit,
locale.reinit_description,
lambda: (initialize(), refill_menu()),
)
)
other.add(
Menu.Item(
locale.change_language,
locale.change_lang_description % config.language,
lambda: (config.change_language(locale.change()), refill_menu()),
)
)
other.add(
Menu.Item(
locale.clear_directories,
locale.clean_dirs_description,
lambda: clear_directories() if Console.question(locale.clear_qu) else -1,
)
)
other.add(
Menu.Item(
locale.toggle_update_auto_checking,
locale.enabled if config.auto_update else locale.disabled,
lambda: (config.toggle_auto_update(), refill_menu()),
)
)
other.add(Menu.Item(locale.exit, None, lambda: (clear(), exit())))
menu.add_category(other)
24 changes: 12 additions & 12 deletions system/lib/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@


class Config:
DEFAULT_LANGUAGE = 'en-EU'
DEFAULT_LANGUAGE = "en-EU"

config_path = './system/config.json'
config_path = "./system/config.json"
inited: bool

def __init__(self):
self.config_items = (
'initialized',
'version',
'language',
'has_update',
'last_update',
'auto_update',
"initialized",
"version",
"language",
"has_update",
"last_update",
"auto_update",
)

self.initialized: bool = False
Expand All @@ -41,10 +41,10 @@ def load(self):
setattr(self, key, value)

def dump(self):
json.dump({
item: getattr(self, item)
for item in self.config_items
}, open(self.config_path, 'w'))
json.dump(
{item: getattr(self, item) for item in self.config_items},
open(self.config_path, "w"),
)


config = Config()
Loading