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

minor cloudtool tidying

Browse Source
This commit is contained in:
Eric Froemling 2020-01-10 17:39:20 -08:00
parent 3d20759c36
commit fbc407971c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/cloudtool
View File

@ -49,8 +49,8 @@ TOOL_NAME = 'cloudtool'
MASTER_SERVER_ADDRESS = ('http://localhost:23524' MASTER_SERVER_ADDRESS = ('http://localhost:23524'
if os.environ.get('CLOUDTOOL_LOCAL') == '1' else if os.environ.get('CLOUDTOOL_LOCAL') == '1' else
'https://bamaster.appspot.com') 'https://bamaster.appspot.com')
CACHE_DIR = Path('.cache/cloudtool') STATE_DIR = Path('.cache/cloudtool')
CACHE_DATA_PATH = Path(CACHE_DIR, 'state') STATE_DATA_PATH = Path(STATE_DIR, 'state')
CLRHDR = '\033[95m' # Header. CLRHDR = '\033[95m' # Header.
CLRGRN = '\033[92m' # Green. CLRGRN = '\033[92m' # Green.
@ -129,9 +129,7 @@ class Package:
if not path.is_dir(): if not path.is_dir():
raise CleanError(f'Directory not found: "{path}"') raise CleanError(f'Directory not found: "{path}"')
package.path = path package.path = path
packagepathstr = str(path) packagepathstr = str(path)
paths: List[str] = [] paths: List[str] = []
# Build the full list of package-relative paths. # Build the full list of package-relative paths.
@ -200,19 +198,19 @@ class App:
self._save_state() self._save_state()
def _load_state(self) -> None: def _load_state(self) -> None:
if not os.path.exists(CACHE_DATA_PATH): if not os.path.exists(STATE_DATA_PATH):
return return
try: try:
with open(CACHE_DATA_PATH, 'r') as infile: with open(STATE_DATA_PATH, 'r') as infile:
self._state = StateData(**json.loads(infile.read())) self._state = StateData(**json.loads(infile.read()))
except Exception: except Exception:
print(f'{CLRRED}Error loading {TOOL_NAME} data;' print(f'{CLRRED}Error loading {TOOL_NAME} data;'
f' resetting to defaults.{CLREND}') f' resetting to defaults.{CLREND}')
def _save_state(self) -> None: def _save_state(self) -> None:
if not CACHE_DIR.exists(): if not STATE_DIR.exists():
CACHE_DIR.mkdir(parents=True, exist_ok=True) STATE_DIR.mkdir(parents=True, exist_ok=True)
with open(CACHE_DATA_PATH, 'w') as outfile: with open(STATE_DATA_PATH, 'w') as outfile:
outfile.write(json.dumps(self._state.__dict__)) outfile.write(json.dumps(self._state.__dict__))
def _servercmd(self, def _servercmd(self,