github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage:provide orphaned parent applet checker

Browse Source
work/spdx
Michail Vourlakos 4 years ago
parent ceda380e49
commit c33623a809
5 changed files with 126 additions and 13 deletions
Show Stats Download Patch File Download Diff File

11
app/data/appletdata.cpp
Unescape Escape View File

@ -33,7 +33,8 @@ Applet::Applet(Applet &&o)
isSelected(o.isSelected),
description(o.description),
icon(o.icon),
storageId(o.storageId)
storageId(o.storageId),
subcontainmentId(o.subcontainmentId)
{
}
@ -42,7 +43,8 @@ Applet::Applet(const Applet &o)
isSelected(o.isSelected),
description(o.description),
icon(o.icon),
storageId(o.storageId)
storageId(o.storageId),
subcontainmentId(o.subcontainmentId)
{
}
@ -54,6 +56,7 @@ Applet &Applet::operator=(const Applet &rhs)
isSelected = rhs.isSelected;
icon = rhs.icon;
storageId = rhs.storageId;
subcontainmentId = rhs.subcontainmentId;
return (*this);
}
@ -66,6 +69,7 @@ Applet &Applet::operator=(Applet &&rhs)
isSelected = rhs.isSelected;
icon = rhs.icon;
storageId = rhs.storageId;
subcontainmentId = rhs.subcontainmentId;
return (*this);
}
@ -77,7 +81,8 @@ bool Applet::operator==(const Applet &rhs) const
&& (description == rhs.description)
&& (icon == rhs.icon)
&& (isSelected == rhs.isSelected)
&& (storageId == rhs.storageId);
&& (storageId == rhs.storageId)
&& (subcontainmentId == rhs.subcontainmentId);
}
bool Applet::operator!=(const Applet &rhs) const

1
app/data/appletdata.h
Unescape Escape View File

@ -44,6 +44,7 @@ public:
QString description;
QString icon;
QString storageId;
QString subcontainmentId;
bool isInstalled() const;
bool isValid() const;

5
app/data/errordata.h
Unescape Escape View File

