RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-05 23:13:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed paths issue with server script

Browse Source
This commit is contained in:
Eric Froemling 2020-05-10 13:12:09 -07:00
parent b1d7d96386
commit fab6a54ff8
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/dictionaries/ericf.xml generated
View File

@ -319,6 +319,7 @@
<w>cnode</w> <w>cnode</w>
<w>codecsmodule</w> <w>codecsmodule</w>
<w>codefilenames</w> <w>codefilenames</w>
<w>codefiles</w>
<w>codehash</w> <w>codehash</w>
<w>codeop</w> <w>codeop</w>
<w>collapsable</w> <w>collapsable</w>

25
assets/src/server/ballisticacore_server.py
View File

@ -31,22 +31,19 @@ from pathlib import Path
from threading import Lock, Thread, current_thread from threading import Lock, Thread, current_thread
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
# We make use of the bacommon and efro packages as well as site-packages
# included with our bundled Ballistica dist, so we need to add those paths
# before we import them.
sys.path += [
str(Path(Path(__file__).parent, 'dist', 'ba_data', 'python')),
str(Path(Path(__file__).parent, 'dist', 'ba_data', 'python-site-packages'))
]
from bacommon.servermanager import ServerConfig, StartServerModeCommand from bacommon.servermanager import ServerConfig, StartServerModeCommand
from efro.dataclasses import dataclass_assign, dataclass_validate from efro.dataclasses import dataclass_assign, dataclass_validate
from efro.error import CleanError from efro.error import CleanError
from efro.terminal import Clr from efro.terminal import Clr
# We change our working directory according to file's path
# so that the script can be properly executed from anywhere
os.chdir(os.path.abspath(os.path.dirname(__file__)))
# We make use of the bacommon and efro packages as well as site-packages
# included with our bundled Ballistica dist.
sys.path += [
str(Path(os.getcwd(), 'dist', 'ba_data', 'python')),
str(Path(os.getcwd(), 'dist', 'ba_data', 'python-site-packages'))
]
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Optional, List, Dict, Union, Tuple from typing import Optional, List, Dict, Union, Tuple
from types import FrameType from types import FrameType
@ -54,7 +51,7 @@ if TYPE_CHECKING:
# Not sure how much versioning we'll do with this, but this will get # Not sure how much versioning we'll do with this, but this will get
# printed at startup in case we need it. # printed at startup in case we need it.
VERSION_STR = '1.0' VERSION_STR = '1.0.1'
class ServerManagerApp: class ServerManagerApp:
@ -432,6 +429,10 @@ class ServerManagerApp:
def main() -> None: def main() -> None:
"""Run a BallisticaCore server manager in interactive mode.""" """Run a BallisticaCore server manager in interactive mode."""
try: try:
# Change our working directory according to file's path
# so that this script can be run from anywhere.
os.chdir(os.path.abspath(os.path.dirname(__file__)))
ServerManagerApp().run_interactive() ServerManagerApp().run_interactive()
except CleanError as exc: except CleanError as exc:
# For clean errors, do a simple print and fail; no tracebacks/etc. # For clean errors, do a simple print and fail; no tracebacks/etc.