izaya/OC-PsychOS2
1
0
Fork 4
Code Issues Pull Requests Releases Wiki Activity

fixed file downloading with the HTTP(S) proxies in the download library

Browse Source
This commit is contained in:
Izaya 2020-06-06 14:42:30 +10:00
parent edbe787ea6
commit 8b4d0e4eb8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/download.lua
View File

@ -67,6 +67,7 @@ end
function dl.protos.http(host, optPort, path, dest, url) -- string string string number -- boolean -- Downloads *url* to *dest* via the internet card, if available. function dl.protos.http(host, optPort, path, dest, url) -- string string string number -- boolean -- Downloads *url* to *dest* via the internet card, if available.
if not component.list("internet")() then if not component.list("internet")() then
print("Internet card unavailable, falling back to proxy.")
local proto,host,sPort,path = parseURL(url) local proto,host,sPort,path = parseURL(url)
local proxy = os.getenv(proto:upper().."_PROXY") local proxy = os.getenv(proto:upper().."_PROXY")
if not proxy and fs.exists("/boot/cfg/"..proto.."_proxy") then if not proxy and fs.exists("/boot/cfg/"..proto.."_proxy") then
@ -75,8 +76,9 @@ function dl.protos.http(host, optPort, path, dest, url) -- string string string
f:close() f:close()
end end
if not proxy then error("No internet card or HTTP(S) proxy available") end if not proxy then error("No internet card or HTTP(S) proxy available") end
print("Proxy found: "..proxy)
if optPort then host=string.format("%s:%i",host,optPort) end if optPort then host=string.format("%s:%i",host,optPort) end
return dl.wget(string.format("%s/%s%s",proxy,host,path)) return dl.wget(string.format("%s/%s%s",proxy,host,path),dest)
end end
if not dest then if not dest then
error("Must provide local path to save remote files.") error("Must provide local path to save remote files.")