Skip to content

Add version variables to autoupdate.hash.regex #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r15ch13 merged 3 commits into from
Jan 17, 2019
Merged

Add version variables to autoupdate.hash.regex #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6de3b7
Add version variables to autoupdate.hash.regex
niheaven Jan 16, 2019
c3ee407
Use substitute to replace version variables
niheaven Jan 17, 2019
dfe846a
Add version variables to JSONPath
niheaven Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions lib/autoupdate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TODO
. "$psscriptroot/core.ps1"
. "$psscriptroot/json.ps1"

function find_hash_in_rdf([String] $url, [String] $filename) {
function find_hash_in_rdf([String] $url, [String] $basename) {
$data = $null
try {
# Download and parse RDF XML file
Expand All @@ -24,12 +24,12 @@ function find_hash_in_rdf([String] $url, [String] $filename) {
}

# Find file content
$digest = $data.RDF.Content | Where-Object { [String]$_.about -eq $filename }
$digest = $data.RDF.Content | Where-Object { [String]$_.about -eq $basename }

return format_hash $digest.sha256
}

function find_hash_in_textfile([String] $url, [String] $basename, [String] $regex) {
function find_hash_in_textfile([String] $url, [Hashtable] $substitutions, [String] $regex = '^([a-fA-F0-9]+)$') {
$hashfile = $null

try {
Expand All @@ -43,15 +43,8 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
return
}

# find single line hash in $hashfile (will be overridden by $regex)
if ($regex.Length -eq 0) {
$normalRegex = "^([a-fA-F0-9]+)$"
} else {
$normalRegex = $regex
}

$normalRegex = substitute $normalRegex @{'$basename' = [regex]::Escape($basename)}
if ($hashfile -match $normalRegex) {
$regex = substitute $regex $substitutions $true
if ($hashfile -match $regex) {
$hash = $matches[1] -replace ' ',''
}

Expand All @@ -70,7 +63,7 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
# find hash with filename in $hashfile (will be overridden by $regex)
if ($hash.Length -eq 0 -and $regex.Length -eq 0) {
$filenameRegex = "([a-fA-F0-9]{32,128})[\x20\t]+.*`$basename(?:[\x20\t]+\d+)?"
$filenameRegex = substitute $filenameRegex @{'$basename' = [regex]::Escape($basename)}
$filenameRegex = substitute $filenameRegex $substitutions $true
if ($hashfile -match $filenameRegex) {
$hash = $matches[1]
}
Expand All @@ -83,7 +76,7 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
return format_hash $hash
}

function find_hash_in_json([String] $url, [String] $basename, [String] $jsonpath) {
function find_hash_in_json([String] $url, [Hashtable] $substitutions, [String] $jsonpath) {
$json = $null

try {
Expand All @@ -96,9 +89,9 @@ function find_hash_in_json([String] $url, [String] $basename, [String] $jsonpath
write-host -f darkred "URL $url is not valid"
return
}
$hash = json_path $json $jsonpath $basename
$hash = json_path $json $jsonpath $substitutions
if(!$hash) {
$hash = json_path_legacy $json $jsonpath $basename
$hash = json_path_legacy $json $jsonpath $substitutions
}
return format_hash $hash
}
Expand Down Expand Up @@ -142,12 +135,12 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
$hashmode = $config.mode
$basename = url_remote_filename($url)

$hashfile_url = substitute $config.url @{
'$url' = (strip_fragment $url);
'$baseurl' = (strip_filename (strip_fragment $url)).TrimEnd('/')
'$basename' = $basename
}
$hashfile_url = substitute $hashfile_url $substitutions
$substitutions = $substitutions.Clone()
$substitutions.Add('$url', (strip_fragment $url))
$substitutions.Add('$baseurl', (strip_filename (strip_fragment $url)).TrimEnd('/'))
$substitutions.Add('$basename', $basename)

$hashfile_url = substitute $config.url $substitutions
if($hashfile_url) {
write-host -f DarkYellow 'Searching hash for ' -NoNewline
write-host -f Green $(url_remote_filename $url) -NoNewline
Expand Down Expand Up @@ -180,23 +173,23 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
$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 $basename '"$basename":.*?"sha1":\s"([a-fA-F0-9]{40})"'
$hash = find_hash_in_textfile $hashfile_url $substitutions '"$basename":.*?"sha1":\s"([a-fA-F0-9]{40})"'
}

switch ($hashmode) {
'extract' {
$hash = find_hash_in_textfile $hashfile_url $basename $regex
$hash = find_hash_in_textfile $hashfile_url $substitutions $regex
}
'json' {
$hash = find_hash_in_json $hashfile_url $basename $jsonpath
$hash = find_hash_in_json $hashfile_url $substitutions $jsonpath
}
'rdf' {
$hash = find_hash_in_rdf $hashfile_url $basename
}
'metalink' {
$hash = find_hash_in_headers $url
if(!$hash) {
$hash = find_hash_in_textfile "$url.meta4"
$hash = find_hash_in_textfile "$url.meta4" $substitutions
}
}
}
Expand Down
10 changes: 7 additions & 3 deletions lib/core.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,16 @@ function is_scoop_outdated() {
return $last_update.AddHours(3) -lt $now.ToLocalTime()
}

function substitute($entity, [Hashtable] $params) {
function substitute($entity, [Hashtable] $params, [Bool]$regexEscape = $false) {
if ($entity -is [Array]) {
return $entity | ForEach-Object { substitute $_ $params }
return $entity | ForEach-Object { substitute $_ $params $regexEscape}
} elseif ($entity -is [String]) {
$params.GetEnumerator() | ForEach-Object {
$entity = $entity.Replace($_.Name, $_.Value)
if($regexEscape -eq $false -or $null -eq $_.Value) {
$entity = $entity.Replace($_.Name, $_.Value)
} else {
$entity = $entity.Replace($_.Name, [Regex]::Escape($_.Value))
}
}
return $entity
}
Expand Down
14 changes: 8 additions & 6 deletions lib/json.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ function ConvertToPrettyJson {
}
}

function json_path([String] $json, [String] $jsonpath, [String] $basename) {
function json_path([String] $json, [String] $jsonpath, [Hashtable] $substitutions) {
Add-Type -Path "$psscriptroot\..\supporting\validator\bin\Newtonsoft.Json.dll"
$jsonpath = $jsonpath.Replace('$basename', $basename)
if ($null -ne $substitutions) {
$jsonpath = substitute $jsonpath $substitutions
}
try {
$obj = [Newtonsoft.Json.Linq.JObject]::Parse($json)
} catch [Newtonsoft.Json.JsonReaderException] {
Expand All @@ -112,15 +114,15 @@ function json_path([String] $json, [String] $jsonpath, [String] $basename) {
return $null
}

function json_path_legacy([String] $json, [String] $jsonpath, [String] $basename) {
function json_path_legacy([String] $json, [String] $jsonpath, [Hashtable] $substitutions) {
$result = $json | ConvertFrom-Json -ea stop
$isJsonPath = $jsonpath.StartsWith('$')
$jsonpath.split('.') | ForEach-Object {
$el = $_

# substitute the base filename into the jsonpath
if ($el.Contains('$basename')) {
$el = $el.Replace('$basename', $basename)
# substitute the basename and version varibales into the jsonpath
if ($null -ne $substitutions) {
$el = substitute $el $substitutions
}

# skip $ if it's jsonpath format
Expand Down
⚡