lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Factor the prefix splitting in content-address

Browse source
This commit is contained in:
Carlo Nucera 2020-06-30 11:57:46 -04:00
parent 7ba0fae0dd
commit 77b51f4598
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
#include "args.hh" #include "args.hh"
#include "content-address.hh" #include "content-address.hh"
#include "parser.hh"
namespace nix { namespace nix {
@ -43,23 +44,19 @@ std::string renderContentAddress(ContentAddress ca) {
ContentAddress parseContentAddress(std::string_view rawCa) { ContentAddress parseContentAddress(std::string_view rawCa) {
auto rest = rawCa; auto rest = rawCa;
// Ensure prefix std::string_view prefix;
const auto prefixSeparator = rawCa.find(':'); {
if (prefixSeparator == string::npos) auto optPrefix = splitPrefix(rest, ':');
throw UsageError("not a content address because it is not in the form \"<prefix>:<rest>\": %s", rawCa); if (!optPrefix)
auto prefix = rest.substr(0, prefixSeparator); throw UsageError("not a content address because it is not in the form \"<prefix>:<rest>\": %s", rawCa);
rest = rest.substr(prefixSeparator + 1); prefix = *optPrefix;
}
auto parseHashType_ = [&](){ auto parseHashType_ = [&](){
// Parse hash type auto hashTypeRaw = splitPrefix(rest, ':');
auto algoSeparator = rest.find(':'); if (!hashTypeRaw)
HashType hashType; throw UsageError("content address hash must be in form \"<algo>:<hash>\", but found: %s", rawCa);
if (algoSeparator == string::npos) HashType hashType = parseHashType(*hashTypeRaw);
throw UsageError("content address hash must be in form \"<algo>:<hash>\", but found: %s", rest);
hashType = parseHashType(rest.substr(0, algoSeparator));
rest = rest.substr(algoSeparator + 1);
return std::move(hashType); return std::move(hashType);
}; };