Installed apps model - track removed packages

Author: mentaljam

src/orninstalledappsmodel.cpp

@@ -6,8 +6,11 @@
 OrnInstalledAppsModel::OrnInstalledAppsModel(QObject *parent) :
     QAbstractListModel(parent)
 {
-    connect(OrnZypp::instance(), &OrnZypp::installedAppsReady,
+    auto ornZypp = OrnZypp::instance();
+    connect(ornZypp, &OrnZypp::installedAppsReady,
             this, &OrnInstalledAppsModel::onInstalledAppsReady);
+    connect(ornZypp, &OrnZypp::packageRemoved,
+            this, &OrnInstalledAppsModel::onPackageRemoved);
     this->reset();
 }
 
@@ -32,6 +35,22 @@ void OrnInstalledAppsModel::onInstalledAppsReady(const OrnZypp::AppList &apps)
     this->endResetModel();
 }
 
+void OrnInstalledAppsModel::onPackageRemoved(const QString &packageId)
+{
+    auto name = packageId.section(QChar(';'), 0, 0);
+    auto size = mData.size();
+    for (OrnZypp::AppList::size_type i = 0; i < size; ++i)
+    {
+        if (mData[i].name == name)
+        {
+            this->beginRemoveRows(QModelIndex(), i, i);
+            mData.removeAt(i);
+            this->endInsertRows();
+            return;
+        }
+    }
+}
+
 int OrnInstalledAppsModel::rowCount(const QModelIndex &parent) const
 {
     return !parent.isValid() ? mData.size() : 0;
@@ -65,6 +84,10 @@ QVariant OrnInstalledAppsModel::data(const QModelIndex &index, int role) const
     case UpdateAvailableRole:
         // Return int to make it easier to parse
         return (int)!app.updateId.isEmpty();
+    case PackageIdRole:
+        return app.packageId;
+    case UpdateIdRole:
+        return app.updateId;
     default:
         return QVariant();
     }
@@ -79,6 +102,8 @@ QHash<int, QByteArray> OrnInstalledAppsModel::roleNames() const
         { AuthorRole,  "appAuthor"     },
         { IconRole,    "appIconSource" },
         { SectionRole, "section"       },
-        { UpdateAvailableRole, "updateAvailable" }
+        { UpdateAvailableRole, "updateAvailable" },
+        { PackageIdRole, "packageId"     },
+        { UpdateIdRole,  "updateId"      },
     };
 }

src/orninstalledappsmodel.h

@@ -20,7 +20,9 @@ class OrnInstalledAppsModel : public QAbstractListModel
         IconRole,
         SortRole,
         SectionRole,
-        UpdateAvailableRole
+        UpdateAvailableRole,
+        PackageIdRole,
+        UpdateIdRole
     };
     Q_ENUM(Roles)
 
@@ -31,6 +33,7 @@ public slots:
 
 private slots:
     void onInstalledAppsReady(const OrnZypp::AppList &apps);
+    void onPackageRemoved(const QString &packageId);
 
 private:
     OrnZypp::AppList mData;

src/ornzypp.cpp

@@ -324,7 +324,7 @@ void OrnZypp::removePackage(const QString &packageId)
         }
         emit this->packageRemoved(packageId);
     });
-    qDebug() << "Removing package" << packageId << "with" << t << "method installPackage()";
+    qDebug() << "Removing package" << packageId << "with" << t << "method removePackage()";
     t->removePackage(packageId);
 }
 
@@ -547,6 +547,7 @@ void OrnZypp::pInstalledApps()
             idParts[1],
             this->packageRepo(name).mid(repoNamePrefixLength),
             icon,
+            id,
             // The update package id or an empty string
             mUpdates.value(name)
         };

src/ornzypp.h

@@ -45,6 +45,7 @@ class OrnZypp : public QObject
         QString version;
         QString author;
         QString icon;
+        QString packageId;
         QString updateId;
     };