diff options
Diffstat (limited to 'asciifarm/client/main.py')
| -rwxr-xr-x | asciifarm/client/main.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/asciifarm/client/main.py b/asciifarm/client/main.py index 1a4ac51..ece3c5a 100755 --- a/asciifarm/client/main.py +++ b/asciifarm/client/main.py @@ -15,7 +15,7 @@ charMapPath = os.path.join(farmsPath, "charmaps") keybindingsPath = os.path.join(farmsPath, "keybindings") standardCharFiles = [name[:-5] for name in os.listdir(charMapPath) if name[-5:] == ".json"] -standardKeyFiles = [name[:-3] for name in os.listdir(keybindingsPath) if name[-3:] == ".hy"] +standardKeyFiles = [name[:-5] for name in os.listdir(keybindingsPath) if name[-5:] == ".json"] defaultAdresses = { @@ -54,9 +54,10 @@ def main(argv=None): keyFile = args.keybindings if keyFile in standardKeyFiles: - keyFile = os.path.join(keybindingsPath, keyFile + ".hy") + keyFile = os.path.join(keybindingsPath, keyFile + ".json") with open(keyFile, 'r') as kf: - keybindings = kf.read() + # todo: support yaml + keybindings = json.load(kf) address = args.address if address is None: |