Skip to content

Make wget automatically determine the file name. #536

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Make wget automatically determine the file name. #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fcc8e0a
Giving a filename to wget is now optional.
Luca0208 Apr 4, 2018
0ad84b3
Adjusted codestyle
Luca0208 Apr 4, 2018
f1cec14
Use gsub instead of loops and also strip anchors and url parameters
Luca0208 Apr 4, 2018
39ecc90
Again adjusting the codestyle
Luca0208 Apr 4, 2018
a5bd04e
getFilename() needs to return something, because shell.resolve() is c…
Luca0208 Apr 4, 2018
4e8d7aa
Check if the URL is valid before trying to determine the filename
Luca0208 Apr 5, 2018
781141a
Replace return nil with return because we are exiting from the progra…
Luca0208 Apr 5, 2018
67448f1
err can't be nil
Luca0208 Apr 5, 2018
7a4dac3
Adjust wget help file
Luca0208 Apr 5, 2018
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
4 changes: 3 additions & 1 deletion src/main/resources/assets/computercraft/lua/rom/help/wget.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
wget is a program for downloading files from the internet. This is useful for downloading programs created by other players.
If no filename is specified wget will try to determine the filename from the URL by stripping any anchors, parameters and trailing slashes and then taking everything remaining after the last slash.
The HTTP API must be enabled in ComputerCraft.cfg to use this program.

ex:
"wget http://pastebin.com/raw/CxaWmPrX test" will download the file from the URL http://pastebin.com/raw/CxaWmPrX, and save it as "test".
"wget http://example.org/test.lua/?foo=bar#qzu" will download the file from the URL http://example.org/test.lua/?foo=bar#qzu and save it as "test.lua"
"wget http://example.org/" will download the file from the URL http://example.org and save it as "example.org"
32 changes: 18 additions & 14 deletions src/main/resources/assets/computercraft/lua/rom/programs/http/wget.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

local function printUsage()
print( "Usage:" )
print( "wget <url> <filename>" )
print( "wget <url> [filename]" )
end

local tArgs = { ... }
if #tArgs < 2 then
if #tArgs < 1 then
printUsage()
return
end
Expand All @@ -15,19 +15,15 @@ if not http then
printError( "Set http_enable to true in ComputerCraft.cfg" )
return
end


local function getFilename( sUrl )
sUrl = sUrl:gsub( "[#?].*" , "" ):gsub( "/+$" , "" )
return sUrl:match( "/([^/]+)$" )
end

local function get( sUrl )
write( "Connecting to " .. sUrl .. "... " )

local ok, err = http.checkURL( sUrl )
if not ok then
print( "Failed." )
if err then
printError( err )
end
return nil
end

local response = http.get( sUrl , nil , true )
if not response then
print( "Failed." )
Expand All @@ -40,10 +36,18 @@ local function get( sUrl )
response.close()
return sResponse
end

-- Determine file to download
local sUrl = tArgs[1]
local sFile = tArgs[2]

--Check if the URL is valid
local ok, err = http.checkURL( sUrl )
if not ok then
printError( err or "Invalid URL." )
return
end

local sFile = tArgs[2] or getFilename( sUrl )
local sPath = shell.resolve( sFile )
if fs.exists( sPath ) then
print( "File already exists" )
Expand Down