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

Tooltip and commas for byte length display, closes #1712

Browse source
This commit is contained in:
Simon Willison 2022-04-12 11:44:12 -07:00
commit 0bc5186b7b
3 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
datasette/views/database.py
View file

@ -11,6 +11,7 @@ from datasette.utils import (
add_cors_headers,
await_me_maybe,
derive_named_parameters,
format_bytes,
tilde_decode,
to_css_class,
validate_sql_select,
@ -399,13 +400,18 @@ class QueryView(DataView):
).hexdigest(),
},
)
display_value = Markup(
'<a class="blob-download" href="{}">&lt;Binary:&nbsp;{}&nbsp;byte{}&gt;</a>'.format(
formatted = format_bytes(len(value))
display_value = markupsafe.Markup(
'<a class="blob-download" href="{}"{}>&lt;Binary:&nbsp;{:,}&nbsp;byte{}&gt;</a>'.format(
blob_url,
len(display_value),
' title="{}"'.format(formatted)
if "bytes" not in formatted
else "",
len(value),
"" if len(value) == 1 else "s",
)
)
display_row.append(display_value)
display_rows.append(display_row)

8
datasette/views/table.py
View file

@ -12,10 +12,12 @@ from datasette.utils import (
MultiParams,
append_querystring,
compound_keys_after_sql,
format_bytes,
tilde_decode,
tilde_encode,
escape_sqlite,
filters_should_redirect,
format_bytes,
is_url,
path_from_row_pks,
path_with_added_args,
@ -175,14 +177,18 @@ class RowTableShared(DataView):
if plugin_display_value:
display_value = plugin_display_value
elif isinstance(value, bytes):
formatted = format_bytes(len(value))
display_value = markupsafe.Markup(
'<a class="blob-download" href="{}">&lt;Binary:&nbsp;{}&nbsp;byte{}&gt;</a>'.format(
'<a class="blob-download" href="{}"{}>&lt;Binary:&nbsp;{:,}&nbsp;byte{}&gt;</a>'.format(
self.ds.urls.row_blob(
database,
table,
path_from_row_pks(row, pks, not pks),
column,
),
' title="{}"'.format(formatted)
if "bytes" not in formatted
else "",
len(value),
"" if len(value) == 1 else "s",
)