about and about_url metadata options

This commit is contained in:
Simon Willison 2019-03-10 14:37:11 -07:00
commit bf6b0f918d
12 changed files with 37 additions and 2 deletions

View file

@ -267,6 +267,9 @@ class Datasette:
"license": metadata.get("license") or self.metadata("license"),
"license_url": metadata.get("license_url")
or self.metadata("license_url"),
"about": metadata.get("about") or self.metadata("about"),
"about_url": metadata.get("about_url")
or self.metadata("about_url"),
}
)

View file

@ -217,6 +217,8 @@ def plugins(all, plugins_dir):
@click.option("--license_url", help="License URL for metadata")
@click.option("--source", help="Source label for metadata")
@click.option("--source_url", help="Source URL for metadata")
@click.option("--about", help="About label for metadata")
@click.option("--about_url", help="About URL for metadata")
def package(
files,
tag,

View file

@ -42,6 +42,8 @@ def add_common_publish_arguments_and_options(subcommand):
click.option("--license_url", help="License URL for metadata"),
click.option("--source", help="Source label for metadata"),
click.option("--source_url", help="Source URL for metadata"),
click.option("--about", help="About label for metadata"),
click.option("--about_url", help="About URL for metadata"),
)):
subcommand = decorator(subcommand)
return subcommand

View file

@ -35,6 +35,8 @@ def publish_subcommand(publish):
license_url,
source,
source_url,
about,
about_url,
name,
):
fail_if_publish_binary_not_installed(
@ -72,6 +74,8 @@ def publish_subcommand(publish):
"license_url": license_url,
"source": source,
"source_url": source_url,
"about": about,
"about_url": about_url,
},
):
app_name = None

View file

@ -39,6 +39,8 @@ def publish_subcommand(publish):
license_url,
source,
source_url,
about,
about_url,
name,
force,
token,
@ -70,6 +72,8 @@ def publish_subcommand(publish):
"license_url": license_url,
"source": source,
"source_url": source_url,
"about": about,
"about_url": about_url,
},
):
now_json = {

View file

@ -21,5 +21,10 @@
<a href="{{ metadata.source_url }}">
{% endif %}{{ metadata.source or metadata.source_url }}{% if metadata.source_url %}</a>{% endif %}
{% endif %}
{% if metadata.about or metadata.about_url %}{% if metadata.license or metadata.license_url or metadata.source or metadat.source_url %}&middot;{% endif %}
About: {% if metadata.about_url %}
<a href="{{ metadata.about_url }}">
{% endif %}{{ metadata.about or metadata.about_url }}{% if metadata.about_url %}</a>{% endif %}
{% endif %}
</p>
{% endif %}

View file

@ -33,6 +33,11 @@
<a href="{{ metadata.source_url }}">
{% endif %}{{ metadata.source or metadata.source_url }}{% if metadata.source_url %}</a>{% endif %}
{% endif %}
{% if metadata.about or metadata.about_url %}&middot;
About: {% if metadata.about_url %}
<a href="{{ metadata.about_url }}">
{% endif %}{{ metadata.about or metadata.about_url }}{% if metadata.about_url %}</a>{% endif %}
{% endif %}
{% endif %}
</div>