Mess #14

Merged
Dandaedre merged 3 commits from dan into develop 2023-02-24 22:35:24 +01:00
5 changed files with 36 additions and 38 deletions

2
Cargo.lock generated
View File

@ -553,7 +553,7 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
[[package]]
name = "xiv_craft_solver"
version = "0.1.3"
version = "0.1.4"
dependencies = [
"clap",
"lazy_static",

View File

@ -30,6 +30,7 @@ dependencies = ["remove_tmp"]
[tasks.remove_tmp]
script_runner = "@shell"
ignore_errors = true
script = '''
rm -rf releases
rm -rf python/build
@ -37,16 +38,39 @@ script = '''
'''
[tasks.zip]
windows_alias = 'zip_win'
linux_alias = 'zip_linux'
[tasks.zip_linux]
script_runner = "@shell"
script = '''
mkdir -p releases # Add version as an arg and things
cp target/wheels/*.whl releases/
zip releases/ffcraft_solver_cli.zip -q -j target/release/ffcraft_solver_cli craft.toml -j target/release/libxiv_craft_solver.so
cd python/dist/ && zip -q ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui/
zip releases/ffcraft_solver_cli.zip -j target/release/ffcraft_solver_cli craft.toml -j target/release/libxiv_craft_solver.so
cd python/dist/ && zip ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui_linux/
'''
[tasks.zip_win]
script_runner = "@shell"
script = '''
mkdir -p releases # Add version as an arg and things
cp target/wheels/*.whl releases/
tar acvf releases/ff_craft_solver_cli_win.zip .\craft.toml -C .\target\release\ ffcraft_solver_cli.exe libxiv_craft_solver.d
tar acvf releases/ff_craft_solver_gui_win.zip -C .\python\dist\ .\ffcraft_solver_gui_win\*
'''
[tasks.zip_win]
script_runner = "@shell"
script = '''
mkdir -p releases # Add version as an arg and things
cp target/wheels/*.whl releases/
tar acvf releases/ff_craft_solver_cli_win.zip .\craft.toml -C .\target\release\ ffcraft_solver_cli.exe libxiv_craft_solver.d
tar acvf releases/ff_craft_solver_gui_win.zip -C .\python\dist\ .\ffcraft_solver_gui_win\*
'''
[tasks.pip]
script_runner = "@shell"
ignore_errors = true
script = '''
cd python
rm -rf build dist
@ -63,14 +87,13 @@ linux_alias = "linux_pyinstaller"
script_runner = "@shell"
script = '''
cd python
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui_linux -y
'''
[tasks.windows_pyinstaller]
script_runner = "@shell"
script = '''
cd python
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/;ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/;ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null 2>pyinstaller_log.txt
cd python && pyinstaller src\ffcraft_solver\__main__.py --add-data "src\ffcraft_solver\configs\;ffcraft_solver\configs" --add-data "src\ffcraft_solver\ressources\;ffcraft_solver\ressources" --name ffcraft_solver_gui_win -y
'''
[tasks.build]

View File

@ -1,27 +0,0 @@
clean:
@echo "[MAKE] Cleaning last release"
cargo clean
rm -rf releases
rm -rf python/build
rm -rf python/dist
rust:
@echo "[MAKE] Building the libraries"
maturin develop --release -q
cargo build --release -q # --features="no_python"
python:
@echo "[MAKE] Building the python project"
cd python && rm -rf build dist
cd python && pip install -q -r requirements_dev.txt
cd python && pip install -q -e .
cd python && pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null 2>pyinstaller_log.txt
.PHONY: clean rust python
release: clean rust python
mkdir -p releases # Add version as an arg and things
@echo "[MAKE] Copying releases in the releases/ directory"
zip releases/ffcraft_solver_cli.zip -q -j target/release/ffcraft_solver_cli craft.toml -j target/release/libxiv_craft_solver.so
cd python/dist/ && zip -q ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui/

View File

@ -203,7 +203,7 @@ class Solution:
def request_solve() -> True:
loggers.add_log('Solver initialised. Please stand by.')
all_results = solver.Solver(user, recipe)
all_results = solver.Solver(user, recipe, loggers)
best_quality.result = all_results.best_quality
least_steps.result = all_results.least_steps
safe_50.result = all_results.safe_50

View File

@ -68,7 +68,7 @@ Remaining CP: {self.remaining_cp}"""
if self.steps != 15 and self.steps != 29 and self.steps != 44:
saved_lines.append('/echo Craft complete ! <se.3>')
else:
loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.')
self.loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.')
if self.steps > 15:
saved_lines.insert(14, '/echo Macro 1 complete <se.2>')
@ -94,7 +94,7 @@ Remaining CP: {self.remaining_cp}"""
class Solver:
def __init__(self, user: User, recipe: Recipe):
def __init__(self, user: User, recipe: Recipe, loggers: log.Loggers):
self.durability = recipe.durability
self.progress = recipe.progress
self.quality = recipe.quality
@ -113,6 +113,8 @@ class Solver:
self.threads = 8
self.verbose = 0
self.loggers = loggers
self.solutions = []
self.best_quality = None
self.least_steps = None
@ -149,8 +151,8 @@ class Solver:
done = True
if not done:
loggers.add_log('Could not find a rotation for 150% quality.\n'
' Defaulting to Best Quality.')
self.loggers.add_log('Could not find a rotation for 150% quality.\n'
' Defaulting to Best Quality.')
self.safe_50 = self.best_quality
# self.safe_50 = Result(self.solutions[round(len(self.solutions)/2)+1], 'Safe 50') # old version