jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-26 01:03:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(extension): fix typing

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-08-25 18:55:00 +02:00
parent 69dbf68760
commit d201f54cee
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py
View File

@@ -12,7 +12,8 @@ import csv
import shutil import shutil
import textwrap import textwrap
import urllib.request import urllib.request
from typing import List, Type, TypedDict, Union from dataclasses import dataclass
from typing import Any, Dict, List, Type, Union
from components.klipper.klipper import Klipper from components.klipper.klipper import Klipper
from components.klipper.klipper_dialogs import ( from components.klipper.klipper_dialogs import (
@@ -31,7 +32,8 @@ from utils.input_utils import get_selection_input
from utils.instance_utils import get_instances from utils.instance_utils import get_instances
class ThemeData(TypedDict): @dataclass
class ThemeData:
name: str name: str
short_note: str short_note: str
author: str author: str
@@ -111,27 +113,36 @@ class MainsailThemeInstallMenu(BaseMenu):
""" """
)[1:] )[1:]
for i, theme in enumerate(self.themes): for i, theme in enumerate(self.themes):
i = f" {i}" if i < 10 else f"{i}" j: str = f" {i}" if i < 10 else f"{i}"
row = f"{i}) [{theme.get('name')}]" row: str = f"{j}) [{theme.name}]"
menu += f"| {row:<53} |\n" menu += f"| {row:<53} |\n"
print(menu, end="") print(menu, end="")
def load_themes(self) -> List[ThemeData]: def load_themes(self) -> List[ThemeData]:
with urllib.request.urlopen(self.THEMES_URL) as response: with urllib.request.urlopen(self.THEMES_URL) as response:
themes: List[ThemeData] = [] themes: List[ThemeData] = []
csv_data: str = response.read().decode().splitlines() content: str = response.read().decode()
csv_reader = csv.DictReader(csv_data, delimiter=",") csv_data: List[str] = content.splitlines()
fieldnames = ["name", "short_note", "author", "repo"]
csv_reader = csv.DictReader(csv_data, fieldnames=fieldnames, delimiter=",")
next(csv_reader) # skip the header of the csv file
for row in csv_reader: for row in csv_reader:
row: ThemeData = row row: Dict[str, str] # type: ignore
themes.append(row) theme: ThemeData = ThemeData(**row)
themes.append(theme)
return themes return themes
def install_theme(self, **kwargs): def install_theme(self, **kwargs: Any):
index = int(kwargs.get("opt_index")) opt_index: str | None = kwargs.get("opt_index", None)
if not opt_index:
raise ValueError("No option index provided")
index: int = int(opt_index)
theme_data: ThemeData = self.themes[index] theme_data: ThemeData = self.themes[index]
theme_author: str = theme_data.get("author") theme_author: str = theme_data.author
theme_repo: str = theme_data.get("repo") theme_repo: str = theme_data.repo
theme_repo_url: str = f"https://github.com/{theme_author}/{theme_repo}" theme_repo_url: str = f"https://github.com/{theme_author}/{theme_repo}"
print_instance_overview( print_instance_overview(
@@ -149,9 +160,9 @@ class MainsailThemeInstallMenu(BaseMenu):
for printer in printer_list: for printer in printer_list:
git_clone_wrapper(theme_repo_url, printer.cfg_dir.joinpath(".theme")) git_clone_wrapper(theme_repo_url, printer.cfg_dir.joinpath(".theme"))
if len(theme_data.get("short_note", "")) > 1: if len(theme_data.short_note) > 1:
Logger.print_warn("Info from the creator:", prefix=False, start="\n") Logger.print_warn("Info from the creator:", prefix=False, start="\n")
Logger.print_info(theme_data.get("short_note"), prefix=False, end="\n\n") Logger.print_info(theme_data.short_note, prefix=False, end="\n\n")
def get_printer_selection( def get_printer_selection(