master: scan subdirectories in repos

m-labs · Nov 13, 2015 · d32c2c0 · d32c2c0
1 parent 96ddf73
commit d32c2c0
Showing 10 changed files with 46 additions and 28 deletions.
diff --git a/artiq/master/repository.py b/artiq/master/repository.py
@@ -12,37 +12,55 @@
 logger = logging.getLogger(__name__)
 
 
-async def _scan_experiments(wd, get_device_db, log):
+async def _get_repository_entries(root, filename, get_device_db, log):
     r = dict()
-    for f in os.listdir(wd):
-        if f.endswith(".py"):
+    worker = Worker({
+        "get_device_db": get_device_db,
+        "log": lambda message: log("scan", message)
+    })
+    try:
+        description = await worker.examine(os.path.join(root, filename))
+    finally:
+        await worker.close()
+    for class_name, class_desc in description.items():
+        name = class_desc["name"]
+        arguments = class_desc["arguments"]
+        if name in r:
+            logger.warning("Duplicate experiment name: '%s'", name)
+            basename = name
+            i = 1
+            while name in r:
+                name = basename + str(i)
+                i += 1
+        entry = {
+            "file": filename,
+            "class_name": class_name,
+            "arguments": arguments
+        }
+        r[name] = entry
+    return r
+
+
+async def _scan_experiments(root, get_device_db, log, subdir=""):
+    r = dict()
+    for de in os.scandir(os.path.join(root, subdir)):
+        if de.name.startswith("."):
+            continue
+        if de.is_file() and de.name.endswith(".py"):
+            filename = os.path.join(subdir, de.name)
             try:
-                worker = Worker({
-                    "get_device_db": get_device_db,
-                    "log": lambda message: log("scan", message)
-                })
-                try:
-                    description = await worker.examine(os.path.join(wd, f))
-                finally:
-                    await worker.close()
-                for class_name, class_desc in description.items():
-                    name = class_desc["name"]
-                    arguments = class_desc["arguments"]
-                    if name in r:
-                        logger.warning("Duplicate experiment name: '%s'", name)
-                        basename = name
-                        i = 1
-                        while name in r:
-                            name = basename + str(i)
-                            i += 1
-                    entry = {
-                        "file": f,
-                        "class_name": class_name,
-                        "arguments": arguments
-                    }
-                    r[name] = entry
+                entries = await _get_repository_entries(
+                    root, filename, get_device_db, log)
             except:
-                logger.warning("Skipping file '%s'", f, exc_info=True)
+                logger.warning("Skipping file '%s'", filename, exc_info=True)
+            else:
+                r.update(entries)
+        if de.is_dir():
+            subentries = await _scan_experiments(
+                root, get_device_db, log,
+                os.path.join(subdir, de.name))
+            entries = {de.name + "/" + k: v for k, v in subentries.items()}
+            r.update(entries)
     return r
 
 

diff --git a/...les/master/repository/photon_histogram.py → ...y/coredevice_examples/photon_histogram.py b/...les/master/repository/photon_histogram.py → ...y/coredevice_examples/photon_histogram.py
diff --git a/examples/master/repository/blink_forever.py → ...redevice_examples/simple/blink_forever.py b/examples/master/repository/blink_forever.py → ...redevice_examples/simple/blink_forever.py
diff --git a/examples/master/repository/dds_test.py → ...ry/coredevice_examples/simple/dds_test.py b/examples/master/repository/dds_test.py → ...ry/coredevice_examples/simple/dds_test.py
diff --git a/examples/master/repository/handover.py → ...ry/coredevice_examples/simple/handover.py b/examples/master/repository/handover.py → ...ry/coredevice_examples/simple/handover.py
diff --git a/examples/master/repository/mandelbrot.py → .../coredevice_examples/simple/mandelbrot.py b/examples/master/repository/mandelbrot.py → .../coredevice_examples/simple/mandelbrot.py
diff --git a/examples/master/repository/tdr.py → ...ter/repository/coredevice_examples/tdr.py b/examples/master/repository/tdr.py → ...ter/repository/coredevice_examples/tdr.py
diff --git a/examples/master/repository/transport.py → ...pository/coredevice_examples/transport.py b/examples/master/repository/transport.py → ...pository/coredevice_examples/transport.py
diff --git a/examples/master/repository/dds_setter.py → ...master/repository/utilities/dds_setter.py b/examples/master/repository/dds_setter.py → ...master/repository/utilities/dds_setter.py
diff --git a/examples/master/repository/terminate_all.py → ...ter/repository/utilities/terminate_all.py b/examples/master/repository/terminate_all.py → ...ter/repository/utilities/terminate_all.py