fly/flightgear
1
0
Fork 0
Code Activity

HTTP: Rename urlretrieve/urlload to save/load.

Browse source
This commit is contained in:
Thomas Geymayer 2013-10-27 23:39:52 +01:00
parent cf270bde22
commit ce09c320d3
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Scripting/NasalHTTP.cxx
View file

@ -48,10 +48,12 @@ FGHTTPClient& requireHTTPClient(naContext c)
}
/**
* urlretrieve(url, filename)
* http.save(url, filename)
*/
static naRef f_urlretrieve(const nasal::CallContext& ctx)
static naRef f_http_save(const nasal::CallContext& ctx)
{
const std::string url = ctx.requireArg<std::string>(0);
// Check for write access to target file
const std::string filename = ctx.requireArg<std::string>(1);
const std::string validated_path = fgValidatePath(filename, true);
@ -63,30 +65,20 @@ static naRef f_urlretrieve(const nasal::CallContext& ctx)
return ctx.to_nasal
(
requireHTTPClient(ctx.c).client()
->urlretrieve
(
ctx.requireArg<std::string>(0), // url
validated_path // filename
)
requireHTTPClient(ctx.c).client()->save(url, validated_path)
);
}
/**
* urlload(url)
* http.load(url)
*/
static naRef f_urlload(const nasal::CallContext& ctx)
static naRef f_http_load(const nasal::CallContext& ctx)
{
return ctx.to_nasal
(
requireHTTPClient(ctx.c).client()
->urlload
(
ctx.requireArg<std::string>(0) // url
)
);
const std::string url = ctx.requireArg<std::string>(0);
return ctx.to_nasal( requireHTTPClient(ctx.c).client()->load(url) );
}
//------------------------------------------------------------------------------
naRef initNasalHTTP(naRef globals, naContext c)
{
using simgear::HTTP::Request;
@ -118,8 +110,8 @@ naRef initNasalHTTP(naRef globals, naContext c)
nasal::Hash globals_module(globals, c),
http = globals_module.createHash("http");
http.set("urlretrieve", f_urlretrieve);
http.set("urlload", f_urlload);
http.set("save", f_http_save);
http.set("load", f_http_load);
return naNil();
}