X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue-server.py;h=acbb14199fd67a2ebf465f30686ed4c71a73481c;hb=bbe389ef0483e89c65cfc828e4a56aca0f58d6db;hp=e7debbabf4de805acc5c2919c069689cd76f11fe;hpb=e9a48216a19e93f3ed3908c5a6c9be79471e7c70;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index e7debba..acbb141 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
import argparse
import errno
import os
@@ -26,7 +27,8 @@ def prep_library():
"""Prepare ctypes library at ./libplomrogue.so"""
libpath = ("./libplomrogue.so")
if not os.access(libpath, os.F_OK):
- raise SystemExit("No library " + libpath + ", run ./compile.sh first?")
+ raise SystemExit("No library " + libpath +
+ ", run ./compile-server.sh first?")
libpr = ctypes.cdll.LoadLibrary(libpath)
libpr.seed_rrand.argtypes = [ctypes.c_uint8, ctypes.c_uint32]
libpr.seed_rrand.restype = ctypes.c_uint32
@@ -56,10 +58,9 @@ def prep_library():
def strong_write(file, string):
- """Apply write(string), flush(), and os.fsync() to file."""
+ """Apply write(string), then flush()."""
file.write(string)
file.flush()
- os.fsync(file)
def setup_server_io():
@@ -80,6 +81,7 @@ def setup_server_io():
raise SystemExit(msg)
io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
io_db["save_wait"] = 0
+ io_db["verbose"] = False
io_db["record_chunk"] = ""
os.makedirs(io_db["path_server"], exist_ok=True)
io_db["file_out"] = open(io_db["path_out"], "w")
@@ -98,11 +100,11 @@ def cleanup_server_io():
def helper(file_key, path_key):
if file_key in io_db:
io_db[file_key].close()
- if not io_db["kicked_by_rival"] \
- and os.access(io_db[path_key], os.F_OK):
- os.remove(io_db[path_key])
- helper("file_out", "path_out")
+ if not io_db["kicked_by_rival"] \
+ and os.access(io_db[path_key], os.F_OK):
+ os.remove(io_db[path_key])
helper("file_in", "path_in")
+ helper("file_out", "path_out")
helper("file_worldstate", "path_worldstate")
if "file_record" in io_db:
io_db["file_record"].close()
@@ -122,7 +124,8 @@ def obey(command, prefix, replay=False, do_record=False):
is preceded by a server_test() call.
"""
server_test()
- print("input " + prefix + ": " + command)
+ if io_db["verbose"]:
+ print("input " + prefix + ": " + command)
try:
tokens = shlex.split(command, comments=True)
except ValueError as err:
@@ -254,6 +257,7 @@ def parse_command_line_arguments():
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
+ parser.add_argument('-v', dest='verbose', action='store_true')
opts, unknown = parser.parse_known_args()
return opts
@@ -1596,7 +1600,7 @@ directions_db = {"east": "d", "south-east": "c", "south-west": "x",
"""File IO database."""
io_db = {
"path_save": "save",
- "path_record": "record",
+ "path_record": "history",
"path_worldconf": "confserver/world",
"path_server": "server/",
"path_in": "server/in",
@@ -1611,8 +1615,10 @@ io_db = {
try:
libpr = prep_library()
rand = RandomnessIO()
- opts = parse_command_line_arguments()
setup_server_io()
+ opts = parse_command_line_arguments()
+ if opts.verbose:
+ io_db["verbose"] = True
if None != opts.replay:
replay_game()
else: