diff options
author | kleines Filmröllchen <filmroellchen@serenityos.org> | 2022-12-14 17:12:44 +0100 |
---|---|---|
committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-01-02 06:15:13 -0700 |
commit | 2aa374eba10af52d4a9b941fe6d4f778e2d3dbd3 (patch) | |
tree | 08b26af4f3df472d999d9776026656c3a0e47091 /Userland/Applications | |
parent | a676cf658b968794a906ac1d5d61268eb69677e5 (diff) | |
download | serenity-2aa374eba10af52d4a9b941fe6d4f778e2d3dbd3.zip |
Help+LibManual: Move URL handling to LibManual
Diffstat (limited to 'Userland/Applications')
-rw-r--r-- | Userland/Applications/Help/MainWidget.cpp | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/Userland/Applications/Help/MainWidget.cpp b/Userland/Applications/Help/MainWidget.cpp index 6bf581e094..0cc07ee684 100644 --- a/Userland/Applications/Help/MainWidget.cpp +++ b/Userland/Applications/Help/MainWidget.cpp @@ -116,35 +116,15 @@ MainWidget::MainWidget() return; open_page(string_path.value()); } else if (url.scheme() == "help") { - if (url.host() == "man") { - if (url.paths().size() != 2) { - dbgln("Bad help page URL '{}'", url); - return; - } - auto const section = url.paths()[0]; - auto maybe_section_number = section.to_uint(); - if (!maybe_section_number.has_value()) { - dbgln("Bad section number '{}'", section); - return; - } - auto section_number = maybe_section_number.value(); - auto page = String::from_utf8(url.paths()[1]); - if (page.is_error()) - return; - - auto const page_object = try_make_ref_counted<Manual::PageNode>(Manual::sections[section_number - 1], page.release_value()); - if (page_object.is_error()) - return; - auto const maybe_path = page_object.value()->path(); - if (maybe_path.is_error()) - return; - - auto path = maybe_path.value().to_deprecated_string(); - m_history.push(path); - open_url(URL::create_with_file_scheme(path, url.fragment())); - } else { - dbgln("Bad help operation '{}' in URL '{}'", url.host(), url); + auto maybe_page = Manual::Node::try_find_from_help_url(url); + if (maybe_page.is_error()) { + dbgln("Error opening page: {}", maybe_page.error()); + return; } + auto maybe_path = maybe_page.value()->path(); + if (!maybe_path.is_error()) + return; + open_page(maybe_path.release_value()); } else { open_external(url); } |