fixed dpkg get packages

aerowolf · Feb 27, 2018 · 34bad95 · 34bad95
1 parent 3b626b9
commit 34bad95
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 146 deletions.
diff --git a/stacer-core/Tools/package_tool.cpp b/stacer-core/Tools/package_tool.cpp
@@ -27,7 +27,8 @@ QStringList PackageTool::getDpkgPackages()
     try {
         packageList = CommandUtil::exec("bash", {"-c", "dpkg --get-selections 2> /dev/null"})
                 .trimmed()
-                .split("\n");
+                .split('\n')
+                .filter(QRegExp("\\s+install$"));
 
         for (int i = 0; i < packageList.count(); ++i)
             packageList[i] = packageList.at(i).split(QRegExp("\\s+")).first();
@@ -66,7 +67,7 @@ QStringList PackageTool::getRpmPackages()
     try {
         packageList = CommandUtil::exec("bash", {"-c", "rpm -qa 2> /dev/null"})
                 .trimmed()
-                .split("\n");
+                .split('\n');
 
     } catch(QString &ex) {
         qCritical() << ex;
@@ -126,7 +127,7 @@ QStringList PackageTool::getPacmanPackages()
     try {
         packageList = CommandUtil::exec("bash", {"-c", "pacman -Q 2> /dev/null"})
                 .trimmed()
-                .split("\n");
+                .split('\n');
 
         for (int i = 0; i < packageList.count(); ++i)
             packageList[i] = packageList.at(i).split(QRegExp("\\s+")).first();

diff --git a/stacer/Managers/tool_manager.cpp b/stacer/Managers/tool_manager.cpp
@@ -81,7 +81,7 @@ QFileInfoList ToolManager::getPackageCaches() const
 
 void ToolManager::uninstallPackages(const QStringList &packages)
 {
-    uninstallStarted();
+    emit uninstallStarted();
 
     switch (PackageTool::currentPackageTool) {
     case PackageTool::PackageTools::APT:
@@ -100,7 +100,7 @@ void ToolManager::uninstallPackages(const QStringList &packages)
         break;
     }
 
-    uninstallFinished();
+    emit uninstallFinished();
 }
 
 /******************

diff --git a/stacer/Pages/Uninstaller/uninstaller_page.cpp b/stacer/Pages/Uninstaller/uninstaller_page.cpp
@@ -28,20 +28,20 @@ void UninstallerPage::init()
 
     QtConcurrent::run(this, &UninstallerPage::loadPackages);
 
-    connect(tm, &ToolManager::uninstallFinished, this, &UninstallerPage::loadPackages);
     connect(tm, &ToolManager::uninstallStarted, this, &UninstallerPage::uninstallStarted);
+    connect(tm, &ToolManager::uninstallFinished, this, &UninstallerPage::loadPackages);
 }
 
 void UninstallerPage::loadPackages()
 {
-    uninstallStarted();
+    emit uninstallStarted();
 
     // clear items
     ui->packagesList->clear();
 
     QIcon icon(QString(":/static/themes/%1/img/package.svg").arg(AppManager::ins()->getThemeName()));
-    for (const QString &package : tm->getPackages())
-    {
+    QStringList packages = tm->getPackages();
+    for (const QString &package : packages) {
         QListWidgetItem *item = new QListWidgetItem(QIcon::fromTheme(package, icon), QString("  %1").arg(package));
 
         item->setCheckState(Qt::Unchecked);
@@ -52,7 +52,6 @@ void UninstallerPage::loadPackages()
 
     ui->packagesList->setEnabled(true);
     ui->packageSearch->setEnabled(true);
-    ui->uninstallBtn->show();
     ui->packageSearch->clear();
 
     ui->loading->hide();
@@ -65,6 +64,7 @@ void UninstallerPage::setAppCount()
     ui->packagesTitle->setText(tr("System Installed Packages (%1)").arg(count));
 
     ui->notFoundWidget->setVisible(! count);
+    ui->uninstallBtn->setVisible(count);
     ui->packagesList->setVisible(count);
 }
 
@@ -87,8 +87,7 @@ void UninstallerPage::on_uninstallBtn_clicked()
 {
     QStringList selectedPackages = getSelectedPackages();
 
-    if(! selectedPackages.isEmpty())
-    {
+    if(! selectedPackages.isEmpty()) {
         QtConcurrent::run([selectedPackages]() -> void {
             ToolManager::ins()->uninstallPackages(selectedPackages);
         });