Fix hash detection and improve json path for arrays

rmnscnce · Apr 15, 2017 · 3050a44 · 3050a44
1 parent 7fc0aa8
commit 3050a44
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -36,7 +36,7 @@ function find_hash_in_rdf([String] $url, [String] $filename) {
     # Find file content
     $digest = $data.RDF.Content | ? { [String]$_.about -eq $filename }
 
-    return $digest.sha256
+    return format_hash $digest.sha256
 }
 
 function find_hash_in_textfile([String] $url, [String] $basename, [String] $regex) {
@@ -73,15 +73,7 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
         }
     }
 
-    switch ($hash.Length)
-    {
-        32 { $hash = "md5:$hash" } # md5
-        40 { $hash = "sha1:$hash" } # sha1
-        64 { $hash = $hash } # sha256
-        128 { $hash = "sha512:$hash" } # sha512
-        default { $hash = $null }
-    }
-    return $hash
+    return format_hash $hash
 }
 
 function find_hash_in_json([String] $url, [String] $basename, [String] $jsonpath) {
@@ -97,7 +89,8 @@ function find_hash_in_json([String] $url, [String] $basename, [String] $jsonpath
         return
     }
 
-    return json_path $json $jsonpath $basename
+    $hash = json_path $json $jsonpath $basename
+    return format_hash $hash
 }
 
 function get_hash_for_app([String] $app, $config, [String] $version, [String] $url, [Hashtable] $substitutions) {

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -328,3 +328,15 @@ function get_app_with_version([String] $app) {
         "version" = if ($version) { $version } else { 'latest' }
     }
 }
+
+function format_hash([String] $hash) {
+    switch ($hash.Length)
+    {
+        32 { $hash = "md5:$hash" } # md5
+        40 { $hash = "sha1:$hash" } # sha1
+        64 { $hash = $hash } # sha256
+        128 { $hash = "sha512:$hash" } # sha512
+        default { $hash = $null }
+    }
+    return $hash
+}
diff --git a/lib/json.ps1 b/lib/json.ps1
@@ -103,9 +103,14 @@ function json_path([Object] $json, [String] $jsonpath, [String] $basename) {
             return
         }
 
-        if($el -match "^(?<property>\w+)\[(?<index>\d+)\]$") {
+        # array detection
+        if($el -match "^(?<property>\w+)\[(?<index>[\w\d.-]+)\]$") {
             $property = $matches['property']
-            $result = $result.$property[$matches['index']]
+            if($matches['index'] -is [int]) {
+                $result = $result.$property[$matches['index']]
+            } else {
+                $result = $result.$property.($matches['index'])
+            }
             return
         }