Changeset 7541802

Timestamp:

Apr 25, 2013 10:28:25 AM (3 weeks ago)

Author:

Kris Moore <kris@…>

Branches:

master, 9.1-release

Children:

48831cd

Parents:

47e969a

Message:

Add logic to detect all the messy deps when we add / remove NG packages

Add new dialog to display exactly whats going to happen to the end user

Location:

src-qt4/pc-pkgmanager

Files:

• dialogConfirm.cpp (added)
• dialogConfirm.h (added)
• dialogConfirm.ui (added)
• mainWin.cpp (modified) (4 diffs)
• mainWin.h (modified) (3 diffs)
• pc-pkgmanager.pro (modified) (1 diff)

src-qt4/pc-pkgmanager/mainWin.cpp

@@ -92 +92 @@
   if ( stackedPkgView->currentIndex() == 0 )
   {
-      saveMetaPkgs();   
+     saveMetaPkgs();   
   } else {
-  // Running in advanced mode
-
+     // Running in advanced mode
+     applyNGChanges();
   }
 
@@ -455 +455 @@
         disconnect(treeNGPkgs, SIGNAL(itemChanged(QTreeWidgetItem *, int)), 0, 0);
   pkgList.clear();
+  selPkgList.clear();
 
   // Start the process to get meta-pkg info
@@ -482 +483 @@
 
 void mainWin::slotGetNGInstalledPkgs() {
+
+  qDebug() << "Building dependancy lists...";
+  QProcess p;
+  pkgDepList.clear();
+  if ( wDir.isEmpty() )
+    p.start("pkg", QStringList() << "rquery" << "-a" << "%n-%v:::%dn-%dv");
+  else
+    p.start("chroot", QStringList() << wDir << "pkg" "rquery" << "-a" << "%n-%v:::%dn-%dv" );
+  while(p.state() == QProcess::Starting || p.state() == QProcess::Running) {
+      p.waitForFinished(200);
+      QCoreApplication::processEvents();
+  }
+  while (p.canReadLine()) {
+    pkgDepList << p.readLine().simplified();
+  }
+
+  qDebug() << "Building reverse dependancy lists...";
+  pkgRDepList.clear();
+  if ( wDir.isEmpty() )
+    p.start("pkg", QStringList() << "rquery" << "-a" << "%n-%v:::%rn-%rv");
+  else
+    p.start("chroot", QStringList() << wDir << "pkg" "rquery" << "-a" << "%n-%v:::%rn-%rv" );
+  while(p.state() == QProcess::Starting || p.state() == QProcess::Running) {
+      p.waitForFinished(200);
+      QCoreApplication::processEvents();
+  }
+  while (p.canReadLine()) {
+    pkgRDepList << p.readLine().simplified();
+  }
 
   getNGProc = new QProcess();
@@ -543 +573 @@
         pkgItem->setToolTip(0, desc);
 
-        if ( pkgList.indexOf(pkgname) != -1 )
+        if ( pkgList.indexOf(pkgname) != -1 ) {
           pkgItem->setCheckState(0, Qt::Checked);
-        else
+          selPkgList << pkgname;
+        } else
           pkgItem->setCheckState(0, Qt::Unchecked);
   
         catItem->addChild(pkgItem);
    }
