X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=plomrogue-server.py;h=d5949ad148761124614a2c2f1537f7be907268dd;hb=be70795641d788332eb1f2b7fdc613fb41aa8b6a;hp=0b3ce1f85f72f7800527b5b13a05da7218d3f3d4;hpb=833a1fa083b563f0ac774b68780e7419fda65238;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 0b3ce1f..d5949ad 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -1,6 +1,7 @@ import argparse import errno import os +import shlex import time @@ -40,7 +41,7 @@ def cleanup_server_io(io_db): def detect_atomic_leftover(path): - """Raise explained HandledException if file is found at path + "_tmp".""" + """Raise explained SystemExit if file is found at path + "_tmp".""" path_tmp = path + "_tmp" msg = "Found file '" + path_tmp + "' that may be a leftover from an " \ "aborted previous attempt to write '" + path + "'. Aborting until " \ @@ -52,44 +53,7 @@ def detect_atomic_leftover(path): def obey(msg): """""" print("Input: " + msg) - - -def tokenize(string): - """Divide string by ' ', \t & " quotes (that also group). Escape with \.""" - charlist_A = list(string) - i = 0 - for c in charlist_A: - if "\\" == c and i < len(charlist_A) - 1: - charlist_A[i] = "remove" - charlist_A[i + 1] = charlist_A[i + 1] + "_escaped" - i = i + 1 - charlist_B = [] - for c in charlist_A: - if "remove" != c: - charlist_B.append(c) - in_quotes = 0 - i = 0 - for c in charlist_B: - if "\"" == c: - in_quotes = 0 if in_quotes else 1 - if i < len(charlist_B) - 1: - charlist_B[i] = "separator" - elif (not in_quotes) and (" " == c or "\t" == c): - charlist_B[i] = "separator" - i = i + 1 - list_of_charlists = [[]] - i = 0 - for c in charlist_B: - if "separator" == c: - if [] != list_of_charlists[-1]: - list_of_charlists.append([]) - i = i + 1 - else: - list_of_charlists[i].append(c[0]) - tokens = [] - for charlist in list_of_charlists: - tokens.append("".join(charlist)) - return tokens + print(shlex.split(msg)) io_db = {}