fix launch

This commit is contained in:
flandre 2025-04-12 15:54:56 +08:00
parent 4e02ce83d3
commit a95642daee
5 changed files with 13 additions and 12 deletions

2
.gitignore vendored
View File

@ -3,6 +3,6 @@
bak
__pycache__
@DS
gui.toml
launch.toml
*.log
doc

View File

@ -5,7 +5,7 @@ from pathlib import Path
import zmq
from flandre.config import C
from flandre.config import C, ISDEV
from flandre.nodes.Node import Node
from flandre.utils.Msg import MoveAxisMsg, KillMsg, SetSeqMetaMsg, SeqIdMinMax, SetBaseMsg, SeqListMsg, SeqIdList, \
SetSidMsg, RfFrameWithMetaMsg
@ -49,6 +49,7 @@ class Loader(Node):
logger.warning(f'No sequences found in {base}')
else:
C.data_folder = base
if not ISDEV:
C.write_config()
self.send(SeqListMsg(seq_list))
elif isinstance(msg, KillMsg):

View File

@ -5,8 +5,6 @@ from pathlib import Path
import click
sys.argv.append('--dev')
import flandre
from flandre.launcher import launch_from_file
from flandre.config import C
@ -15,7 +13,7 @@ from flandre.config import C
@click.command()
@click.option('--data_folder', default=None)
@click.option('--generate_pyqt', default=True)
@click.option('--dev', default=True, is_flag=True)
@click.option('--dev/--no-dev', default=True)
def main(data_folder, generate_pyqt, dev):
if (pyuic6 := shutil.which('pyuic6')) is None:
print('pyuic6 is not installed')
@ -24,7 +22,9 @@ def main(data_folder, generate_pyqt, dev):
subprocess.run([pyuic6, '-o', flandre.PYQT / 'Main.py', flandre.PYQT / 'Main.ui'])
if data_folder is not None:
C.data_folder = Path(data_folder)
launch_from_file(Path(__file__).parent / 'dev.toml')
if dev:
sys.argv.append('--dev')
launch_from_file(Path(__file__).parent / 'launch.toml')
if __name__ == '__main__':