typedef nasal::Ghost<pkg::CatalogRef> NasalCatalog;
typedef nasal::Ghost<pkg::InstallRef> NasalInstall;
-// #define ENABLE_PACKAGE_SYSTEM 1
-
namespace {
class FGDelegate : public pkg::Delegate
virtual void startInstall(pkg::Install* aInstall)
{
- SG_LOG(SG_IO, SG_INFO, "begining install of:" << aInstall->package()->id()
+ SG_LOG(SG_IO, SG_INFO, "beginning install of:" << aInstall->package()->id()
<< " to local path:" << aInstall->path());
}
} // of anonymous namespace
-FGHTTPClient::FGHTTPClient()
+FGHTTPClient::FGHTTPClient() :
+ _inited(false)
{
}
void FGHTTPClient::init()
{
+ // launcher may need to setup HTTP access abnormally early, so
+ // guard against duplicate inits
+ if (_inited) {
+ return;
+ }
+
_http.reset(new simgear::HTTP::Client);
std::string proxyHost(fgGetString("/sim/presets/proxy/host"));
_http->setProxy(proxyHost, proxyPort, proxyAuth);
}
-#ifdef ENABLE_PACKAGE_SYSTEM
pkg::Root* packageRoot = globals->packageRoot();
if (packageRoot) {
// package system needs access to the HTTP engine too
packageRoot->setHTTPClient(_http.get());
packageRoot->setDelegate(new FGDelegate);
-
+
+ const char * defaultCatalogId = fgGetString("/sim/package-system/default-catalog/id", "org.flightgear.default" );
+ const char * defaultCatalogUrl = fgGetString("/sim/package-system/default-catalog/url",
+ "http://fgfs.goneabitbursar.com/pkg/" FLIGHTGEAR_VERSION "/default-catalog.xml");
// setup default catalog if not present
- pkg::Catalog* defaultCatalog = packageRoot->getCatalogById("org.flightgear.default");
+ pkg::Catalog* defaultCatalog = packageRoot->getCatalogById( defaultCatalogId );
if (!defaultCatalog) {
// always show this message
- SG_LOG(SG_GENERAL, SG_ALERT, "default catalog not found, installing...");
- pkg::Catalog::createFromUrl(packageRoot,
- "http://fgfs.goneabitbursar.com/pkg/" FLIGHTGEAR_VERSION "/default-catalog.xml");
+ SG_LOG(SG_GENERAL, SG_ALERT, "default catalog not found, installing '"
+ << defaultCatalogId << "' from '" << defaultCatalogUrl << "'.");
+ pkg::Catalog::createFromUrl(packageRoot,defaultCatalogUrl);
}
// start a refresh now
packageRoot->refresh();
}
-#endif // of ENABLE_PACKAGE_SYSTEM
+
+ _inited = true;
+}
+
+static naRef f_package_existingInstall( pkg::Package& pkg,
+ const nasal::CallContext& ctx )
+{
+ return ctx.to_nasal(
+ pkg.existingInstall( ctx.getArg<pkg::Package::InstallCallback>(0) )
+ );
+}
+
+static naRef f_package_uninstall(pkg::Package& pkg, const nasal::CallContext& ctx)
+{
+ pkg::InstallRef ins = pkg.existingInstall();
+ if (ins) {
+ ins->uninstall();
+ }
+
+ return naNil();
+}
+
+static SGPropertyNode_ptr queryPropsFromHash(const nasal::Hash& h)
+{
+ SGPropertyNode_ptr props(new SGPropertyNode);
+
+ for (nasal::Hash::const_iterator it = h.begin(); it != h.end(); ++it) {
+ std::string const key = it->getKey();
+ if ((key == "name") || (key == "description")) {
+ props->setStringValue(key, it->getValue<std::string>());
+ } else if (strutils::starts_with(key, "rating-")) {
+ props->setIntValue(key, it->getValue<int>());
+ } else if (key == "tags") {
+ string_list tags = it->getValue<string_list>();
+ string_list::const_iterator tagIt;
+ int tagCount = 0;
+ for (tagIt = tags.begin(); tagIt != tags.end(); ++tagIt) {
+ SGPropertyNode_ptr tag = props->getChild("tag", tagCount++, true);
+ tag->setStringValue(*tagIt);
+ }
+ } else if (key == "installed") {
+ props->setBoolValue(key, it->getValue<bool>());
+ } else {
+ SG_LOG(SG_GENERAL, SG_WARN, "unknown filter term in hash:" << key);
+ }
+ }
+
+ return props;
+}
+
+static naRef f_root_search(pkg::Root& root, const nasal::CallContext& ctx)
+{
+ SGPropertyNode_ptr query = queryPropsFromHash(ctx.requireArg<nasal::Hash>(0));
+ pkg::PackageList result = root.packagesMatching(query);
+ return ctx.to_nasal(result);
+}
+
+static naRef f_catalog_search(pkg::Catalog& cat, const nasal::CallContext& ctx)
+{
+ SGPropertyNode_ptr query = queryPropsFromHash(ctx.requireArg<nasal::Hash>(0));
+ pkg::PackageList result = cat.packagesMatching(query);
+ return ctx.to_nasal(result);
+}
+
+static naRef f_package_variants(pkg::Package& pack, naContext c)
+{
+ nasal::Hash h(c);
+ string_list vars(pack.variants());
+ for (string_list_iterator it = vars.begin(); it != vars.end(); ++it) {
+ h.set(*it, pack.nameForVariant(*it));
+ }
+
+ return h.get_naRef();
}
void FGHTTPClient::postinit()
{
-#ifdef ENABLE_PACKAGE_SYSTEM
NasalPackageRoot::init("PackageRoot")
.member("path", &pkg::Root::path)
.member("version", &pkg::Root::catalogVersion)
.method("refresh", &pkg::Root::refresh)
+ .method("catalogs", &pkg::Root::catalogs)
.method("packageById", &pkg::Root::getPackageById)
- .method("catalogById", &pkg::Root::getCatalogById);
-
+ .method("catalogById", &pkg::Root::getCatalogById)
+ .method("search", &f_root_search);
+
NasalCatalog::init("Catalog")
.member("installRoot", &pkg::Catalog::installRoot)
.member("id", &pkg::Catalog::id)
.member("url", &pkg::Catalog::url)
.member("description", &pkg::Catalog::description)
+ .method("packages", &pkg::Catalog::packages)
.method("packageById", &pkg::Catalog::getPackageById)
.method("refresh", &pkg::Catalog::refresh)
.method("needingUpdate", &pkg::Catalog::packagesNeedingUpdate)
- .member("installed", &pkg::Catalog::installedPackages);
+ .member("installed", &pkg::Catalog::installedPackages)
+ .method("search", &f_catalog_search);
NasalPackage::init("Package")
.member("id", &pkg::Package::id)
.member("description", &pkg::Package::description)
.member("installed", &pkg::Package::isInstalled)
.member("thumbnails", &pkg::Package::thumbnailUrls)
+ .member("variants", &f_package_variants)
.member("revision", &pkg::Package::revision)
.member("catalog", &pkg::Package::catalog)
.method("install", &pkg::Package::install)
- .method("lprop", &pkg::Package::getLocalisedProp);
+ .method("uninstall", &f_package_uninstall)
+ .method("existingInstall", &f_package_existingInstall)
+ .method("lprop", &pkg::Package::getLocalisedProp)
+ .member("fileSize", &pkg::Package::fileSizeBytes);
+ typedef pkg::Install* (pkg::Install::*InstallCallback)
+ (const pkg::Install::Callback&);
+ typedef pkg::Install* (pkg::Install::*ProgressCallback)
+ (const pkg::Install::ProgressCallback&);
NasalInstall::init("Install")
.member("revision", &pkg::Install::revsion)
.member("pkg", &pkg::Install::package)
.member("path", &pkg::Install::path)
.member("hasUpdate", &pkg::Install::hasUpdate)
- .method("startUpdate", & pkg::Install::startUpdate)
- .method("uninstall", &pkg::Install::uninstall);
+ .method("startUpdate", &pkg::Install::startUpdate)
+ .method("uninstall", &pkg::Install::uninstall)
+ .method("done", static_cast<InstallCallback>(&pkg::Install::done))
+ .method("fail", static_cast<InstallCallback>(&pkg::Install::fail))
+ .method("always", static_cast<InstallCallback>(&pkg::Install::always))
+ .method("progress", static_cast<ProgressCallback>(&pkg::Install::progress));
pkg::Root* packageRoot = globals->packageRoot();
if (packageRoot) {
nasal::Hash nasalPkg = nasalGlobals.createHash("pkg"); // module
nasalPkg.set("root", packageRoot);
}
-#endif // of ENABLE_PACKAGE_SYSTEM
}
void FGHTTPClient::shutdown()
projects / flightgear.git / blobdiff