diff --git a/datasette/templates/table.html b/datasette/templates/table.html index c841e1be..6fa1781b 100644 --- a/datasette/templates/table.html +++ b/datasette/templates/table.html @@ -124,7 +124,7 @@

✎ View and edit SQL

{% endif %} -

This data as {% for name, url in renderers.items() %}{{ name }}{{ ", " if not loop.last }}{% endfor %}{% if display_rows %}, CSV (advanced){% endif %}

+

This data as {% for name, url in renderers.items() %}{{ name }}{{ ", " if not loop.last }}{% endfor %}{% if display_rows %}, CSV (advanced), Markdown (advanced){% endif %}

{% if suggested_facets %} {% include "_suggested_facets.html" %} @@ -186,6 +186,20 @@ window._setColumnTypeData = {{ set_column_type_ui|tojson }}; {% endfor %}

+
+
+

+ Markdown options: + {% if expandable_columns %}{% endif %} + {% if next_url and settings.allow_csv_stream %}{% endif %} + + + {% for key, value in url_markdown_hidden_args %} + + {% endfor %} +

+
+
{% endif %} diff --git a/datasette/views/base.py b/datasette/views/base.py index 08e9c6a5..c3a36f5a 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -206,16 +206,21 @@ class DataView(BaseView): async def as_csv(self, request, database): return await stream_csv(self.ds, self.data, request, database) + async def as_markdown(self, request, database): + return await stream_markdown(self.ds, self.data, request, database) + async def get(self, request): db = await self.ds.resolve_database(request) database = db.name database_route = db.route - _format = request.url_vars["format"] + _format = request.url_vars["format"] or request.args.get("_format") data_kwargs = {} if _format == "csv": return await self.as_csv(request, database_route) + elif _format == "markdown": + return await self.as_markdown(request, database_route) if _format is None: # HTML views default to expanding all foreign key labels diff --git a/datasette/views/database.py b/datasette/views/database.py index 44d24fb9..10018afc 100644 --- a/datasette/views/database.py +++ b/datasette/views/database.py @@ -40,7 +40,7 @@ from . import Context class DatabaseView(View): async def get(self, request, datasette): - format_ = request.url_vars.get("format") or "html" + format_ = request.url_vars.get("format") or request.args.get("_format") or "html" await datasette.refresh_schemas() @@ -591,7 +591,7 @@ class QueryView(View): if params.get("_timelimit"): extra_args["custom_time_limit"] = int(params["_timelimit"]) - format_ = request.url_vars.get("format") or "html" + format_ = request.url_vars.get("format") or request.args.get("_format") or "html" query_error = None results = None diff --git a/datasette/views/table.py b/datasette/views/table.py index 0930d3a0..82844774 100644 --- a/datasette/views/table.py +++ b/datasette/views/table.py @@ -976,7 +976,7 @@ async def table_view_traced(datasette, request): if request.method == "POST": return Response.text("Method not allowed", status=405) - format_ = request.url_vars.get("format") or "html" + format_ = request.url_vars.get("format") or request.args.get("_format") or "html" extra_extras = None context_for_html_hack = False default_labels = False @@ -2072,6 +2072,12 @@ async def table_view_data( path_with_format(request=request, format="csv", extra_qs=url_csv_args) ) url_csv_path = url_csv.split("?")[0] + # Markdown export URL + url_markdown_args = {**url_labels_extra} + url_markdown = datasette.urls.path( + path_with_format(request=request, format="markdown", extra_qs=url_markdown_args) + ) + url_markdown_path = url_markdown.split("?")[0] data.update( { "url_csv": url_csv, @@ -2082,6 +2088,13 @@ async def table_view_data( if key not in ("_labels", "_facet", "_size") ] + [("_size", "max")], + "url_markdown": url_markdown, + "url_markdown_path": url_markdown_path, + "url_markdown_hidden_args": [ + (key, value) + for key, value in urllib.parse.parse_qsl(request.query_string) + if key not in ("_labels", "_facet", "_size", "_max_rows") + ], } ) # if no sort specified AND table has a single primary key, diff --git a/test.md b/test.md new file mode 100644 index 00000000..1f8623cf --- /dev/null +++ b/test.md @@ -0,0 +1,1564 @@ + + + + big: logs: 5,000 rows + + + + + + + + + + + + +
+
+ + + + + + + +
+ +
+

logs

+
+ + + + + + + + + + + +

+ 5,000 rows + +

+ + +
+ + +
+
+ +
+ +
+
+
+ +
+ +
+ + + + + + +
+
+ + + + +

✎ View and edit SQL

+ + +

This data as json, CSV (advanced)

+ + + + + + +
+ +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Link + + + + + rowid ▼ + + + + + + id + + + + + + message + + +
11 Log message number 1
22 Log message number 2
33 Log message number 3
44 Log message number 4
55 Log message number 5
66 Log message number 6
77 Log message number 7
88 Log message number 8
99 Log message number 9
1010 Log message number 10
1111 Log message number 11
1212 Log message number 12
1313 Log message number 13
1414 Log message number 14
1515 Log message number 15
1616 Log message number 16
1717 Log message number 17
1818 Log message number 18
1919 Log message number 19
2020 Log message number 20
2121 Log message number 21
2222 Log message number 22
2323 Log message number 23
2424 Log message number 24
2525 Log message number 25
2626 Log message number 26
2727 Log message number 27
2828 Log message number 28
2929 Log message number 29
3030 Log message number 30
3131 Log message number 31
3232 Log message number 32
3333 Log message number 33
3434 Log message number 34
3535 Log message number 35
3636 Log message number 36
3737 Log message number 37
3838 Log message number 38
3939 Log message number 39
4040 Log message number 40
4141 Log message number 41
4242 Log message number 42
4343 Log message number 43
4444 Log message number 44
4545 Log message number 45
4646 Log message number 46
4747 Log message number 47
4848 Log message number 48
4949 Log message number 49
5050 Log message number 50
5151 Log message number 51
5252 Log message number 52
5353 Log message number 53
5454 Log message number 54
5555 Log message number 55
5656 Log message number 56
5757 Log message number 57
5858 Log message number 58
5959 Log message number 59
6060 Log message number 60
6161 Log message number 61
6262 Log message number 62
6363 Log message number 63
6464 Log message number 64
6565 Log message number 65
6666 Log message number 66
6767 Log message number 67
6868 Log message number 68
6969 Log message number 69
7070 Log message number 70
7171 Log message number 71
7272 Log message number 72
7373 Log message number 73
7474 Log message number 74
7575 Log message number 75
7676 Log message number 76
7777 Log message number 77
7878 Log message number 78
7979 Log message number 79
8080 Log message number 80
8181 Log message number 81
8282 Log message number 82
8383 Log message number 83
8484 Log message number 84
8585 Log message number 85
8686 Log message number 86
8787 Log message number 87
8888 Log message number 88
8989 Log message number 89
9090 Log message number 90
9191 Log message number 91
9292 Log message number 92
9393 Log message number 93
9494 Log message number 94
9595 Log message number 95
9696 Log message number 96
9797 Log message number 97
9898 Log message number 98
9999 Log message number 99
100100 Log message number 100
+
+ + + + +

Next page

+ + + +
+

Advanced export

+

JSON shape: + default, + array, + newline-delimited +

+
+

+ CSV options: + + + + + + + + + +

+
+
+ + + + 
CREATE TABLE logs (id int, message text);
+ + + + + + + + + +
+
+ + + + + + + + + + + \ No newline at end of file