Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,7 @@ _dummy_pxmodrim.py

# OpenCode
.opencode/**
opencode.json
opencode.json

# Steam workshop plugin
src/pxmodrim/ui/plugins/steam_workshop/
15 changes: 15 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@ linux-copy-desktop:
sed "s|Icon=pxmodrim|Icon={{justfile_directory()}}/src/pxmodrim/ui/assets/logo.svg|" packaging/linux/pxmodrim.desktop > ~/.local/share/applications/pxmodrim.desktop
kbuildsycoca6 --noincremental

bench name="":
#!/usr/bin/env python3
import glob, subprocess, sys
from pathlib import Path
root = Path("{{justfile_directory()}}") / "tests" / "benchmarks"
scripts = sorted(glob.glob(str(root / "bench_*.py")))
name = "{{name}}"
if name and name != "all":
scripts = [s for s in scripts if name in s]
if not scripts:
print("no benchmark found"); sys.exit(1)
for s in scripts:
print(f" === {Path(s).stem} ===")
subprocess.run(["uv", "run", "python", s])

build:
uv run python packaging/build.py

Expand Down
1 change: 1 addition & 0 deletions packaging/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def get_standalone_args(release: bool = False) -> list[str]:
"nuitka",
"--standalone",
"--enable-plugin=pyside6",
"--nofollow-import-to=pytest,pygments",
"--include-package-data=pxmodrim",
f"--output-dir={project_root / 'dist'}",
"--assume-yes-for-downloads",
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ dependencies = [
"loguru>=0.7.3",
"lxml>=6.1.1",
"msgspec>=0.21.1",
"natsort>=8.4.0",
"networkx>=3.6.1",
"pyside6>=6.11.1,<6.12",
"pyside6>=6.11.1",
"qasync>=0.28.0",
"toposort>=1.10",
"ttimer>=0.0.2",
Expand Down
36 changes: 17 additions & 19 deletions src/pxmodrim/core/checker/sort.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import heapq
from typing import TYPE_CHECKING

from pxmodrim.core.checker.graph import ConstraintGraph, EdgeType
Expand Down Expand Up @@ -62,17 +63,16 @@ def topological_sort(
def _key(pid: PackageId, config_priority=config_priority) -> tuple:
return (config_priority.get(pid, len(config_priority)), pid.lower())

queue = [pid for pid, deg in indegree.items() if deg == 0]
queue.sort(key=_key)
queue = [(_key(pid), pid) for pid, deg in indegree.items() if deg == 0]
heapq.heapify(queue)

while queue:
pid = queue.pop(0)
_, pid = heapq.heappop(queue)
order.append(pid)
for dependent in rev.get(pid, set()):
indegree[dependent] -= 1
if indegree[dependent] == 0:
queue.append(dependent)
queue.sort(key=_key)
heapq.heappush(queue, (_key(dependent), dependent))

remaining = tier_pids - set(order)
if remaining:
Expand All @@ -93,20 +93,18 @@ def _build_deps_and_rev_deps(
if pid not in all_pids:
continue

for edge in graph.edges_of_type(pid, EdgeType.LOAD_BEFORE):
if edge.target in all_pids:
deps.setdefault(edge.target, set()).add(pid)
rev_deps.setdefault(pid, set()).add(edge.target)

for edge in graph.edges_of_type(pid, EdgeType.LOAD_AFTER):
if edge.target in all_pids:
deps.setdefault(pid, set()).add(edge.target)
rev_deps.setdefault(edge.target, set()).add(pid)

for edge in graph.edges_of_type(pid, EdgeType.DEPENDENCY):
if edge.target in all_pids:
deps.setdefault(pid, set()).add(edge.target)
rev_deps.setdefault(edge.target, set()).add(pid)
deps_pid = deps[pid]
rev_pid = rev_deps[pid]
for edge in graph.outgoing(pid):
target = edge.target
if target not in all_pids:
continue
if edge.type == EdgeType.LOAD_BEFORE:
deps[target].add(pid)
rev_pid.add(target)
elif edge.type in (EdgeType.LOAD_AFTER, EdgeType.DEPENDENCY):
deps_pid.add(target)
rev_deps[target].add(pid)

return deps, rev_deps

Expand Down
Loading
Loading