@ -38,8 +38,9 @@ class Error : public Data::Generic
{
public:
static constexpr const char* APPLETSWITHSAMEID = "103";
static constexpr const char* APPLETSANDCONTAINMENTSWITHSAMEID = "202";
static constexpr const char* ORPHANEDSUBCONTAINMENTS = "204";
static constexpr const char* ORPHANEDPARENTAPPLETOFSUBCONTAINMENT = "107";
static constexpr const char* APPLETANDCONTAINMENTWITHSAMEID = "202";
static constexpr const char* ORPHANEDSUBCONTAINMENT = "204";
Error();
Error(Error &&o);

117
app/layouts/storage.cpp
Unescape Escape View File

@ -59,9 +59,10 @@ Storage::Storage()
//! Known Errors
s_knownErrors << Data::Generic(Data::Error::APPLETSWITHSAMEID, i18n("Different Applets With Same Id"));
s_knownErrors << Data::Generic(Data::Error::ORPHANEDPARENTAPPLETOFSUBCONTAINMENT, i18n("Orphaned Parent Applet Of Subcontainment"));
//! Known Warnings
s_knownWarnings << Data::Generic(Data::Error::APPLETSANDCONTAINMENTSWITHSAMEID, i18n("Different Applets And Containments With Same Id"));
s_knownWarnings << Data::Generic(Data::Error::ORPHANEDSUBCONTAINMENTS, i18n("Orphaned Subcontainments"));
s_knownWarnings << Data::Generic(Data::Warning::APPLETANDCONTAINMENTWITHSAMEID, i18n("Different Applet And Containment With Same Id"));
s_knownWarnings << Data::Generic(Data::Warning::ORPHANEDSUBCONTAINMENT, i18n("Orphaned Subcontainment"));
//! Known SubContainment Families
@ -934,8 +935,8 @@ bool Storage::hasAppletsAndContainmentsWithSameId(const Layout::GenericLayout *l
return false;
}
warning.id = s_knownWarnings[Data::Error::APPLETSANDCONTAINMENTSWITHSAMEID].id;
warning.name = s_knownWarnings[Data::Error::APPLETSANDCONTAINMENTSWITHSAMEID].name;
warning.id = s_knownWarnings[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].id;
warning.name = s_knownWarnings[Data::Error::APPLETANDCONTAINMENTWITHSAMEID].name;
if (layout->isActive()) { // active layout
QStringList registeredcontainments;
@ -1055,14 +1056,80 @@ bool Storage::hasAppletsAndContainmentsWithSameId(const Layout::GenericLayout *l
return !warning.information.isEmpty();
}
bool Storage::hasOrphanedParentAppletOfSubContainment(const Layout::GenericLayout *layout, Data::Error &error)
{
if (!layout || layout->file().isEmpty() || !QFile(layout->file()).exists()) {
return false;
}
error.id = s_knownErrors[Data::Error::ORPHANEDPARENTAPPLETOFSUBCONTAINMENT].id;
error.name = s_knownErrors[Data::Error::ORPHANEDPARENTAPPLETOFSUBCONTAINMENT].name;
Data::ViewsTable views = Layouts::Storage::self()->views(layout);
if (layout->isActive()) { // active layout
//! create error data
for (const auto containment : *layout->containments()) {
QString cid = QString::number(containment->id());
for (const auto applet : containment->applets()) {
QString aid = QString::number(applet->id());
int subid = subContainmentId(applet->config());
if (subid == IDNULL || hasContainment(layout, subid)) {
continue;
}
Data::ErrorInformation errorinfo;
errorinfo.id = QString::number(error.information.rowCount());
errorinfo.containment = metadata(containment->pluginMetaData().pluginId());
errorinfo.containment.storageId = cid;
errorinfo.applet = metadata(applet->pluginMetaData().pluginId());
errorinfo.applet.storageId = aid;
errorinfo.applet.subcontainmentId = subid;
error.information << errorinfo;
}
}
} else {
KSharedConfigPtr lfile = KSharedConfig::openConfig(layout->file());
KConfigGroup containmentsEntries = KConfigGroup(lfile, "Containments");
//! create error data
for (const auto &cid : containmentsEntries.groupList()) {
for (const auto &aid : containmentsEntries.group(cid).group("Applets").groupList()) {
int subid = subContainmentId(containmentsEntries.group(cid).group("Applets").group(aid));
if (subid == IDNULL || hasContainment(layout, subid)) {
continue;
}
Data::ErrorInformation errorinfo;
errorinfo.id = QString::number(error.information.rowCount());
errorinfo.containment = metadata(containmentsEntries.group(cid).readEntry("plugin", ""));
errorinfo.containment.storageId = cid;
errorinfo.applet = metadata(containmentsEntries.group(cid).group("Applets").group(aid).readEntry("plugin", ""));
errorinfo.applet.storageId = aid;
errorinfo.applet.subcontainmentId = subid;
error.information << errorinfo;
}
}
}
return !error.information.isEmpty();
}
bool Storage::hasOrphanedSubContainments(const Layout::GenericLayout *layout, Data::Warning &warning)
{
if (!layout || layout->file().isEmpty() || !QFile(layout->file()).exists()) {
return false;
}
warning.id = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENTS].id;
warning.name = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENTS].name;
warning.id = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENT].id;
warning.name = s_knownWarnings[Data::Error::ORPHANEDSUBCONTAINMENT].name;
Data::ViewsTable views = Layouts::Storage::self()->views(layout);
@ -1117,6 +1184,12 @@ Data::ErrorsList Storage::errors(const Layout::GenericLayout *layout)
errs << error1;
}
Data::Error error2;
if (hasOrphanedParentAppletOfSubContainment(layout, error2)) {
errs << error2;
}
return errs;
}
@ -1134,9 +1207,11 @@ Data::WarningsList Storage::warnings(const Layout::GenericLayout *layout)
warns << warning1;
}
Data::Error error1;
Data::Warning warning2;
if (hasOrphanedSubContainments(layout, warning2)) {
if (!hasOrphanedParentAppletOfSubContainment(layout, error1) /*this is needed because this error has higher priority*/
&& hasOrphanedSubContainments(layout, warning2)) {
warns << warning2;
}
@ -1324,6 +1399,34 @@ bool Storage::containsView(const QString &filepath, const int &viewId)
return viewGroup.exists() && isLatteContainment(viewGroup);
}
bool Storage::hasContainment(const Layout::GenericLayout *layout, const int &id)
{
if (!layout || layout->file().isEmpty() || !QFile(layout->file()).exists()) {
return false;
}
if (layout->isActive()) { // active layout
for(const auto containment : *layout->containments()) {
if ((int)containment->id() == id) {
return true;
}
}
} else { // inactive layout
KSharedConfigPtr lfile = KSharedConfig::openConfig(layout->file());
KConfigGroup containmentsEntries = KConfigGroup(lfile, "Containments");
//! create warning data
for (const auto &cid : containmentsEntries.groupList()) {
if (cid.toInt() == id) {
return true;
}
}
}
return false;
}
Data::GenericTable<Data::Generic> Storage::subcontainments(const Layout::GenericLayout *layout, const Plasma::Containment *lattecontainment) const
{
Data::GenericTable<Data::Generic> subs;

5
app/layouts/storage.h
Unescape Escape View File

@ -67,6 +67,7 @@ public:
bool isLatteContainment(const KConfigGroup &group) const;
bool isSubContainment(const Layout::GenericLayout *layout, const Plasma::Applet *applet) const;
bool hasContainment(const Layout::GenericLayout *layout, const int &id);
bool containsView(const QString &filepath, const int &viewId);
int subContainmentId(const KConfigGroup &appletGroup) const;
@ -135,8 +136,10 @@ private:
QStringList containmentsIds(const QString &filepath);
QStringList appletsIds(const QString &filepath);
//! errors/warnings checkers
//! errors checkers
bool hasDifferentAppletsWithSameId(const Layout::GenericLayout *layout, Data::Error &error);
bool hasOrphanedParentAppletOfSubContainment(const Layout::GenericLayout *layout, Data::Error &error);
//! warnings checkers
bool hasAppletsAndContainmentsWithSameId(const Layout::GenericLayout *layout, Data::Warning &warning);
bool hasOrphanedSubContainments(const Layout::GenericLayout *layout, Data::Warning &warning);
private:

Write Preview
Loading…
Cancel
Save