home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server/py: Minor refactoring.
[plomrogue]
/
plomrogue-server.py
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index a3ee5e22f93053d3e58b2dfa261faea2b270cdf5..5018304e6a0af417d5e0d450162bb918a16ad498 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-13,7
+13,8
@@
def setup_server_io(io_db):
file if found. Set up new in file (io_db["file_in"]) for reading at
io_db["path_in"], and new out file (io_db["file_out"]) for writing at
io_db["path_out"]. Start out file with process hash line of format PID +
file if found. Set up new in file (io_db["file_in"]) for reading at
io_db["path_in"], and new out file (io_db["file_out"]) for writing at
io_db["path_out"]. Start out file with process hash line of format PID +
- " " + floated UNIX time (io_db["teststring"]).
+ " " + floated UNIX time (io_db["teststring"]). Run detect_atomic_leftover
+ on io_db["path_record"] and io_db["path_save"].
"""
io_dir = "server/"
io_db["path_in"] = io_dir + "in"
"""
io_dir = "server/"
io_db["path_in"] = io_dir + "in"
@@
-32,6
+33,8
@@
def setup_server_io(io_db):
io_db["file_in"] = open(io_db["path_in"], "w")
io_db["file_in"].close()
io_db["file_in"] = open(io_db["path_in"], "r")
io_db["file_in"] = open(io_db["path_in"], "w")
io_db["file_in"].close()
io_db["file_in"] = open(io_db["path_in"], "r")
+ detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"])
+ detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"])
def cleanup_server_io(io_db):
def cleanup_server_io(io_db):
@@
-117,17
+120,22
@@
def make_turn_tester(turn_to_compare, world_db):
return turn_tester
return turn_tester
-io_db = {}
-world_db = {}
-try:
+
+def parse_command_line_arguments():
+ """Return settings values read from command line arguments."""
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
+ opts, unknown = parser.parse_known_args()
+ return opts
+
+
+io_db = {}
+world_db = {}
+try:
+ opts = parse_command_line_arguments()
setup_server_io(io_db)
# print("DUMMY: Run game.")
setup_server_io(io_db)
# print("DUMMY: Run game.")
- detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"])
- detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"])
- opts, unknown = parser.parse_known_args()
if None != opts.replay:
if opts.replay < 1:
opts.replay = 1
if None != opts.replay:
if opts.replay < 1:
opts.replay = 1
@@
-138,6
+146,7
@@
try:
world_db["turn"] = 0
break_tester = make_turn_tester(opts.replay, world_db)
obey_lines_in_file(io_db["path_record"], "record ", break_tester)
world_db["turn"] = 0
break_tester = make_turn_tester(opts.replay, world_db)
obey_lines_in_file(io_db["path_record"], "record ", break_tester)
+ # what to do next?
else:
if os.access(io_db["path_save"], os.F_OK):
obey_lines_in_file(io_db["path_save"], "save")
else:
if os.access(io_db["path_save"], os.F_OK):
obey_lines_in_file(io_db["path_save"], "save")