# HG changeset patch
# User drewp@bigasterisk.com
# Date 2023-05-19 20:59:07
# Node ID 891c380afcc111915cea9c9e1ed71d0ec8c4023e
# Parent  f239dedb025a1541ecd136b3a3499c55eef42d6c

move py code under light9, add import test

diff --git a/bin/homepage b/bin/homepage
--- a/bin/homepage
+++ b/bin/homepage
@@ -4,7 +4,7 @@ CONF=/tmp/light9_nginx.conf
 ROOT=`dirname $0`/..
 ROOT=${ROOT:a}
 
-bin/homepageConfig > /tmp/light9_nginx_routes.conf && \
+bin/python light9/homepage/write_config.py /tmp/light9_nginx_routes.conf && \
 cat > $CONF <<EOF
 worker_processes 1;
 
@@ -32,7 +32,6 @@ http {
  }
 }
 EOF
-head -1 /tmp/light9_nginx_routes.conf
 pnpm vite -c light9/homepage/vite.config.ts &
 /usr/sbin/nginx -c $CONF
 wait
diff --git a/bin/homepageConfig b/light9/homepage/write_config.py
rename from bin/homepageConfig
rename to light9/homepage/write_config.py
--- a/bin/homepageConfig
+++ b/light9/homepage/write_config.py
@@ -1,62 +1,73 @@
-#!bin/python
-from run_local import log
-from light9 import showconfig
-from light9.namespaces import L9
+import sys
 from urllib.parse import urlparse
 
-log.info('generating config')
-graph = showconfig.getGraph()
-
-netHome = graph.value(showconfig.showUri(), L9['networking'])
-webServer = graph.value(netHome, L9['webServer'])
-if not webServer:
-    raise ValueError('no %r :webServer' % netHome)
-print("listen %s;" % urlparse(webServer).port)
+from light9 import showconfig
+from light9.namespaces import L9
+from light9.run_local import log
 
 
-def location(path, server, viteServer):
-    print(f"""
+def main():
+    [outPath] = sys.argv[1:]
+
+    log.info('generating config')
+    graph = showconfig.getGraph()
+    netHome = graph.value(showconfig.showUri(), L9['networking'])
+    webServer = graph.value(netHome, L9['webServer'])
+    if not webServer:
+        raise ValueError('no %r :webServer' % netHome)
 
-    location = /{path}/metrics {{
-      rewrite ^/{path}(/.*) $1 break;
-      proxy_pass {server}; 
-    }}
+    with open(outPath, 'wt') as out:
+        line = "listen %s;" % urlparse(str(webServer)).port
+        print(line, file=out)
+        log.info(line)
+
+        def location(path, server, viteServer):
+            print(f"""
 
-    location /{path}/api/ {{
-      # just the tail part for services
-      rewrite ^/{path}/api(/.*) $1 break;
-      proxy_pass {server}; 
+        location = /{path}/metrics {{
+          rewrite ^/{path}(/.*) $1 break;
+          proxy_pass {server}; 
+        }}
+
+        location /{path}/api/ {{
+          # just the tail part for services
+          rewrite ^/{path}/api(/.*) $1 break;
+          proxy_pass {server}; 
 
-      # for websocket
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_set_header Host $host;
+          # for websocket
+          proxy_http_version 1.1;
+          proxy_set_header Upgrade $http_upgrade;
+          proxy_set_header Connection "upgrade";
+          proxy_set_header Host $host;
+
+          proxy_buffering off;
 
-      proxy_buffering off;
+        }}
+        location /{path}/ {{
+          # vite has 'base' to deal with the /{path}/ part of the request
+          proxy_pass {viteServer}; 
+        }}
+
+        """,
+                  file=out)
 
-    }}
-    location /{path}/ {{
-      # vite has 'base' to deal with the /{path}/ part of the request
-      proxy_pass {viteServer}; 
-    }}
+        for role, server in sorted(graph.predicate_objects(netHome)):
+            if not str(server).startswith('http') or role == L9['webServer']:
+                continue
+            path = graph.value(role, L9['urlPath'])
+            if not path:
+                continue
+            server = str(server).rstrip('/')
+            viteServer = server.replace('82', '83')  # rewrite this please
+            location(path, server, viteServer)
 
-    """)
+        showPath = showconfig.showUri().split('/', 3)[-1]
+        root = showconfig.root()[:-len(showPath)].decode('ascii')
+        print(f"""
+        location /{showPath} {{
+          root {root};
+        }}""", file=out)
 
 
-for role, server in sorted(graph.predicate_objects(netHome)):
-    if not server.startswith('http') or role == L9['webServer']:
-        continue
-    path = graph.value(role, L9['urlPath'])
-    if not path:
-        continue
-    server = server.rstrip('/')
-    viteServer = server.replace('82', '83') # rewrite this please
-    location(path, server, viteServer)
-
-showPath = showconfig.showUri().split('/', 3)[-1]
-root = showconfig.root()[:-len(showPath)].decode('ascii')
-print(f"""
-    location /{showPath} {{
-      root {root};
-    }}""")
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/light9/homepage/write_config_test.py b/light9/homepage/write_config_test.py
new file mode 100644
--- /dev/null
+++ b/light9/homepage/write_config_test.py
@@ -0,0 +1,3 @@
+def test_import():
+    import write_config
+    # no crash