nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-18 16:29:36 +01:00
Code Activity

Have splitPrefix and splitPrefixTo parser helpers

Browse source
This commit is contained in:
John Ericson 2020-07-02 23:16:57 +00:00
parent a7cd7425d9
commit 13796be78d
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/content-address.cc
View file

@ -46,14 +46,14 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
std::string_view prefix;
{
auto optPrefix = splitPrefix(rest, ':');
auto optPrefix = splitPrefixTo(rest, ':');
if (!optPrefix)
throw UsageError("not a content address because it is not in the form \"<prefix>:<rest>\": %s", rawCa);
prefix = *optPrefix;
}
auto parseHashType_ = [&](){
auto hashTypeRaw = splitPrefix(rest, ':');
auto hashTypeRaw = splitPrefixTo(rest, ':');
if (!hashTypeRaw)
throw UsageError("content address hash must be in form \"<algo>:<hash>\", but found: %s", rawCa);
HashType hashType = parseHashType(*hashTypeRaw);
@ -73,10 +73,8 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
} else if (prefix == "fixed") {
// Parse method
auto method = FileIngestionMethod::Flat;
if (rest.substr(0, 2) == "r:") {
if (splitPrefix(rest, "r:"))
method = FileIngestionMethod::Recursive;
rest = rest.substr(2);
}
HashType hashType = parseHashType_();
return FixedOutputHash {
.method = method,