configurable couchdb url

NyanCAD · Aug 30, 2022 · f90b73c · f90b73c
1 parent 11ed9cd
commit f90b73c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/pyttoresque/app/__init__.py b/pyttoresque/app/__init__.py
@@ -7,16 +7,13 @@
 from jupyter_server.extension.handler import ExtensionHandlerJinjaMixin, ExtensionHandlerMixin
 from jupyter_server.extension.application import ExtensionApp, ExtensionAppJinjaMixin
 from tornado.web import addslash
-from traitlets import Bool
-from shutil import which
+from traitlets import Unicode
 from configparser import ConfigParser
 from secrets import token_hex
 from base64 import b64encode
 
 HERE = os.path.dirname(__file__)
 
-has_couchdb = bool(which("couchdb"))
-
 class LibmanHandler(ExtensionHandlerJinjaMixin, ExtensionHandlerMixin, JupyterHandler):
     @addslash
     def get(self):
@@ -25,7 +22,8 @@ def get(self):
                 "libman.html",
                 static=self.static_url,
                 token=self.settings["token"],
-                couchdb=has_couchdb,
+                couchdb=self.settings['mosaic_config']['couchdb'],
+                couchdb_sync=self.settings['mosaic_config']['couchdb_sync'],
             )
         )
 
@@ -37,7 +35,8 @@ def get(self):
                 "editor.html",
                 static=self.static_url,
                 token=self.settings["token"],
-                couchdb=has_couchdb,
+                couchdb=self.settings['mosaic_config']['couchdb'],
+                couchdb_sync=self.settings['mosaic_config']['couchdb_sync'],
             )
         )
 
@@ -46,6 +45,9 @@ class Mosaic(ExtensionAppJinjaMixin, ExtensionApp):
     default_url = "/mosaic"
     static_paths = [os.path.join(HERE, "static")]
     template_paths = [os.path.join(HERE, "templates")]
+
+    couchdb = Unicode("proxy", help="CouchDB URL to use").tag(config=True)
+    couchdb_sync = Unicode(help="Remote CouchDB URL to synch PouchDB with").tag(config=True)
 
     def initialize_settings(self):
         super().initialize_settings()
@@ -77,7 +79,7 @@ def command(port):
         # so we have to use a persistent file
         with open(tmpl, 'w') as f:
             cp.write(f)
-        cmd = ['couchdb', '-couch_ini', tf.name]
+        cmd = ['couchdb', '-couch_ini', tmpl]
         if os.name == 'nt':
             cmd = ["cmd.exe", "/c"] + cmd
         return cmd

diff --git a/pyttoresque/app/templates/editor.html b/pyttoresque/app/templates/editor.html
@@ -29,8 +29,13 @@
 <body>
   <div id="mosaic_editor"></div>
   <script>
-    {% if couchdb %}
-    window.dburl = new URL("/couchdb/", window.location).href
+    {% if couchdb=="proxy" %}
+    window.dburl = new URL("../../couchdb/", window.location).href
+    {% elif couchdb %}
+    window.dburl = "{{ couchdb }}"
+    {% endif %}
+    {% if couchdb_sync %}
+    window.default_sync = "{{ couchdb_sync }}"
     {% endif %}
     window.notebookurl = "../../lab"
     window.simulatorurl = "../../panel/app"

diff --git a/pyttoresque/app/templates/libman.html b/pyttoresque/app/templates/libman.html
@@ -29,8 +29,13 @@
 <body>
   <div id="mosaic_libman"></div>
   <script>
-    {% if couchdb %}
-    window.dburl = new URL("/couchdb/", window.location).href
+    {% if couchdb=="proxy" %}
+    window.dburl = new URL("../couchdb/", window.location).href
+    {% elif couchdb %}
+    window.dburl = "{{ couchdb }}"
+    {% endif %}
+    {% if couchdb_sync %}
+    window.default_sync = "{{ couchdb_sync }}"
     {% endif %}
   </script>
   <script src="{{ static_url('common.js') }}"></script>