refactor(helper): create helper folder for scripts with helper functions

Author: felicijus

bin/checkhashes.ps1

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

lib/autoupdate.ps1

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

lib/download.ps1

@@ -1,7 +1,8 @@
 # Description: Functions for downloading files
 
 . "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\helper\hash.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\helper\file-information.ps1" # 'Get-RemoteFileSize'
 . "$PSScriptRoot\..\lib\virustotal.ps1"
 
 ## Meta downloader
@@ -681,12 +682,12 @@ function get_magic_bytes_pretty($file, $glue = ' ') {
     return (get_magic_bytes $file | ForEach-Object { $_.ToString('x2') }) -join $glue
 }
 
-function Get-RemoteFileSize ($Uri) {
-    $response = Invoke-WebRequest -Uri $Uri -Method HEAD -UseBasicParsing
-    if (!$response.Headers.StatusCode) {
-        $response.Headers.'Content-Length' | ForEach-Object { [int]$_ }
-    }
-}
+# function Get-RemoteFileSize ($Uri) {
+#     $response = Invoke-WebRequest -Uri $Uri -Method HEAD -UseBasicParsing
+#     if (!$response.Headers.StatusCode) {
+#         $response.Headers.'Content-Length' | ForEach-Object { [int]$_ }
+#     }
+# }
 
 function ftp_file_size($url) {
     $request = [net.ftpwebrequest]::create($url)

lib/helper/file-information.ps1

@@ -0,0 +1,8 @@
+### Remote file information
+
+function Get-RemoteFileSize ($Uri) {
+    $response = Invoke-WebRequest -Uri $Uri -Method HEAD -UseBasicParsing
+    if (!$response.Headers.StatusCode) {
+        $response.Headers.'Content-Length' | ForEach-Object { [int]$_ }
+    }
+}

lib/hash.ps1 lib/helper/hash.ps1lib/hash.ps1 renamed to lib/helper/hash.ps1

@@ -1,5 +1,6 @@
 . "$PSScriptRoot\json.ps1" # 'json_path'
-. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\helper\hash.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\helper\file-information.ps1" # 'Get-RemoteFileSize'
 
 # Error codes
 $script:_ERR_UNSAFE = 2

lib/virustotal.ps1

@@ -22,7 +22,7 @@
 
 . "$PSScriptRoot\..\lib\getopt.ps1"
 . "$PSScriptRoot\..\lib\json.ps1" # 'autoupdate.ps1' (indirectly)
-. "$PSScriptRoot\..\lib\hash.ps1" # 'hash_for_url'
+. "$PSScriptRoot\..\lib\helper\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-download.ps1

@@ -7,6 +7,7 @@
 . "$PSScriptRoot\..\lib\manifest.ps1" # 'Get-Manifest'
 . "$PSScriptRoot\..\lib\versions.ps1" # 'Get-InstalledVersion', 'Select-CurrentVersion'
 . "$PSScriptRoot\..\lib\download.ps1" # 'Get-RemoteFileSize'
+. "$PSScriptRoot\..\lib\helper\file-information.ps1" # 'Get-RemoteFileSize'
 
 $opt, $app, $err = getopt $args 'v' 'verbose'
 $original_app = $app

libexec/scoop-info.ps1

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