Skip to content
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

fix(install): Fix aria2's resume download feature #3292

Merged
merged 5 commits into from
Nov 14, 2021
Merged

fix(install): Fix aria2's resume download feature #3292

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
114598f
Update install.ps1
Retia-Adolf Mar 31, 2019
aaa997a
Update install.ps1
Retia-Adolf Mar 31, 2019
10e3cb2
don't set content for $urlstxt if it is null
Retia-Adolf Apr 6, 2019
5dc28a5
Merge branch 'develop' into patch-1
niheaven Nov 14, 2021
f35b527
Fix logic
niheaven Nov 14, 2021
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
80 changes: 42 additions & 38 deletions lib/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ function dl_with_cache_aria2($app, $version, $manifest, $architecture, $dir, $co
# aria2 input file
$urlstxt = Join-Path $cachedir "$app.txt"
$urlstxt_content = ''
$has_downloads = $false
$download_finished = $true

# aria2 options
$options = @(
Expand All @@ -225,64 +225,66 @@ function dl_with_cache_aria2($app, $version, $manifest, $architecture, $dir, $co
"--min-tls-version=TLSv1.2"
"--stop-with-process=$PID"
"--continue"
"--summary-interval 0"
"--summary-interval=0"
"--auto-save-interval=1"
)

if($cookies) {
if ($cookies) {
$options += "--header='Cookie: $(cookie_header $cookies)'"
}

$proxy = get_config 'proxy'
if($proxy -ne 'none') {
if([Net.Webrequest]::DefaultWebProxy.Address) {
if ($proxy -ne 'none') {
if ([Net.Webrequest]::DefaultWebProxy.Address) {
$options += "--all-proxy='$([Net.Webrequest]::DefaultWebProxy.Address.Authority)'"
}
if([Net.Webrequest]::DefaultWebProxy.Credentials.UserName) {
if ([Net.Webrequest]::DefaultWebProxy.Credentials.UserName) {
$options += "--all-proxy-user='$([Net.Webrequest]::DefaultWebProxy.Credentials.UserName)'"
}
if([Net.Webrequest]::DefaultWebProxy.Credentials.Password) {
if ([Net.Webrequest]::DefaultWebProxy.Credentials.Password) {
$options += "--all-proxy-passwd='$([Net.Webrequest]::DefaultWebProxy.Credentials.Password)'"
}
}

$more_options = get_config 'aria2-options'
if($more_options) {
if ($more_options) {
$options += $more_options
}

foreach($url in $urls) {
foreach ($url in $urls) {
$data.$url = @{
'filename' = url_filename $url
'target' = "$dir\$(url_filename $url)"
'target' = "$dir\$(url_filename $url)"
'cachename' = fname (cache_path $app $version $url)
'source' = fullpath (cache_path $app $version $url)
'source' = fullpath (cache_path $app $version $url)
}

if(!(test-path $data.$url.source)) {
$has_downloads = $true
if ((Test-Path $data.$url.source) -and -not((Test-Path "$($data.$url.source).aria2") -or (Test-Path $urlstxt)) -and $use_cache) {
Write-Host 'Loading ' -NoNewline
Write-Host $(url_remote_filename $url) -f Cyan -NoNewline
Write-Host ' from cache.'
} else {
$download_finished = $false
# create aria2 input file content
$urlstxt_content += "$(handle_special_urls $url)`n"
if(!$url.Contains('sourceforge.net')) {
if (!$url.Contains('sourceforge.net')) {
$urlstxt_content += " referer=$(strip_filename $url)`n"
}
$urlstxt_content += " dir=$cachedir`n"
$urlstxt_content += " out=$($data.$url.cachename)`n"
} else {
Write-Host "Loading " -NoNewline
Write-Host $(url_remote_filename $url) -f Cyan -NoNewline
Write-Host " from cache."
}
}

if($has_downloads) {
if (-not($download_finished)) {
# write aria2 input file
Set-Content -Path $urlstxt $urlstxt_content
if ($urlstxt_content -ne '') {
Set-Content -Path $urlstxt $urlstxt_content
}

# build aria2 command
$aria2 = "& '$(Get-HelperPath -Helper Aria2)' $($options -join ' ')"

# handle aria2 console output
Write-Host "Starting download with aria2 ..."
Write-Host 'Starting download with aria2 ...'

Invoke-Expression $aria2 | ForEach-Object {
# Skip blank lines
Expand Down Expand Up @@ -311,50 +313,52 @@ function dl_with_cache_aria2($app, $version, $manifest, $architecture, $dir, $co
error "Download failed! (Error $lastexitcode) $(aria_exit_code $lastexitcode)"
error $urlstxt_content
error $aria2
abort $(new_issue_msg $app $bucket "download via aria2 failed")
abort $(new_issue_msg $app $bucket 'download via aria2 failed')
}

# remove aria2 input file when done
if(test-path($urlstxt)) {
Remove-Item $urlstxt
if (Test-Path $urlstxt, "$($data.$url.source).aria2*") {
Remove-Item $urlstxt -Force -ErrorAction SilentlyContinue
Remove-Item "$($data.$url.source).aria2*" -Force -ErrorAction SilentlyContinue
}
}

foreach($url in $urls) {
foreach ($url in $urls) {

$metalink_filename = get_filename_from_metalink $data.$url.source
if($metalink_filename) {
if ($metalink_filename) {
Remove-Item $data.$url.source -Force
Rename-Item -Force (Join-Path -Path $cachedir -ChildPath $metalink_filename) $data.$url.source
}

# run hash checks
if($check_hash) {
if ($check_hash) {
$manifest_hash = hash_for_url $manifest $url $architecture
$ok, $err = check_hash $data.$url.source $manifest_hash $(show_app $app $bucket)
if(!$ok) {
if (!$ok) {
error $err
if(test-path $data.$url.source) {
if (Test-Path $data.$url.source) {
# rm cached file
Remove-Item -force $data.$url.source
Remove-Item $data.$url.source -Force -ErrorAction SilentlyContinue
Remove-Item "$($data.$url.source).aria2*" -Force -ErrorAction SilentlyContinue
}
if($url.Contains('sourceforge.net')) {
if ($url.Contains('sourceforge.net')) {
Write-Host -f yellow 'SourceForge.net is known for causing hash validation fails. Please try again before opening a ticket.'
}
abort $(new_issue_msg $app $bucket "hash check failed")
abort $(new_issue_msg $app $bucket 'hash check failed')
}
}

# copy or move file to target location
if(!(test-path $data.$url.source) ) {
abort $(new_issue_msg $app $bucket "cached file not found")
if (!(Test-Path $data.$url.source) ) {
abort $(new_issue_msg $app $bucket 'cached file not found')
}

if(!($dir -eq $cachedir)) {
if($use_cache) {
if (!($dir -eq $cachedir)) {
if ($use_cache) {
Copy-Item $data.$url.source $data.$url.target
} else {
Move-Item $data.$url.source $data.$url.target -force
Move-Item $data.$url.source $data.$url.target -Force
}
}
}
Expand Down