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

Inline and simplify in parseAnyPrefixed

Browse source
This commit is contained in:
Carlo Nucera 2020-07-02 11:21:00 -04:00
parent 9462d8a50b
commit 36cbc74689
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libutil/hash.cc
View file

@ -144,9 +144,32 @@ Hash Hash::parseSRI(std::string_view original) {
return Hash(rest, parsedType, true); return Hash(rest, parsedType, true);
} }
Hash Hash::parseAnyPrefixed(std::string_view s) Hash Hash::parseAnyPrefixed(std::string_view original)
{ {
return parseAny(s, std::nullopt); auto rest = original;
bool isSRI = false;
// Parse the has type before the separater, if there was one.
std::optional<HashType> optParsedType;
{
auto hashRaw = splitPrefix(rest, ':');
if (!hashRaw) {
hashRaw = splitPrefix(rest, '-');
if (hashRaw)
isSRI = true;
}
if (hashRaw)
optParsedType = parseHashType(*hashRaw);
}
// Either the string or user must provide the type, if they both do they
// must agree.
if (!optParsedType)
throw BadHash("hash '%s' does not include a type.", rest);
return Hash(rest, *optParsedType, isSRI);
} }
Hash Hash::parseAny(std::string_view original, std::optional<HashType> optType) Hash Hash::parseAny(std::string_view original, std::optional<HashType> optType)