From: Stefano Rivera <stefano@rivera.za.net>
Date: Sat, 17 May 2014 16:31:33 +0000 (+0200)
Subject: Puzzles now live in a subdir
X-Git-Tag: 0.1~78
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=c85e7a3b924b6aab6a5995d84956081cb1552fbc;p=naja.git

Puzzles now live in a subdir
---

diff --git a/.gitignore b/.gitignore
index f7f4168..2e6f0cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ py2exe.log
 VE
 ve
 /data/location_decks/*.json
+/data/location_decks/puzzles/*.json
diff --git a/tools/gen_json.py b/tools/gen_json.py
index bec7ffc..e3468cd 100755
--- a/tools/gen_json.py
+++ b/tools/gen_json.py
@@ -6,16 +6,22 @@ import os
 
 def main(update=True):
     data = os.path.join(os.path.dirname(__file__), '..', 'data')
+
     deck_dir = os.path.join(data, 'location_decks')
+    convert_to_json(deck_dir, update)
+    puzzle_dir = os.path.join(deck_dir, 'puzzles')
+    convert_to_json(puzzle_dir, update)
+
 
-    for yaml_fn in os.listdir(deck_dir):
+def convert_to_json(directory, update=True):
+    for yaml_fn in os.listdir(directory):
         basename, extension = os.path.splitext(yaml_fn)
         if extension != '.yaml':
             continue
         json_fn = basename + '.json'
 
-        yaml_path = os.path.join(deck_dir, yaml_fn)
-        json_path = os.path.join(deck_dir, json_fn)
+        yaml_path = os.path.join(directory, yaml_fn)
+        json_path = os.path.join(directory, json_fn)
 
         if not update and os.path.exists(json_path):
             continue