From 36cbc74689321399aeae26ff506809b8d9b24674 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Thu, 2 Jul 2020 11:21:00 -0400
Subject: [PATCH] Inline and simplify in parseAnyPrefixed

---
 src/libutil/hash.cc | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index a077d40a0..75f8f319c 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -144,9 +144,32 @@ Hash Hash::parseSRI(std::string_view original) {
     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)