[Schema] Add metalink mode to hashmode (ScoopInstaller#3170)

* [Schema] Add metalink mode Schema is missing property for metalink See: https://github.com/lukesampson/scoop/blob/57b0b0e1eb2c946ca74541b2464d3e61e195e979/lib/autoupdate.ps1#L213-L218 * Make fosshub and sourceforge same as other methods
Ash258 · Mar 4, 2019 · bc89854 · bc89854
1 parent 98ff1c0
commit bc89854
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -190,14 +190,10 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
 
     if (!$hashfile_url -and $url -match "^(?:.*fosshub.com\/).*(?:\/|\?dwl=)(?<filename>.*)$") {
         $hashmode = 'fosshub'
-        $hash = find_hash_in_textfile $url $substitutions ($Matches.filename+'.*?"sha256":"([a-fA-F0-9]{64})"')
     }
 
     if (!$hashfile_url -and $url -match "(?:downloads\.)?sourceforge.net\/projects?\/(?<project>[^\/]+)\/(?:files\/)?(?<file>.*)") {
         $hashmode = 'sourceforge'
-        # change the URL because downloads.sourceforge.net doesn't have checksums
-        $hashfile_url = (strip_filename (strip_fragment "https://sourceforge.net/projects/$($matches['project'])/files/$($matches['file'])")).TrimEnd('/')
-        $hash = find_hash_in_textfile $hashfile_url $substitutions '"$basename":.*?"sha1":\s"([a-fA-F0-9]{40})"'
     }
 
     switch ($hashmode) {
@@ -216,6 +212,14 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
                 $hash = find_hash_in_textfile "$url.meta4" $substitutions
             }
         }
+        'fosshub' {
+            $hash = find_hash_in_textfile $url $substitutions ($Matches.filename+'.*?"sha256":"([a-fA-F0-9]{64})"')
+        }
+        'sourceforge' {
+            # change the URL because downloads.sourceforge.net doesn't have checksums
+            $hashfile_url = (strip_filename (strip_fragment "https://sourceforge.net/projects/$($matches['project'])/files/$($matches['file'])")).TrimEnd('/')
+            $hash = find_hash_in_textfile $hashfile_url $substitutions '"$basename":.*?"sha1":\s"([a-fA-F0-9]{40})"'
+        }
     }
 
     if ($hash) {

diff --git a/schema.json b/schema.json
@@ -48,7 +48,10 @@
                         "download",
                         "extract",
                         "json",
-                        "rdf"
+                        "rdf",
+                        "metalink",
+                        "fosshub",
+                        "sourceforge"
                     ]
                 },
                 "type": {