github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix /-/tables endpoint: add .json support and correct response format

Browse source
This commit is contained in:
Simon Willison 2025-10-23 15:28:37 -07:00
commit 8e47f99874
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/app.py
View file

@ -1885,7 +1885,7 @@ class Datasette:
) )
add_route( add_route(
TablesView.as_view(self), TablesView.as_view(self),
r"/-/tables$", r"/-/tables(\.(?P<format>json))?$",
) )
add_route( add_route(
LogoutView.as_view(self), LogoutView.as_view(self),

33
datasette/views/special.py
View file

@ -941,33 +941,38 @@ class TablesView(BaseView):
has_json_alternate = False has_json_alternate = False
async def get(self, request): async def get(self, request):
# Get search query parameter
q = request.args.get("q", "").strip()
# Only return matches if there's a non-empty search query
if not q:
return Response.json({"matches": []})
# Use the new allowed_resources() method # Use the new allowed_resources() method
tables = await self.ds.allowed_resources("view-table", request.actor) tables = await self.ds.allowed_resources("view-table", request.actor)
# Convert to list of matches with name and url # Convert to list of matches with name and url
matches = [ matches = [
{ {
"name": f"{table.parent}/{table.child}", "name": f"{table.parent}: {table.child}",
"url": self.ds.urls.table(table.parent, table.child), "url": self.ds.urls.table(table.parent, table.child),
} }
for table in tables for table in tables
] ]
# Apply search filter if q parameter is present # Apply search filter
q = request.args.get("q", "").strip() import re
if q:
import re
# Split search terms by whitespace # Split search terms by whitespace
terms = q.split() terms = q.split()
# Build regex pattern: .*term1.*term2.*term3.* # Build regex pattern: .*term1.*term2.*term3.*
pattern = ".*" + ".*".join(re.escape(term) for term in terms) + ".*" pattern = ".*" + ".*".join(re.escape(term) for term in terms) + ".*"
regex = re.compile(pattern, re.IGNORECASE) regex = re.compile(pattern, re.IGNORECASE)
# Filter tables matching the pattern (extract table name from "db/table") # Filter tables matching the pattern (extract table name from "db: table")
matches = [m for m in matches if regex.match(m["name"].split("/", 1)[1])] matches = [m for m in matches if regex.match(m["name"].split(": ", 1)[1])]
# Sort by shortest table name first # Sort by shortest table name first
matches.sort(key=lambda m: len(m["name"].split("/", 1)[1])) matches.sort(key=lambda m: len(m["name"].split(": ", 1)[1]))
return Response.json({"matches": matches}) return Response.json({"matches": matches})