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.

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

Use powershell command for download #144

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
julia 0.6
Compat 0.42.0
Compat 0.56.0
URIParser 0.0.3
@unix HTTPClient 0.0.0
LibExpat 0.2.8
Expand Down
58 changes: 40 additions & 18 deletions src/WinRPM.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,55 @@ function __init__()
update(false, false)
end

if isunix()
function download(source::AbstractString)
x = HTTPC.get(source)
unsafe_string(x.body), x.http_code
if VERSION < v"0.7.0-DEV"
if isunix()
function download(source::AbstractString)
x = HTTPC.get(source)
unsafe_string(x.body), x.http_code
end
elseif iswindows()
function download(source::AbstractString; retry=5)
dest = Vector{UInt16}(261)
for i in 1:retry
res = ccall((:URLDownloadToCacheFileW, :urlmon), stdcall, Cuint,
(Ptr{Void}, Ptr{UInt16}, Ptr{UInt16}, Clong, Cint, Ptr{Void}),
C_NULL, transcode(UInt16, source), dest, sizeof(dest) >> 1, 0, C_NULL)
if res == 0
resize!(dest, findfirst(iszero, dest) - 1)
filename = transcode(String, dest)
if isfile(filename)
return read(filename, String), 200
end
else
warn("Unknown download failure, error code: $res")
end
warn("Retry $i/$retry downloading: $source")
return "", 0
end
end
else
error("Platform not supported: $(Sys.KERNEL)")
end
elseif iswindows()
else
function download(source::AbstractString; retry=5)
dest = Vector{UInt16}(261)
for i in 1:retry
res = ccall((:URLDownloadToCacheFileW, :urlmon), stdcall, Cuint,
(Ptr{Void}, Ptr{UInt16}, Ptr{UInt16}, Clong, Cint, Ptr{Void}),
C_NULL, transcode(UInt16, source), dest, sizeof(dest) >> 1, 0, C_NULL)
if res == 0
resize!(dest, findfirst(iszero, dest) - 1)
filename = transcode(String, dest)
try
filename = joinpath(tempdir(), split(source, "/")[end])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks highly likely to have collisions

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you'd rather not enforce the filename?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, don't drop most of source.

filename = Base.download(source, filename)
if isfile(filename)
return read(filename, String), 200
return readstring(filename), 200
end
else
warn("Unknown download failure, error code: $res")
catch ex
warn("Unknown download failure. Retry $i/$retry downloading: $source")
end
warn("Retry $i/$retry downloading: $source")
end
warn("""Unknown download failure in `Base.download` function""")
if iswindows()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just rethrow the exception raised by Base.download? It needs to print a more helpful error message anyway (e.g. it could check what PowerShell version is installed), so no need to duplicate that logic.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't rethrow the error. This is not what the rest of WinRPM code expect - it expects to print the error as a warning and send a errcode !=200. The WinRPM.update function then silently recovers and tries a different provider.

  • I'd suggest catching an error thrown by Base.download, display it as a warning and continue the same path the old code expects. And we should update the Base.download function to give more info in its error exception.
  • Or, we can rewrite also the other parts of WinRPM - but that won't bring much functionality either.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Just printing the message should be OK.

warn("Base.download function relies on Windows PowerShell functionality. "*
"Check that PowerShell 3 or higher is installed and TLS 1.2 protocol support enabled.")
end
return "", 0
end
else
error("Platform not supported: $(Sys.KERNEL)")
end

getcachedir(source) = getcachedir(cachedir, source)
Expand Down