From c1d386ef67786f07d69e566b8e054e92949a844f Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Sat, 31 Oct 2020 11:43:36 -0700
Subject: [PATCH] Refactor Urls into url_builder.py

Refs #1026
---
 datasette/app.py         | 60 +---------------------------------------
 datasette/url_builder.py | 60 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 59 deletions(-)
 create mode 100644 datasette/url_builder.py

diff --git a/datasette/app.py b/datasette/app.py
index 3a06d911..860f4563 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -40,6 +40,7 @@ from .views.special import (
 )
 from .views.table import RowView, TableView
 from .renderer import json_renderer
+from .url_builder import Urls
 from .database import Database, QueryInterrupted
 
 from .utils import (
@@ -53,7 +54,6 @@ from .utils import (
     format_bytes,
     module_from_path,
     parse_metadata,
-    path_with_format,
     resolve_env_secrets,
     sqlite3,
     to_css_class,
@@ -1280,61 +1280,3 @@ class DatasetteClient:
     async def request(self, method, path, **kwargs):
         async with httpx.AsyncClient(app=self.app) as client:
             return await client.request(method, self._fix(path), **kwargs)
-
-
-class Urls:
-    def __init__(self, ds):
-        self.ds = ds
-
-    def path(self, path, format=None):
-        if path.startswith("/"):
-            path = path[1:]
-        path = self.ds.config("base_url") + path
-        if format is not None:
-            path = path_with_format(path=path, format=format)
-        return path
-
-    def instance(self, format=None):
-        return self.path("", format=format)
-
-    def static(self, path):
-        return self.path("-/static/{}".format(path))
-
-    def static_plugins(self, plugin, path):
-        return self.path("-/static-plugins/{}/{}".format(plugin, path))
-
-    def logout(self):
-        return self.path("-/logout")
-
-    def database(self, database, format=None):
-        db = self.ds.databases[database]
-        if self.ds.config("hash_urls") and db.hash:
-            path = self.path(
-                "{}-{}".format(database, db.hash[:HASH_LENGTH]), format=format
-            )
-        else:
-            path = self.path(database, format=format)
-        return path
-
-    def table(self, database, table, format=None):
-        path = "{}/{}".format(self.database(database), urllib.parse.quote_plus(table))
-        if format is not None:
-            path = path_with_format(path=path, format=format)
-        return path
-
-    def query(self, database, query, format=None):
-        path = "{}/{}".format(self.database(database), urllib.parse.quote_plus(query))
-        if format is not None:
-            path = path_with_format(path=path, format=format)
-        return path
-
-    def row(self, database, table, row_path, format=None):
-        path = "{}/{}".format(self.table(database, table), row_path)
-        if format is not None:
-            path = path_with_format(path=path, format=format)
-        return path
-
-    def row_blob(self, database, table, row_path, column):
-        return self.table(database, table) + "/{}.blob?_blob_column={}".format(
-            row_path, urllib.parse.quote_plus(column)
-        )
diff --git a/datasette/url_builder.py b/datasette/url_builder.py
new file mode 100644
index 00000000..c1bf629b
--- /dev/null
+++ b/datasette/url_builder.py
@@ -0,0 +1,60 @@
+from .utils import path_with_format, HASH_LENGTH
+import urllib
+
+
+class Urls:
+    def __init__(self, ds):
+        self.ds = ds
+
+    def path(self, path, format=None):
+        if path.startswith("/"):
+            path = path[1:]
+        path = self.ds.config("base_url") + path
+        if format is not None:
+            path = path_with_format(path=path, format=format)
+        return path
+
+    def instance(self, format=None):
+        return self.path("", format=format)
+
+    def static(self, path):
+        return self.path("-/static/{}".format(path))
+
+    def static_plugins(self, plugin, path):
+        return self.path("-/static-plugins/{}/{}".format(plugin, path))
+
+    def logout(self):
+        return self.path("-/logout")
+
+    def database(self, database, format=None):
+        db = self.ds.databases[database]
+        if self.ds.config("hash_urls") and db.hash:
+            path = self.path(
+                "{}-{}".format(database, db.hash[:HASH_LENGTH]), format=format
+            )
+        else:
+            path = self.path(database, format=format)
+        return path
+
+    def table(self, database, table, format=None):
+        path = "{}/{}".format(self.database(database), urllib.parse.quote_plus(table))
+        if format is not None:
+            path = path_with_format(path=path, format=format)
+        return path
+
+    def query(self, database, query, format=None):
+        path = "{}/{}".format(self.database(database), urllib.parse.quote_plus(query))
+        if format is not None:
+            path = path_with_format(path=path, format=format)
+        return path
+
+    def row(self, database, table, row_path, format=None):
+        path = "{}/{}".format(self.table(database, table), row_path)
+        if format is not None:
+            path = path_with_format(path=path, format=format)
+        return path
+
+    def row_blob(self, database, table, row_path, column):
+        return self.table(database, table) + "/{}.blob?_blob_column={}".format(
+            row_path, urllib.parse.quote_plus(column)
+        )