max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 09:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include compression in the NarInfo JSON format

Browse source 
It was forgotten before.
This commit is contained in:
John Ericson 2023-10-26 20:01:36 -04:00
parent 937e02e7b9
commit a7212e169b
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/nar-info.cc
View file

@ -146,6 +146,8 @@ nlohmann::json NarInfo::toJSON(
if (includeImpureInfo) { if (includeImpureInfo) {
if (!url.empty()) if (!url.empty())
jsonObject["url"] = url; jsonObject["url"] = url;
if (!compression.empty())
jsonObject["compression"] = compression;
if (fileHash) if (fileHash)
jsonObject["downloadHash"] = fileHash->to_string(hashFormat, true); jsonObject["downloadHash"] = fileHash->to_string(hashFormat, true);
if (fileSize) if (fileSize)
@ -168,6 +170,9 @@ NarInfo NarInfo::fromJSON(
if (json.contains("url")) if (json.contains("url"))
res.url = ensureType(valueAt(json, "url"), value_t::string); res.url = ensureType(valueAt(json, "url"), value_t::string);
if (json.contains("compression"))
res.compression = ensureType(valueAt(json, "compression"), value_t::string);
if (json.contains("downloadHash")) if (json.contains("downloadHash"))
res.fileHash = Hash::parseAny( res.fileHash = Hash::parseAny(
static_cast<const std::string &>( static_cast<const std::string &>(

1
src/libstore/tests/nar-info.cc
View file

@ -48,6 +48,7 @@ static NarInfo makeNarInfo(const Store & store, bool includeImpureInfo) {
info.sigs = { "asdf", "qwer" }; info.sigs = { "asdf", "qwer" };
info.url = "nar/1w1fff338fvdw53sqgamddn1b2xgds473pv6y13gizdbqjv4i5p3.nar.xz"; info.url = "nar/1w1fff338fvdw53sqgamddn1b2xgds473pv6y13gizdbqjv4i5p3.nar.xz";
info.compression = "xz";
info.fileHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="); info.fileHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=");
info.fileSize = 4029176; info.fileSize = 4029176;
} }

1
unit-test-data/libstore/nar-info/impure.json
View file

@ -1,5 +1,6 @@
{ {
"ca": "fixed:r:sha256:1lr187v6dck1rjh2j6svpikcfz53wyl3qrlcbb405zlh13x0khhh", "ca": "fixed:r:sha256:1lr187v6dck1rjh2j6svpikcfz53wyl3qrlcbb405zlh13x0khhh",
"compression": "xz",
"deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
"downloadHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "downloadHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
"downloadSize": 4029176, "downloadSize": 4029176,