refactor(download): move hash-related functions to seperate lib file, update imports

Author: felicijus

bin/checkhashes.ps1

@@ -42,6 +42,7 @@ param(
 
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\hash.ps1" # 'get_hash'
 . "$PSScriptRoot\..\lib\buckets.ps1"
 . "$PSScriptRoot\..\lib\autoupdate.ps1"
 . "$PSScriptRoot\..\lib\json.ps1"

lib/autoupdate.ps1

@@ -1,5 +1,7 @@
 # Must included with 'json.ps1'
 
+. "$PSScriptRoot\..\lib\hash.ps1" # 'get_hash'
+
 function format_hash([String] $hash) {
     $hash = $hash.toLower()
 

lib/download.ps1

@@ -1,6 +1,7 @@
 # Description: Functions for downloading files
 
 . "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
 . "$PSScriptRoot\..\lib\virustotal.ps1"
 
 ## Meta downloader
@@ -733,21 +734,6 @@ function url_remote_filename($url) {
     return $basename
 }
 
-### Hash-related functions
-
-function hash_for_url($manifest, $url, $arch) {
-    $hashes = @(hash $manifest $arch) | Where-Object { $_ -ne $null }
-
-    if ($hashes.length -eq 0) { return $null }
-
-    $urls = @(script:url $manifest $arch)
-
-    $index = [array]::IndexOf($urls, $url)
-    if ($index -eq -1) { abort "Couldn't find hash in manifest for '$url'." }
-
-    @($hashes)[$index]
-}
-
 function check_hash($file, $hash, $app_name) {
     # returns (ok, err)
     if (!$hash) {
@@ -783,19 +769,5 @@ function check_hash($file, $hash, $app_name) {
     return $true, $null
 }
 
-function get_hash([String] $multihash) {
-    $type, $hash = $multihash -split ':'
-    if (!$hash) {
-        # no type specified, assume sha256
-        $type, $hash = 'sha256', $multihash
-    }
-
-    if (@('md5', 'sha1', 'sha256', 'sha512') -notcontains $type) {
-        return $null, "Hash type '$type' isn't supported."
-    }
-
-    return $type, $hash.ToLower()
-}
-
 # Setup proxy globally
 setup_proxy

lib/hash.ps1

@@ -0,0 +1,28 @@
+### Hash-related functions
+
+function hash_for_url($manifest, $url, $arch) {
+    $hashes = @(hash $manifest $arch) | Where-Object { $_ -ne $null }
+
+    if ($hashes.length -eq 0) { return $null }
+
+    $urls = @(script:url $manifest $arch)
+
+    $index = [array]::IndexOf($urls, $url)
+    if ($index -eq -1) { abort "Couldn't find hash in manifest for '$url'." }
+
+    @($hashes)[$index]
+}
+
+function get_hash([String] $multihash) {
+    $type, $hash = $multihash -split ':'
+    if (!$hash) {
+        # no type specified, assume sha256
+        $type, $hash = 'sha256', $multihash
+    }
+
+    if (@('md5', 'sha1', 'sha256', 'sha512') -notcontains $type) {
+        return $null, "Hash type '$type' isn't supported."
+    }
+
+    return $type, $hash.ToLower()
+}

lib/install.ps1

@@ -1,3 +1,4 @@
+
 function nightly_version($quiet = $false) {
     if (!$quiet) {
         warn "This is a nightly version. Downloaded files won't be verified."

lib/virustotal.ps1

@@ -1,5 +1,5 @@
 . "$PSScriptRoot\json.ps1" # 'json_path'
-# . "$PSScriptRoot\download.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
 
 # Error codes
 $script:_ERR_UNSAFE = 2
@@ -314,16 +314,3 @@ function virustotal_check_app($app, $manifest, $architecture, $api_key, $scan) {
         Check-VirusTotalUrl $app $url $hash $api_key $scan
     }
 }
-
-function hash_for_url($manifest, $url, $arch) {
-    $hashes = @(hash $manifest $arch) | Where-Object { $_ -ne $null }
-
-    if ($hashes.length -eq 0) { return $null }
-
-    $urls = @(script:url $manifest $arch)
-
-    $index = [array]::IndexOf($urls, $url)
-    if ($index -eq -1) { abort "Couldn't find hash in manifest for '$url'." }
-
-    @($hashes)[$index]
-}

libexec/scoop-download.ps1

@@ -21,6 +21,7 @@
 
 . "$PSScriptRoot\..\lib\getopt.ps1"
 . "$PSScriptRoot\..\lib\json.ps1" # 'autoupdate.ps1' (indirectly)
+. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
 . "$PSScriptRoot\..\lib\autoupdate.ps1" # 'generate_user_manifest' (indirectly)
 . "$PSScriptRoot\..\lib\versions.ps1" # 'Select-CurrentVersion'
 . "$PSScriptRoot\..\lib\manifest.ps1" # 'generate_user_manifest' 'Get-Manifest'

libexec/scoop-update.ps1

@@ -22,6 +22,7 @@
 . "$PSScriptRoot\..\lib\psmodules.ps1"
 . "$PSScriptRoot\..\lib\decompress.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
 . "$PSScriptRoot\..\lib\versions.ps1"
 . "$PSScriptRoot\..\lib\depends.ps1"
 . "$PSScriptRoot\..\lib\install.ps1"