Load the twtxt config at CLI init

This commit is contained in:
Lucidiot 2019-10-01 07:58:49 +02:00
parent d0173641ef
commit 6b4ce6106f
Signed by: lucidiot
GPG Key ID: 3358C1CA6906FB8D
2 changed files with 21 additions and 20 deletions

View File

@ -13,11 +13,16 @@ import click
@click.option('-k', '--insecure', is_flag=True)
@click.option('-f', '--format',
type=click.Choice(output.registry.keys()),
default='raw')
default='pretty')
@click.pass_context
def cli(ctx, registry_url, insecure, format):
ctx.obj = Namespace()
try:
ctx.obj.conf = Config.discover()
except ValueError:
ctx.obj.conf = Namespace()
scheme, netloc, path, query, fragment = urlsplit(registry_url)
if not scheme:
scheme = 'https'

View File

@ -1,6 +1,6 @@
import urllib
import click
import requests
from twtxt.config import Config
class RegistryClient(object):
@ -12,12 +12,8 @@ class RegistryClient(object):
from twtxt_registry_client import __version__
if disclose_identity or disclose_identity is None:
try:
config = Config.discover()
except ValueError:
disclose_identity = False
else:
disclose_identity = config.disclose_identity
config = click.get_current_context().obj.conf
disclose_identity = config.get('disclose_identity', False)
if disclose_identity:
user_agent = 'twtxt-registry/{} (+{}; @{})'.format(