2 files changed, 43 insertions, 1 deletions
diff --git a/opendc/util/path_parser.py b/opendc/util/path_parser.py
new file mode 100644
index 00000000..2f9528b1
--- /dev/null
+++ b/opendc/util/path_parser.py
@@ -0,0 +1,39 @@
+import json
+import sys
+import re
+
+def parse(version, endpoint_path):
+    """Map an HTTP endpoint path to an API path"""
+
+    # Get possible paths
+    with open('opendc/api/{}/paths.json'.format(version)) as paths_file:
+        paths = json.load(paths_file)
+    
+    # Find API path that matches endpoint_path
+    endpoint_path_parts = endpoint_path.strip('/').split('/')
+    paths_parts = [x.split('/') for x in paths if len(x.split('/')) == len(endpoint_path_parts)]
+    path = None
+
+    for path_parts in paths_parts:
+        found = True
+        for (endpoint_part, part) in zip(endpoint_path_parts, path_parts):
+            if not part.startswith('{') and endpoint_part != part:
+                found = False
+                break
+        if found:
+            path = path_parts
+
+    if path is None:
+        return None
+
+    # Extract path parameters
+    parameters = {}
+
+    for (name, value) in zip(path, endpoint_path_parts):
+        if name.startswith('{'):
+            try:
+                parameters[name.strip('{}')] = int(value)
+            except:
+                parameters[name.strip('{}')] = value
+
+    return ('{}/{}'.format(version, '/'.join(path)), parameters)
diff --git a/opendc/util/rest.py b/opendc/util/rest.py
index 65747762..ad53f084 100644
--- a/opendc/util/rest.py
+++ b/opendc/util/rest.py
@@ -13,11 +13,14 @@ with open(sys.argv[1]) as file:
 class Request(object):
     """WebSocket message to REST request mapping."""
 
-    def __init__(self, message):
+    def __init__(self, message=None):
         """"Initialize a Request from a socket message."""
 
         # Get the Request parameters from the message
 
+        if message is None:
+            return
+
         try:
             self.message = message