LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-10 02:54:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibManual: Allow paths that include subsections when creating PageNodes

Browse Source 
Previously, attempting to open a man file within a subsection would
fail.
This commit is contained in:
Tim Ledbetter 2023-04-08 22:51:59 +01:00 committed by Andrew Kaster
parent 2618639bdb
commit 9d30eb4b34
Notes: sideshowbarker 2024-07-17 03:00:02 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/9d30eb4b34
Pull-request: https://github.com/SerenityOS/serenity/pull/18244
Reviewed-by: https://github.com/ADKaster ✅
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Userland/Libraries/LibManual/Node.cpp
View File

@ -32,16 +32,23 @@ ErrorOr<NonnullRefPtr<PageNode const>> Node::try_create_from_query(Vector<String
if (query_parameter_iterator.is_end()) {
// [/path/to/docs.md]
auto path_from_query = LexicalPath { first_query_parameter };
constexpr auto MARKDOWN_FILE_EXTENSION = "md"sv;
if (path_from_query.is_absolute()
&& path_from_query.is_child_of(manual_base_path)
&& path_from_query.extension() == "md"sv) {
auto section_directory = path_from_query.parent();
auto man_string_location = section_directory.basename().find("man"sv);
if (!man_string_location.has_value())
&& path_from_query.extension() == MARKDOWN_FILE_EXTENSION) {
// Parse the section number and page name from a directory string of the form:
// /usr/share/man/man[section_number]/[page_name].md
// The page_name includes any subsections.
auto const& section_directory = path_from_query.string();
auto section_name_start_index = manual_base_path.string().length() + 4;
auto section_name_end_index = section_directory.find('/', section_name_start_index);
if (!section_name_end_index.has_value())
return Error::from_string_literal("Page is inside invalid section");
auto section_name = section_directory.basename().substring_view(man_string_location.value() + 3);
auto section_name = section_directory.substring_view(section_name_start_index, section_name_end_index.value() - section_name_start_index);
auto section = TRY(SectionNode::try_create_from_number(section_name));
return try_make_ref_counted<PageNode>(section, TRY(String::from_utf8(path_from_query.title())));
auto page_name_end_index = section_directory.length() - section_name_end_index.value() - MARKDOWN_FILE_EXTENSION.length() - 1;
auto page_name = section_directory.substring_view(section_name_end_index.value(), page_name_end_index);
return try_make_ref_counted<PageNode>(section, TRY(String::from_utf8(page_name)));
}
// [page] (in any section)