edu/stem-launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show endpoint port in host column

Browse Source
This commit is contained in:
mpabi
2026-04-26 20:53:33 +02:00
parent 6e065dbd08
commit f6f257aed5
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/rvctl.md
+6 -6
View File
@@ -304,9 +304,9 @@ Typowy wynik:
```text ```text
tokens tokens
item server proto host port org repo user remote token_ref token valid scope org repo item server proto host org repo user remote token_ref token valid scope org repo
---- ------ ----- ------------- ----- --------- ----------- ---- ------ --------- ------------ ----- awrop- oawrc- oawr-- ---- ------ ----- ------------------ --------- ----------- ---- ------ --------- ------------ ----- awrop- oawrc- oawr--
1 gitea http 77.90.8.171 3001 edu-tools rv-launcher u1 r1 t1 * e59cc...13be + +---+ +++++ ++++ 1 gitea http 77.90.8.171:3001 edu-tools rv-launcher u1 r1 t1 * e59cc...13be + +---+ +++++ ++++
``` ```
`token_ref` jest komorka stalej szerokosci: nazwa tokena jest po lewej, a marker `token_ref` jest komorka stalej szerokosci: nazwa tokena jest po lewej, a marker
@@ -383,9 +383,9 @@ repo_root<TAB>...
token_path<TAB>... token_path<TAB>...
tokens tokens
item server proto host port org repo user remote token_ref token valid scope org repo item server proto host org repo user remote token_ref token valid scope org repo
---- ------ ----- ------------- ----- --------- ----------- ---- ------ --------- ------------ ----- awrop- oawrc- oawr-- ---- ------ ----- ------------------ --------- ----------- ---- ------ --------- ------------ ----- awrop- oawrc- oawr--
1 gitea http 77.90.8.171 3001 edu-tools rv-launcher u1 r1 t1 * e59cc...13be + +---+ +++++ ++++ 1 gitea http 77.90.8.171:3001 edu-tools rv-launcher u1 r1 t1 * e59cc...13be + +---+ +++++ ++++
status status
item<TAB>value item<TAB>value
doc/tokens.md
+1 -2
View File
@@ -105,8 +105,7 @@ Kolumny w tabeli `tokens`:
- `item` - numer wiersza tokena - `item` - numer wiersza tokena
- `server` - typ serwera, na przyklad `gitea` - `server` - typ serwera, na przyklad `gitea`
- `proto` - protokol endpointu, na przyklad `http` - `proto` - protokol endpointu, na przyklad `http`
- `host` - host endpointu, na przyklad `77.90.8.171` - `host` - host endpointu razem z portem, na przyklad `77.90.8.171:3001`
- `port` - port endpointu, na przyklad `3001`
- `org` - organizacja z remote URL - `org` - organizacja z remote URL
- `repo` - repo z remote URL - `repo` - repo z remote URL
- `user` - login wlasciciela tokena - `user` - login wlasciciela tokena
rvctl.py
+3 -3
View File
@@ -717,8 +717,7 @@ TOKEN_COLUMNS = [
("item", "item", 4), ("item", "item", 4),
("server", "server", 6), ("server", "server", 6),
("proto", "proto", 5), ("proto", "proto", 5),
("host", "host", 13), ("host", "host", 18),
("port", "port", 5),
("owner", "org", 9), ("owner", "org", 9),
("repo_name", "repo", 11), ("repo_name", "repo", 11),
("user", "user", 4), ("user", "user", 4),
@@ -792,6 +791,8 @@ def endpoint_column_values(endpoint: str, repo_entry: dict | None, store_entry:
values["host"] = values["host"] or (split_endpoint.hostname or "") values["host"] = values["host"] or (split_endpoint.hostname or "")
if not values["port"] and split_endpoint.port is not None: if not values["port"] and split_endpoint.port is not None:
values["port"] = str(split_endpoint.port) values["port"] = str(split_endpoint.port)
if values["host"] and values["port"]:
values["host"] = f"{values['host']}:{values['port']}"
return values return values
@@ -1032,7 +1033,6 @@ def print_token_item_rows(
"server": endpoint_values["server"], "server": endpoint_values["server"],
"proto": endpoint_values["scheme"], "proto": endpoint_values["scheme"],
"host": endpoint_values["host"], "host": endpoint_values["host"],
"port": endpoint_values["port"],
"owner": owner, "owner": owner,
"repo_name": repo_name, "repo_name": repo_name,
"user": user_name, "user": user_name,