misukisu commited on
Commit
417f026
·
verified ·
1 Parent(s): 2b6c91a

ensure eula + start on boot

Browse files
Files changed (1) hide show
  1. app.py +10 -0
app.py CHANGED
@@ -79,6 +79,8 @@ def build_import_zip(src: Path) -> str:
79
  kv.update({"online-mode": "false", "server-port": "25565", "server-ip": "127.0.0.1", "enforce-secure-profile": "false"})
80
  props.write_text("".join(f"{k}={v}\n" for k, v in kv.items()))
81
  (src / "eula.txt").write_text("eula=true\n")
 
 
82
  out = CRAFTY / "import" / "upload" / "server.zip"
83
  with zipfile.ZipFile(out, "w", zipfile.ZIP_DEFLATED) as z:
84
  for f in src.rglob("*"):
@@ -325,6 +327,9 @@ async def main():
325
  if not any(p.name != ".gitkeep" for p in (CRAFTY / "app" / "config").iterdir()):
326
  subprocess.run(f"cp -r {CRAFTY}/app/config_original/* {CRAFTY}/app/config/", shell=True)
327
  shutil.copy(CRAFTY / "app" / "config_original" / "version.json", CRAFTY / "app" / "config" / "version.json")
 
 
 
328
  cp = await asyncio.create_subprocess_exec(str(CRAFTY / ".venv/bin/python"), "main.py", "-d", "-i", cwd=str(CRAFTY))
329
  asyncio.create_task(run_playit())
330
  asyncio.create_task(tunnels_loop())
@@ -334,6 +339,11 @@ async def main():
334
  await bootstrap(import_dir)
335
  else:
336
  await crafty.login(CRAFTY_PASSWORD)
 
 
 
 
 
337
  asyncio.create_task(backup_loop())
338
  stop = asyncio.Event()
339
  loop = asyncio.get_running_loop()
 
79
  kv.update({"online-mode": "false", "server-port": "25565", "server-ip": "127.0.0.1", "enforce-secure-profile": "false"})
80
  props.write_text("".join(f"{k}={v}\n" for k, v in kv.items()))
81
  (src / "eula.txt").write_text("eula=true\n")
82
+ for junk in ("playitd.sock",):
83
+ (src / junk).unlink(missing_ok=True)
84
  out = CRAFTY / "import" / "upload" / "server.zip"
85
  with zipfile.ZipFile(out, "w", zipfile.ZIP_DEFLATED) as z:
86
  for f in src.rglob("*"):
 
327
  if not any(p.name != ".gitkeep" for p in (CRAFTY / "app" / "config").iterdir()):
328
  subprocess.run(f"cp -r {CRAFTY}/app/config_original/* {CRAFTY}/app/config/", shell=True)
329
  shutil.copy(CRAFTY / "app" / "config_original" / "version.json", CRAFTY / "app" / "config" / "version.json")
330
+ for d in (CRAFTY / "servers").iterdir():
331
+ if d.is_dir():
332
+ (d / "eula.txt").write_text("eula=true\n")
333
  cp = await asyncio.create_subprocess_exec(str(CRAFTY / ".venv/bin/python"), "main.py", "-d", "-i", cwd=str(CRAFTY))
334
  asyncio.create_task(run_playit())
335
  asyncio.create_task(tunnels_loop())
 
339
  await bootstrap(import_dir)
340
  else:
341
  await crafty.login(CRAFTY_PASSWORD)
342
+ await asyncio.sleep(10)
343
+ sid = await crafty.server_id()
344
+ st = await crafty.req("GET", f"/api/v2/servers/{sid}/stats")
345
+ if sid and not (st.get("data") or {}).get("running"):
346
+ log.info("start: %s", await crafty.req("POST", f"/api/v2/servers/{sid}/action/start_server"))
347
  asyncio.create_task(backup_loop())
348
  stop = asyncio.Event()
349
  loop = asyncio.get_running_loop()