RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:17:35 +00:00
Code Issues Activity Actions

pkg: Parse dependencies as part of the main port entry

Browse source 
The "dependency" lines really belong to the main port entry, it doesn't
make sense logically to represent them separately and handling them
together will also allow easier dependency management later on. This
commit greatly simplifies the port database parsing to facilitate this,
and removes the -d option from the command line. Instead, ports are
listed with their dependencies, if they have any.
This commit is contained in:
kleines Filmröllchen 2023-10-04 12:33:54 +02:00 • committed by Tim Schumacher
parent a5f566c2c6
commit 05af549bad
4 changed files with 56 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Userland/Utilities/pkg/InstalledPort.cpp
View file

@ -1,14 +1,25 @@
/*
* Copyright (c) 2023, Liav A. <liavalb@hotmail.co.il>
* Copyright (c) 2023, kleines Filmröllchen <filmroellchen@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "InstalledPort.h"
#include <AK/Function.h>
#include <AK/StringUtils.h>
#include <LibCore/File.h>
#include <LibCore/System.h>
Optional<InstalledPort::Type> InstalledPort::type_from_string(StringView type)
{
if (type == "auto"sv)
return Type::Auto;
if (type == "manual"sv)
return Type::Manual;
return {};
}
ErrorOr<HashMap<String, InstalledPort>> InstalledPort::read_ports_database()
{
auto file = TRY(Core::File::open(ports_database, Core::File::OpenMode::Read));
@ -18,27 +29,39 @@ ErrorOr<HashMap<String, InstalledPort>> InstalledPort::read_ports_database()
HashMap<String, InstalledPort> ports;
while (TRY(buffered_file->can_read_line())) {
auto line = TRY(buffered_file->read_line(buffer));
if (line.is_empty()) {
if (line.is_empty())
continue;
} else if (line.starts_with("dependency"sv)) {
auto parts = line.split_view(' ');
VERIFY(parts.size() == 3);
auto type = InstalledPort::Type::Dependency;
// FIXME: Add versioning when printing these ports!
auto name = TRY(String::from_utf8(parts[2]));
TRY(ports.try_set(name, InstalledPort { TRY(String::from_utf8(parts[2])), type, {} }));
} else if (line.starts_with("auto"sv)) {
auto parts = line.split_view(' ');
VERIFY(parts.size() == 3);
auto type = InstalledPort::Type::Auto;
auto name = TRY(String::from_utf8(parts[1]));
TRY(ports.try_set(name, InstalledPort { name, type, TRY(String::from_utf8(parts[2])) }));
} else if (line.starts_with("manual"sv)) {
auto parts = line.split_view(' ');
VERIFY(parts.size() == 3);
auto type = InstalledPort::Type::Manual;
auto name = TRY(String::from_utf8(parts[1]));
TRY(ports.try_set(name, InstalledPort { name, type, TRY(String::from_utf8(parts[2])) }));
auto parts = line.split_view(' ');
if (parts.size() < 2) {
dbgln("Invalid database entry {} (only {} parts)", line, parts.size());
// FIXME: Skip over invalid entries instead?
return Error::from_string_view("Database entry too short"sv);
}
auto string_type = parts[0];
auto name = TRY(String::from_utf8(parts[1]));
if (auto maybe_type = type_from_string(string_type); maybe_type.has_value()) {
auto const type = maybe_type.release_value();
if (parts.size() < 3)
return Error::from_string_view("Port is missing a version specification"sv);
auto version = TRY(String::from_utf8(parts[2]));
auto& port = ports.ensure(name, [&] { return InstalledPort { name, {}, {} }; });
port.m_type = type;
port.m_version = move(version);
} else if (string_type == "dependency"sv) {
// Accept an empty dependency list.
auto dependency_views = parts.span().slice(2);
Vector<String> dependencies;
TRY(dependencies.try_ensure_capacity(dependency_views.size()));
for (auto const& view : dependency_views)
dependencies.unchecked_append(TRY(String::from_utf8(view)));
// Assume the port as automatically installed if the "dependency" line occurs before the "manual"/"auto" line.
// This is fine since these entries override the port type in any case.
auto& port = ports.ensure(name, [&] { return InstalledPort { name, Type::Auto, {} }; });
port.m_dependencies = move(dependencies);
} else {
return Error::from_string_literal("Unknown installed port type");
}