YGGverse
/
Yoda
mirror of https://github.com/YGGverse/Yoda.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

change page update logic

CPP-GTK4
yggverse 3 months ago
parent
ab6f0cca3a
commit
88e422e225
3 changed files with 82 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/app/browser/main/tab.cpp
  2. 163
      src/app/browser/main/tab/page.cpp
  3. 6
      src/app/browser/main/tab/page.hpp

7
src/app/browser/main/tab.cpp
Unescape View File

@ -156,12 +156,7 @@ void Tab::update( @@ -156,12 +156,7 @@ void Tab::update(
);
// Update tab page component
TAB_PAGE->update(
TAB_PAGE->get_mime(),
TAB_PAGE->get_title(),
TAB_PAGE->get_description(),
TAB_PAGE->get_progress_fraction()
); // just action delegate @TODO
TAB_PAGE->update();
// Update tab label component
get_tabLabel(

163
src/app/browser/main/tab/page.cpp
Unescape View File

@ -154,20 +154,6 @@ void Page::update() @@ -154,20 +154,6 @@ void Page::update()
);
}
void Page::update(
const MIME & MIME,
const Glib::ustring & TITLE,
const Glib::ustring & DESCRIPTION,
const double & PROGRESS_FRACTION
) {
mime = MIME;
title = TITLE;
description = DESCRIPTION;
progress_fraction = PROGRESS_FRACTION;
update();
}
void Page::navigation_reload(
const bool & ADD_HISTORY
) {
@ -180,17 +166,20 @@ void Page::navigation_reload( @@ -180,17 +166,20 @@ void Page::navigation_reload(
);
}
// Update page extras
update(
MIME::UNDEFINED,
_("Update"),
Glib::ustring::sprintf(
_("Begin update for %s.."),
pageNavigation->get_request_text()
),
0
// Update page data
mime = MIME::UNDEFINED;
title = _("Update");
description = Glib::ustring::sprintf(
_("Begin update for %s.."),
pageNavigation->get_request_text()
);
progress_fraction = 0;
action__update->signal_activate();
// Connect scheme driver
if ("file" == pageNavigation->get_request_scheme())
{
@ -218,16 +207,18 @@ void Page::navigation_reload( @@ -218,16 +207,18 @@ void Page::navigation_reload(
pageNavigation->get_request_text(), 1965,
[this](const Glib::RefPtr<Gio::AsyncResult> & result)
{
update(
MIME::UNDEFINED,
_("Connect"),
Glib::ustring::sprintf(
_("Connecting to %s.."),
pageNavigation->get_request_host()
),
.25
// Update
title = _("Connect");
description = Glib::ustring::sprintf(
_("Connecting to %s.."),
pageNavigation->get_request_host()
);
progress_fraction = .25;
action__update->signal_activate();
try
{
GioSocketConnection = GioSocketClient->connect_to_uri_finish(
@ -237,12 +228,14 @@ void Page::navigation_reload( @@ -237,12 +228,14 @@ void Page::navigation_reload(
catch (const Glib::Error & EXCEPTION)
{
update(
MIME::UNDEFINED,
_("Oops"),
EXCEPTION.what(),
1
);
// Update
title = _("Oops");
description = EXCEPTION.what();
progress_fraction = 1;
action__update->signal_activate();
}
// Connection established, begin request
@ -255,34 +248,38 @@ void Page::navigation_reload( @@ -255,34 +248,38 @@ void Page::navigation_reload(
request.size(),
[this](const Glib::RefPtr<Gio::AsyncResult> & result)
{
update(
MIME::UNDEFINED,
_("Request"),
Glib::ustring::sprintf(
_("Begin request to %s.."),
pageNavigation->get_request_path().empty() ? pageNavigation->get_request_host()
: pageNavigation->get_request_path()
),
.5
// Update
title = _("Request");
description = Glib::ustring::sprintf(
_("Begin request to %s.."),
pageNavigation->get_request_path().empty() ? pageNavigation->get_request_host()
: pageNavigation->get_request_path()
);
progress_fraction = .5;
action__update->signal_activate();
// Response
GioSocketConnection->get_input_stream()->read_async( // | read_all_async
buffer,
sizeof(buffer) - 1,
[this](const Glib::RefPtr<Gio::AsyncResult> & result)
{
update(
MIME::UNDEFINED,
_("Reading"),
Glib::ustring::sprintf(
_("Reading response from %s.."),
pageNavigation->get_request_path().empty() ? pageNavigation->get_request_host()
: pageNavigation->get_request_path()
),
.75
// Update
title = _("Reading");
description = Glib::ustring::sprintf(
_("Reading response from %s.."),
pageNavigation->get_request_path().empty() ? pageNavigation->get_request_host()
: pageNavigation->get_request_path()
);
progress_fraction = .75;
action__update->signal_activate();
// Parse meta
auto meta = Glib::Regex::split_simple(
R"regex(^(\d+)?\s([\w]+\/[\w]+)?)regex",
@ -295,50 +292,52 @@ void Page::navigation_reload( @@ -295,50 +292,52 @@ void Page::navigation_reload(
// Route by mime type or path extension
if (meta[2] == "text/gemini" || Glib::str_has_suffix(pageNavigation->get_request_path(), ".gmi"))
{
update(
MIME::TEXT_GEMINI,
pageNavigation->get_request_host(), // @TODO title
// Update
mime = MIME::TEXT_GEMINI;
title = _("Parsing");
description = Glib::ustring::sprintf(
_("Parsing response from %s.."),
pageNavigation->get_request_path().empty() ? pageNavigation->get_request_host()
: pageNavigation->get_request_path()
,
1
);
pageContent->set_text_gemini(
buffer // @TODO
progress_fraction = .8;
pageContent->set_text_gemini( // @TODO
buffer
);
action__update->signal_activate();
}
else
{
update(
MIME::UNDEFINED,
_("Oops"),
_("MIME type not supported"),
1
);
// Update
title = _("Oops");
pageContent->set_text_plain( // @TODO
description
);
description = _("MIME type not supported");
progress_fraction = 1;
action__update->signal_activate();
}
}
else
{
update(
MIME::UNDEFINED,
_("Oops"),
Glib::ustring::sprintf(
_("Response code %s not supported"),
meta[1]
),
1
);
// Update
title = _("Oops");
pageContent->set_text_plain( // @TODO
description
description = Glib::ustring::sprintf(
_("Response code %s not supported"),
meta[1]
);
progress_fraction = 1;
action__update->signal_activate();
}
GioSocketConnection->close();

6
src/app/browser/main/tab/page.hpp
Unescape View File

@ -127,12 +127,6 @@ namespace app::browser::main::tab @@ -127,12 +127,6 @@ namespace app::browser::main::tab
);
void update();
void update(
const MIME & MIME,
const Glib::ustring & TITLE,
const Glib::ustring & DESCRIPTION,
const double & PROGRESS_FRACTION
);
void navigation_reload(
const bool & ADD_HISTORY

Write Preview
Loading…
Cancel
Save