Browse Source

add base url macros support in status tray

main
yggverse 2 months ago
parent
commit
c489fe4be1
  1. 2
      composer.json
  2. 2
      config.json
  3. 31
      src/Entity/Tab/Page.php

2
composer.json

@ -6,7 +6,7 @@
"type": "project", "type": "project",
"require": { "require": {
"yggverse/gemini": "^0.9", "yggverse/gemini": "^0.9",
"yggverse/net": "^1.7" "yggverse/net": "dev-main"
}, },
"license": "MIT", "license": "MIT",
"autoload": { "autoload": {

2
config.json

@ -141,7 +141,7 @@
{ {
"open": "open":
{ {
"complete":"{TIME_C} | {RESPONSE_META} | {RESPONSE_LENGTH} bytes | {RESPONSE_SECONDS} seconds" "complete":"{REQUEST_BASE_URL} | {TIME_C} | {RESPONSE_META} | {RESPONSE_LENGTH} bytes | {RESPONSE_SECONDS} seconds"
} }
} }
} }

31
src/Entity/Tab/Page.php

@ -339,6 +339,16 @@ class Page
$this->status = new \GtkLabel; $this->status = new \GtkLabel;
$this->status->connect(
'activate-link',
function ($label, $href)
{
$this->open(
$href
);
}
);
$this->footer->add( $this->footer->add(
$this->status $this->status
); );
@ -591,20 +601,33 @@ class Page
$this->status->set_markup( $this->status->set_markup(
str_replace( // Custom macros mask from config.json str_replace( // Custom macros mask from config.json
[ [
'{NAVIGATION_ADDRESS}',
'{TIME_C}', '{TIME_C}',
'{REQUEST_BASE}',
'{REQUEST_BASE_URL}',
'{RESPONSE_CODE}', '{RESPONSE_CODE}',
'{RESPONSE_META}', '{RESPONSE_META}',
'{RESPONSE_LENGTH}', '{RESPONSE_LENGTH}',
'{RESPONSE_SECONDS}' '{RESPONSE_SECONDS}'
], ],
[ [
urlencode(
$url
),
date( date(
'c' 'c'
), ),
$origin->getHost(),
sprintf(
'<a href="%s">%s</a>',
$origin->get(
true, // scheme
true, // user
true, // pass
true, // host
true, // port
false, // path
false, // query
false // fragment
),
$origin->getHost()
),
$response->getCode(), $response->getCode(),
($code ? sprintf('%d:', $code) : '') ($code ? sprintf('%d:', $code) : '')
. .

Loading…
Cancel
Save