compact generator.py build methods

This commit is contained in:
ful1e5
2021-04-20 17:16:34 +05:30
parent 1ea48738d7
commit 4dc23265f5
+22 -41
View File
@@ -32,13 +32,9 @@ def xbuild(config: Dict[str, Dict[str, Any]], x_out_dir: Path, info: Info) -> No
""" """
for _, item in config.items(): for _, item in config.items():
png = item["png"] with CursorAlias.from_bitmap(item["png"], item["hotspot"]) as alias:
hotspot = item["hotspot"] x_cfg = alias.create(item["x_sizes"], item["delay"])
x_sizes = item["x_sizes"]
delay = item["delay"]
with CursorAlias.from_bitmap(png, hotspot) as alias:
x_cfg = alias.create(x_sizes, delay)
print(f"Building '{x_cfg.stem}' XCursor...") print(f"Building '{x_cfg.stem}' XCursor...")
XCursor.create(x_cfg, x_out_dir) XCursor.create(x_cfg, x_out_dir)
@@ -62,24 +58,17 @@ def wbuild(config: Dict[str, Dict[str, Any]], win_out_dir: Path, info: Info) ->
""" """
for _, item in config.items(): for _, item in config.items():
png = item["png"] with CursorAlias.from_bitmap(item["png"], item["hotspot"]) as alias:
hotspot = item["hotspot"] alias.create(item["x_sizes"], item["delay"])
x_sizes = item["x_sizes"]
delay = item["delay"]
with CursorAlias.from_bitmap(png, hotspot) as alias:
alias.create(x_sizes, delay)
if item.get("win_key"): if item.get("win_key"):
position = item["position"]
win_size = item["win_size"]
win_key = item["win_key"]
canvas_size = item["canvas_size"]
win_delay = item["win_delay"]
win_cfg = alias.reproduce( win_cfg = alias.reproduce(
win_size, canvas_size, position, delay=win_delay item["win_size"],
).rename(win_key) item["canvas_size"],
item["position"],
delay=item["win_delay"],
).rename(item["win_key"])
print(f"Building '{win_cfg.stem}' Windows Cursor...") print(f"Building '{win_cfg.stem}' Windows Cursor...")
WindowsCursor.create(win_cfg, win_out_dir) WindowsCursor.create(win_cfg, win_out_dir)
@@ -108,32 +97,24 @@ def build(
:type info: Info :type info: Info
""" """
def win_build(item: Dict[str, Any], alias: CursorAlias) -> None:
position = item["position"]
win_size = item["win_size"]
win_key = item["win_key"]
canvas_size = item["canvas_size"]
win_delay = item["win_delay"]
win_cfg = alias.reproduce(
win_size, canvas_size, position, delay=win_delay
).rename(win_key)
print(f"Building '{win_cfg.stem}' Windows Cursor...")
WindowsCursor.create(win_cfg, win_out_dir)
for _, item in config.items(): for _, item in config.items():
png = item["png"]
hotspot = item["hotspot"]
x_sizes = item["x_sizes"]
delay = item["delay"]
with CursorAlias.from_bitmap(png, hotspot) as alias: with CursorAlias.from_bitmap(item["png"], item["hotspot"]) as alias:
x_cfg = alias.create(x_sizes, delay) x_cfg = alias.create(item["x_sizes"], item["delay"])
print(f"Building '{x_cfg.stem}' XCursor...") print(f"Building '{x_cfg.stem}' XCursor...")
XCursor.create(x_cfg, x_out_dir) XCursor.create(x_cfg, x_out_dir)
if item.get("win_key"): if item.get("win_key"):
win_build(item, alias) win_cfg = alias.reproduce(
item["win_size"],
item["canvas_size"],
item["position"],
delay=item["win_delay"],
).rename(item["win_key"])
print(f"Building '{win_cfg.stem}' Windows Cursor...")
WindowsCursor.create(win_cfg, win_out_dir)
add_missing_xcursor(x_out_dir / "cursors") add_missing_xcursor(x_out_dir / "cursors")
XPackager(x_out_dir, info.name, info.comment) XPackager(x_out_dir, info.name, info.comment)