From 12399b1b97e05626087cd2ebf673725d363a0a54 Mon Sep 17 00:00:00 2001 From: jkobus Date: Mon, 17 Nov 2014 14:40:57 +0100 Subject: Add ComponentChecker class for verifying the internal state. Change-Id: I3361ad6c51d5a0f3beee049237e6b370d57a8f0d Reviewed-by: Niels Weber --- src/libs/installer/component.cpp | 1 - src/libs/installer/componentchecker.cpp | 103 ++++++++++++++++++++++++++++ src/libs/installer/componentchecker.h | 57 +++++++++++++++ src/libs/installer/constants.h | 1 + src/libs/installer/installer.pro | 2 + src/libs/installer/packagemanagercore_p.cpp | 5 ++ 6 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 src/libs/installer/componentchecker.cpp create mode 100644 src/libs/installer/componentchecker.h (limited to 'src/libs/installer') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 3d83d939d..5016b5020 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -60,7 +60,6 @@ using namespace QInstaller; static const QLatin1String scScriptTag("Script"); -static const QLatin1String scDefault("Default"); static const QLatin1String scAutoDependOn("AutoDependOn"); static const QLatin1String scVirtual("Virtual"); static const QLatin1String scInstalled("Installed"); diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp new file mode 100644 index 000000000..5f07c74fd --- /dev/null +++ b/src/libs/installer/componentchecker.cpp @@ -0,0 +1,103 @@ +/************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +#include "componentchecker.h" + +#include "component.h" +#include "constants.h" +#include "packagemanagercore.h" + +namespace QInstaller { + +QStringList ComponentChecker::checkComponent(Component *component) +{ + QStringList checkResult; + + const bool defaultPropertyScriptValue = component->variables().value(scDefault).compare(scScript, Qt::CaseInsensitive) == 0; + const bool defaultPropertyValue = component->variables().value(scDefault).compare(scTrue, Qt::CaseInsensitive) == 0; + if (!component->autoDependencies().isEmpty()) { + if (component->forcedInstallation()) { + checkResult << tr("Component %1 specifies \"ForcedInstallation\" property " + "together with \"AutoDependOn\" list. This combination of states " + "may not work properly." + ).arg(component->name()); + } + if (defaultPropertyScriptValue) { + checkResult << tr("Component %1 specifies script value for \"Default\" property " + "together with \"AutoDependOn\" list. This combination of states " + "may not work properly." + ).arg(component->name()); + } + if (defaultPropertyValue) { + checkResult << tr("Component %1 specifies \"Default\" property " + "together with \"AutoDependOn\" list. This combination of states " + "may not work properly." + ).arg(component->name()); + } + } + if (component->packageManagerCore()->isInstaller()) { + if (component->isTristate()) { + if (defaultPropertyScriptValue) { + checkResult << tr("Component %1 specifies script value for \"Default\" property " + "while not being a leaf node. The \"Default\" property " + "will get a \"false\" value." + ).arg(component->name()); + } + if (defaultPropertyValue) { + checkResult << tr("Component %1 specifies \"Default\" property " + "while not being a leaf node. The \"Default\" property " + "will get a \"false\" value." + ).arg(component->name()); + } + } + if (!component->isCheckable()) { + if (defaultPropertyScriptValue) { + checkResult << tr("Component %1 specifies script value for \"Default\" property " + "while being not checkable. The \"Default\" property " + "will get a \"false\" value." + ).arg(component->name()); + } + if (defaultPropertyValue) { + checkResult << tr("Component %1 specifies \"Default\" property " + "while being not checkable. The \"Default\" property " + "will get a \"false\" value." + ).arg(component->name()); + } + } + } + return checkResult; +} + + +} // namespace QInstaller diff --git a/src/libs/installer/componentchecker.h b/src/libs/installer/componentchecker.h new file mode 100644 index 000000000..fe94a2cd7 --- /dev/null +++ b/src/libs/installer/componentchecker.h @@ -0,0 +1,57 @@ +/************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ +#ifndef COMPONENTCHECKER_H +#define COMPONENTCHECKER_H + +#include "installer_global.h" +#include + +namespace QInstaller { + +class Component; + +class INSTALLER_EXPORT ComponentChecker +{ + Q_DECLARE_TR_FUNCTIONS(ComponentChecker) +public: + static QStringList checkComponent(Component *component); + +private: + ComponentChecker(); +}; + +} + + +#endif // INSTALLERCALCULATOR_H diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index 3d480dd77..3fe3b8367 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -46,6 +46,7 @@ static const QLatin1String scScript("script"); static const QLatin1String scName("Name"); static const QLatin1String scVersion("Version"); +static const QLatin1String scDefault("Default"); static const QLatin1String scRemoteVersion("Version"); static const QLatin1String scDisplayVersion("DisplayVersion"); static const QLatin1String scRemoteDisplayVersion("RemoteDisplayVersion"); diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 75dd44daf..f9e28d895 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -118,6 +118,7 @@ HEADERS += packagemanagercore.h \ binarylayout.h \ installercalculator.h \ uninstallercalculator.h \ + componentchecker.h \ proxycredentialsdialog.h \ serverauthenticationdialog.h @@ -187,6 +188,7 @@ SOURCES += packagemanagercore.cpp \ binarylayout.cpp \ installercalculator.cpp \ uninstallercalculator.cpp \ + componentchecker.cpp \ proxycredentialsdialog.cpp \ serverauthenticationdialog.cpp diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 45a41d301..ba28c6871 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -52,6 +52,7 @@ #include "qsettingswrapper.h" #include "installercalculator.h" #include "uninstallercalculator.h" +#include "componentchecker.h" #include "kdselfrestarter.h" #include "kdupdaterfiledownloaderfactory.h" @@ -369,6 +370,10 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash &c else if (component->isInstalled()) component->setCheckState(Qt::Checked); } + + const QStringList warnings = ComponentChecker::checkComponent(component); + foreach (const QString &warning, warnings) + qWarning() << warning; } std::sort(m_rootComponents.begin(), m_rootComponents.end(), Component::SortingPriorityGreaterThan()); -- cgit v1.2.3