diff --git a/doc/rvctl.md b/doc/rvctl.md index 1a88b11..c52c468 100644 --- a/doc/rvctl.md +++ b/doc/rvctl.md @@ -312,9 +312,9 @@ remotes1 urls1 items -itemsourceendpointremotekindusertokenresultstatus -1repohttp://77.90.8.171:3001r1authu1remoteexistingin_sync -1tokens.jsonhttp://77.90.8.171:3001storeu1t1presentin_sync +itemsourceremotekindusertokenresultstatusurl +1repor1authu1remoteexistingin_synchttp://77.90.8.171:3001 +1tokens.jsonstoreu1t1presentin_synchttp://77.90.8.171:3001 ``` Jesli remote istnieje, ale ma URL bez `LOGIN:TOKEN@`, wynik bedzie mial @@ -383,9 +383,9 @@ repo_root... token_path... items -itemsourceendpointremotekindusertokenresultstatus -1repohttp://77.90.8.171:3001r1plainno_credentialsstore_ahead -1tokens.jsonhttp://77.90.8.171:3001storeu1t1presentstore_ahead +itemsourceremotekindusertokenresultstatusurl +1repor1plainno_credentialsstore_aheadhttp://77.90.8.171:3001 +1tokens.jsonstoreu1t1presentstore_aheadhttp://77.90.8.171:3001 status itemvalue diff --git a/doc/tokens.md b/doc/tokens.md index cbed284..7c1da76 100644 --- a/doc/tokens.md +++ b/doc/tokens.md @@ -96,13 +96,13 @@ Kolumny w tabeli `items`: - `item` - numer porownywanego endpointu - `source` - `repo` albo `tokens.json` -- `endpoint` - serwer bez sekretu, na przyklad `http://77.90.8.171:3001` - `remote` - nazwa remote, na przyklad `r1`; tylko dla `source=repo` - `kind` - `auth`, `plain`, `store` albo `missing` - `user` - login odczytany z URL albo ze store - `token` - `remote` dla tokenu w URL albo nazwa tokenu ze store, na przyklad `t1` - `result` - `added`, `existing`, `present`, `no_credentials` albo `missing` - `status` - relacja repo do `tokens.json`, na przyklad `in_sync` albo `store_ahead` +- `url` - endpoint serwera bez sekretu, trzymany jako ostatnia kolumna Przyklad: diff --git a/rvctl.py b/rvctl.py index 699e755..436906c 100644 --- a/rvctl.py +++ b/rvctl.py @@ -682,7 +682,7 @@ def print_token_item_rows( scan_rows_by_endpoint.setdefault(endpoint, []).append(row) print("items") - print("item\tsource\tendpoint\tremote\tkind\tuser\ttoken\tresult\tstatus") + print("item\tsource\tremote\tkind\tuser\ttoken\tresult\tstatus\turl") for index, endpoint in enumerate(endpoint_names, start=1): item_id = str(index) repo_entry = repo_servers.get(endpoint) @@ -696,11 +696,11 @@ def print_token_item_rows( for row in repo_rows: token_label = "remote" if row["url_kind"] == "auth" else "" print( - f"{item_id}\trepo\t{endpoint}\t{row['remote']}\t{row['url_kind']}\t" - f"{row['user']}\t{token_label}\t{row['result']}\t{status_name}" + f"{item_id}\trepo\t{row['remote']}\t{row['url_kind']}\t" + f"{row['user']}\t{token_label}\t{row['result']}\t{status_name}\t{endpoint}" ) elif repo_entry is None: - print(f"{item_id}\trepo\t{endpoint}\t\tmissing\t\t\tmissing\t{status_name}") + print(f"{item_id}\trepo\t\tmissing\t\t\tmissing\t{status_name}\t{endpoint}") else: repo_kind, repo_result = repo_result_for_entry(repo_entry) remote_names = ",".join(sorted(repo_entry.get("remotes", set()))) @@ -708,28 +708,28 @@ def print_token_item_rows( if repo_users: for user_name, _ in repo_users: print( - f"{item_id}\trepo\t{endpoint}\t{remote_names}\t{repo_kind}\t" - f"{user_name}\tremote\t{repo_result}\t{status_name}" + f"{item_id}\trepo\t{remote_names}\t{repo_kind}\t" + f"{user_name}\tremote\t{repo_result}\t{status_name}\t{endpoint}" ) else: print( - f"{item_id}\trepo\t{endpoint}\t{remote_names}\t{repo_kind}\t\t\t" - f"{repo_result}\t{status_name}" + f"{item_id}\trepo\t{remote_names}\t{repo_kind}\t\t\t" + f"{repo_result}\t{status_name}\t{endpoint}" ) if store_entry is None: - print(f"{item_id}\ttokens.json\t{endpoint}\t\tmissing\t\t\tmissing\t{status_name}") + print(f"{item_id}\ttokens.json\t\tmissing\t\t\tmissing\t{status_name}\t{endpoint}") continue store_users = token_name_rows(store_entry.get("users", {})) if not store_users: - print(f"{item_id}\ttokens.json\t{endpoint}\t\tstore\t\t\tempty\t{status_name}") + print(f"{item_id}\ttokens.json\t\tstore\t\t\tempty\t{status_name}\t{endpoint}") continue for user_name, token_name in store_users: print( - f"{item_id}\ttokens.json\t{endpoint}\t\tstore\t{user_name}\t" - f"{token_name}\tpresent\t{status_name}" + f"{item_id}\ttokens.json\t\tstore\t{user_name}\t" + f"{token_name}\tpresent\t{status_name}\t{endpoint}" ) return status_counts