Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg] print list in json #12179

Merged
merged 6 commits into from
Jul 17, 2020
Merged

[vcpkg] print list in json #12179

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d09ee8
print list command in json
dan-shaw Jun 30, 2020
c9db5ee
fix spacing
dan-shaw Jun 30, 2020
2995e5b
remove reference
dan-shaw Jun 30, 2020
0ffbabd
review
dan-shaw Jul 1, 2020
e8df74b
fixes based on review
dan-shaw Jul 16, 2020
5355b03
Merge branch 'master' into vcpkg-list
dan-shaw Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 54 additions & 13 deletions toolsrc/src/vcpkg/commands.list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,46 @@ namespace vcpkg::Commands::List
{
static constexpr StringLiteral OPTION_FULLDESC = "x-full-desc"; // TODO: This should find a better home, eventually

static constexpr StringLiteral OPTION_JSON = "--x-json";

static void do_print_json(std::vector<const vcpkg::StatusParagraph*> installed_packages)
{
Json::Object obj;
strega-nil marked this conversation as resolved.
Show resolved Hide resolved
for (const StatusParagraph* status_paragraph : installed_packages)
{
auto current_spec = status_paragraph->package.spec;
if (obj.contains(current_spec.to_string()))
{
if (status_paragraph->package.is_feature())
{
Json::Value* value_obj = obj.get(current_spec.to_string());
auto& feature_list = value_obj->object()["features"].array();
feature_list.push_back(Json::Value::string(status_paragraph->package.feature));
}
}
else
{
Json::Object& library_obj = obj.insert(current_spec.to_string(), Json::Object());
library_obj.insert("package_name", Json::Value::string(current_spec.name()));
library_obj.insert("triplet", Json::Value::string(current_spec.triplet().to_string()));
library_obj.insert("version", Json::Value::string(status_paragraph->package.version));
library_obj.insert("port_version", Json::Value::integer(status_paragraph->package.port_version));
Json::Array& features_array = library_obj.insert("features", Json::Array());
if (status_paragraph->package.is_feature())
{
features_array.push_back(Json::Value::string(status_paragraph->package.feature));
}
Json::Array& desc = library_obj.insert("desc", Json::Array());
for (const auto& line : status_paragraph->package.description)
{
desc.push_back(Json::Value::string(line));
}
}
}

System::print2(Json::stringify(obj, Json::JsonStyle{}));
}

static void do_print(const StatusParagraph& pgh, const bool full_desc)
{
auto full_version = VersionT(pgh.package.version, pgh.package.port_version).to_string();
Expand All @@ -35,8 +75,9 @@ namespace vcpkg::Commands::List
}
}

static constexpr std::array<CommandSwitch, 1> LIST_SWITCHES = {{
static constexpr std::array<CommandSwitch, 2> LIST_SWITCHES = {{
{OPTION_FULLDESC, "Do not truncate long text"},
{OPTION_JSON, "List libraries in JSON format"},
}};

const CommandStructure COMMAND_STRUCTURE = {
Expand Down Expand Up @@ -74,25 +115,25 @@ namespace vcpkg::Commands::List
});

const auto enable_fulldesc = Util::Sets::contains(options.switches, OPTION_FULLDESC.to_string());
const auto enable_json = Util::Sets::contains(options.switches, OPTION_JSON.to_string());

dan-shaw marked this conversation as resolved.
Show resolved Hide resolved
if (args.command_arguments.empty())
if (!args.command_arguments.empty())
{
for (const StatusParagraph* status_paragraph : installed_packages)
{
do_print(*status_paragraph, enable_fulldesc);
}
auto& query = args.command_arguments[0];
auto pghs = Util::filter(installed_packages, [query](const StatusParagraph* status_paragraph) {
return Strings::case_insensitive_ascii_contains(status_paragraph->package.displayname(), query);
});
installed_packages = pghs;
}

if (enable_json)
{
do_print_json(installed_packages);
}
else
{
// At this point there is 1 argument
for (const StatusParagraph* status_paragraph : installed_packages)
{
const std::string displayname = status_paragraph->package.displayname();
if (!Strings::case_insensitive_ascii_contains(displayname, args.command_arguments[0]))
{
continue;
}

do_print(*status_paragraph, enable_fulldesc);
}
}
Expand Down