+
+}
+
+// Lets prompt user, and do it!
+void mainWin::applyNGChanges()
+{
+   QString tmp;
+   QStringList curPkgChecked;
+   QStringList newPkgs;
+   QStringList rmPkgs;
+
+   QTreeWidgetItemIterator it(treeNGPkgs);
+   while (*it) {
+         if ((*it)->checkState(0) == Qt::Checked) {
+           tmp = (*it)->text(0).section("(", 1, 1).section(")", 0, 0);
+           curPkgChecked << tmp;
+           if (pkgList.indexOf(tmp) == -1 ) 
+              newPkgs << tmp;
+         }
+         ++it;
+   }
+
+   for ( int i=0; i < pkgList.size(); ++i)
+      // Has this package been unchecked?
+      if (curPkgChecked.indexOf(pkgList.at(i)) == -1 )  {
+         // Make sure this is a package in the repo
+         // This filters out any custom packages the user may have loaded which may not exist in our repo
+         QRegExp rx("*" + pkgList.at(i) + "*");
+         rx.setPatternSyntax(QRegExp::Wildcard);
+         if ( tmpPkgList.indexOf(rx) != -1 )
+           rmPkgs << pkgList.at(i);
+      }
+
+   if ( rmPkgs.isEmpty() && newPkgs.isEmpty() ) {
+      QMessageBox::warning(this, tr("No changes"),
+        tr("No changes to make!"),
+        QMessageBox::Ok,
+        QMessageBox::Ok);
+      return;
+   }
+
+   qDebug() << "Added packages" << newPkgs;
+   qDebug() << "Removed packages" << rmPkgs;
+   pkgRemoveList = rmPkgs;
+   pkgAddList = newPkgs;
+
+   QString confirmText;
+
+   // Lets start creating our confirmation text
+   if ( ! rmPkgs.isEmpty() ) {
+      confirmText+=tr("The following packages will be removed:") + "\n"; 
+      confirmText+= "------------------------------------------\n";
+      confirmText+=rmPkgs.join("\n"); 
+      confirmText+= "\n\n" + tr("The following packages that require the above packages will also removed:") + "\n"; 
+      confirmText+= "------------------------------------------\n";
+      for ( int i=0; i < rmPkgs.size(); ++i) {
+         QRegExp rx(rmPkgs.at(i) + ":::*");
+         rx.setPatternSyntax(QRegExp::Wildcard);
+         QStringList rDeps = pkgRDepList.filter(rx);
+         for ( int r=0; r < rDeps.size(); ++r) {
+             QString pName = rDeps.at(r).section(":::", 1, 1); 
+             // Is this package installed?
+             if ( pkgList.indexOf(pName) != -1 )
+               confirmText+= pName + " ";
+         }
+      }
+   }
+
+   if ( ! newPkgs.isEmpty() ) {
+      if ( ! rmPkgs.isEmpty() )
+        confirmText+= "\n\n";
+      confirmText+=tr("The following packages will be installed:") + "\n"; 
+      confirmText+= "------------------------------------------\n";
+      confirmText+=newPkgs.join("\n"); 
+      confirmText+= "\n\n" + tr("The following dependances will also be installed:") + "\n"; 
+      confirmText+= "------------------------------------------\n";
+      for ( int i=0; i < newPkgs.size(); ++i) {
+         QRegExp rx(newPkgs.at(i) + ":::*");
+         rx.setPatternSyntax(QRegExp::Wildcard);
+         QStringList aDeps = pkgDepList.filter(rx);
+         for ( int r=0; r < aDeps.size(); ++r) {
+             QString pName = aDeps.at(r).section(":::", 1, 1); 
+             // Is this package installed?
+             if ( pkgList.indexOf(pName) == -1 )
+               confirmText+= pName + " ";
+         }
+      }
+   }
+
+   // Launch our AddPartitionDialog to add a new device
+   askUserConfirm = new dialogConfirm();
+   connect(askUserConfirm, SIGNAL(ok()),this, SLOT(slotStartNGChanges()) );
+   askUserConfirm->programInit(tr("Confirm package changes"));
+   askUserConfirm->setInfoText(QString(confirmText));
+   askUserConfirm->exec();
+
+}
+
+
+// Time to start doing our NG changes!
+void mainWin::slotStartNGChanges()
+{
 
 }

src-qt4/pc-pkgmanager/mainWin.h

@@ -15 +15 @@
 #include <pcbsd-utils.h>
 #include <pcbsd-ui.h>
+#include "dialogConfirm.h"
 #include "ui_mainWin.h"
 #include "../config.h"
@@ -67 +68 @@
     void slotGetNGInstalledPkgs();
     void slotEnableApply();
+    void slotStartNGChanges();
 
 private:
@@ -121 +123 @@
     void populateNGPkgs();
     void addNGItems();
+    void applyNGChanges();
     QStringList tmpPkgList;
     QStringList pkgList;
+    QStringList pkgDepList;
+    QStringList pkgRDepList;
+    QStringList selPkgList;
+    QStringList pkgRemoveList;
+    QStringList pkgAddList;
     QProcess *getNGProc;
+    dialogConfirm *askUserConfirm;
 
 

src-qt4/pc-pkgmanager/pc-pkgmanager.pro

@@ -7 +7 @@
 INCLUDEPATH     += ../libpcbsd/utils ../libpcbsd/ui /usr/local/include
 
-HEADERS += mainWin.h
+HEADERS += mainWin.h dialogConfirm.h
 
-SOURCES += main.cpp mainWin.cpp
+SOURCES += main.cpp mainWin.cpp dialogConfirm.cpp
 
-FORMS   = mainWin.ui
+FORMS   = mainWin.ui dialogConfirm.ui
 
 RESOURCES = pc-pkgmanager.qrc