*/
typedef DPL::Optional<WidgetVersion> OptionalWidgetVersion;
-
/* Define db type */
-typedef WrtDB::DbWidgetHandle WidgetHandle;
-typedef WrtDB::DbWidgetHandleList WidgetHandleList;
-
typedef WrtDB::DbWidgetFeature WidgetFeature;
typedef WrtDB::DbWidgetFeatureSet WidgetFeatureSet;
std::ostringstream out;
WidgetLocalizedInfo localizedInfo =
- W3CFileLocalization::getLocalizedInfo(dao.getHandle()); //TODO: pkgname arg
+ W3CFileLocalization::getLocalizedInfo(*dao.getPkgname());
out << std::endl <<
"===================================== INSTALLED WIDGET INFO ========="\
out << std::endl << "Width: " << size.width;
out << std::endl << "Height: " << size.height;
out << std::endl << "Start File: " <<
- W3CFileLocalization::getStartFile(dao.getHandle()); //TODO: pkgname arg
+ W3CFileLocalization::getStartFile(*dao.getPkgname());
out << std::endl << "Version: " << dao.getVersion();
out << std::endl << "Licence: " <<
localizedInfo.license;
dao.isDistributorSigned();
out << std::endl << "Widget trusted: " << dao.isTrusted();
- OptionalWidgetIcon icon = W3CFileLocalization::getIcon(dao.getHandle()); //TODO: pkgname arg
+ OptionalWidgetIcon icon = W3CFileLocalization::getIcon(*dao.getPkgname());
DPL::OptionalString iconSrc =
!!icon ? icon->src : DPL::OptionalString::Null;
out << std::endl << "Icon: " << iconSrc;
public JobContextBase<WidgetInstallationStruct> //TODO typedef
{
private:
- typedef DPL::Optional<WidgetHandle> OptionalWidgetHandle;
-
InstallerContext m_installerContext;
//TODO move it to base class of all jobs -> make it base template class??
namespace { // anonymous
-const WidgetHandle WIDGET_HANDLE_START_VALUE = 1000;
const DPL::String BR = DPL::FromUTF8String("<br>");
const std::string WIDGET_NOT_COMPATIBLE = "This widget is "
"not compatible with WRT.<br><br>";
namespace Jobs {
namespace WidgetInstall {
-FeatureLogic::FeatureLogic(WidgetHandle handle)
+FeatureLogic::FeatureLogic(WrtDB::DbWidgetHandle handle)
: m_rejected(false)
{
WrtDB::WidgetDAOReadOnly widgetDao(handle);
class FeatureLogic : DPL::Noncopyable {
public:
- FeatureLogic(WidgetHandle handle);
+ FeatureLogic(WrtDB::DbWidgetHandle handle);
bool isDone() const;
WrtDB::WrtDatabase::attachToThreadRO();
- WidgetHandleList hndlList = WidgetDAOReadOnly::getHandleList();
+ WidgetPkgNameList pkgnameslList = WidgetDAOReadOnly::getPkgnameList();
*count = 0;
- FOREACH(iterator, hndlList) {
+ FOREACH(iterator, pkgnameslList) {
package_manager_pkg_info_t *pkg_info =
static_cast<package_manager_pkg_info_t*>
(malloc(sizeof(package_manager_pkg_info_t)));
pkg_last->next = pkg_info;
}
- WidgetDAOReadOnly widget(*iterator);
- DPL::Optional<DPL::String> pkgname = widget.getPkgname();
+ WidgetPkgName pkgname = **iterator;
+ WidgetDAOReadOnly widget(pkgname);
strncpy(pkg_info->pkg_type, "wgt", PKG_TYPE_STRING_LEN_MAX);
- if(!pkgname.IsNull()) {
- snprintf(pkg_info->pkg_name, PKG_NAME_STRING_LEN_MAX, "%s",
- DPL::ToUTF8String(*pkgname).c_str());
- }
+ snprintf(pkg_info->pkg_name, PKG_NAME_STRING_LEN_MAX, "%s",
+ DPL::ToUTF8String(pkgname).c_str());
DPL::Optional<DPL::String> version = widget.getVersion();
if (!version.IsNull()) {
LogDebug("Not available type");
break;
}
- } else {
- // Launch widget based on application basename
- size_t pos = arg.find_last_of('/');
-
- if (pos != std::string::npos) {
- arg = arg.erase(0, pos + 1);
- }
-
- if (sscanf(arg.c_str(), "%i", &m_handle) != 1) {
- printf("failed: invalid widget handle\n");
- return showHelpAndQuit();
- }
-
- LogDebug("Widget Id: " << m_handle << " (" << arg << ")");
}
AddStep(&WrtInstaller::shutdownStep);