[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/kdewin-installer
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2007-06-19 8:40:40
Message-ID: 1182242440.660996.6188.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 677503 by habacker:

- added console options -q <packagename>, -q -l <packagename>, -q -a 

 M  +21 -0     console/installerengineconsole.cpp  
 M  +1 -0      console/installerengineconsole.h  
 M  +24 -2     console/main.cpp  
 M  +2 -6      shared/database.cpp  
 M  +1 -1      shared/database.h  


--- trunk/kdesupport/kdewin-installer/console/installerengineconsole.cpp #677502:677503
@@ -40,6 +40,27 @@
 {
 }
 
+/**
+ query package from installed package database 
+ @param pkgName 
+*/ 
+void InstallerEngineConsole::queryPackages(const QString &pkgName, bool listFiles)
+{
+    if (pkgName.isEmpty()) {
+        m_database->listPackages();
+        return;
+    }
+    if (listFiles)
+        m_database->listPackageFiles(pkgName);
+    else {
+        Package *pkg = m_database->getPackage(pkgName);
+        if (!pkg)
+            return; 
+
+        printf("%s\n", pkg->toString(true).toAscii().data());
+    }
+}
+
 void InstallerEngineConsole::listPackages(const QString &title)
 {
     QList <PackageList *>::iterator k;
--- trunk/kdesupport/kdewin-installer/console/installerengineconsole.h #677502:677503
@@ -29,6 +29,7 @@
 {
 public:
     InstallerEngineConsole(DownloaderProgress *progressBar,InstallerProgress *instProgressBar);
+    void queryPackages(const QString &pkgName=QString(), bool listFiles=false);
     void listPackages(const QString &title);
     bool downloadPackages(const QStringList &packages, const QString &category=QString());
     bool installPackages(const QStringList &packages, const QString &category=QString());
--- trunk/kdesupport/kdewin-installer/console/main.cpp #677502:677503
@@ -32,6 +32,7 @@
 #include "downloader.h"
 #include "installer.h"
 #include "installerengineconsole.h"
+#include "misc.h"
 
 static struct Options
 {
@@ -41,6 +42,7 @@
     bool install;
     bool list;
     bool dump;
+    bool all;
     QString rootdir;
 }
 options;
@@ -52,6 +54,7 @@
     << "\nOptions: "
     << "\n -l list packages"
     << "\n -q <packagename> query packages"
+    << "\n -q <packagename> -l list package files"
     << "\n -i <packagename> download and install package"
     << "\n -d <packagename> download package"
     << "\n -D dump internal data"
@@ -61,6 +64,7 @@
 
 int main(int argc, char *argv[])
 {
+    setMessageHandler();
     QCoreApplication app(argc, argv);
 
     QStringList packages;
@@ -77,6 +81,8 @@
             }
             if (option == "-l")
                 options.list = true;
+            if (option == "-a")
+                options.all = true;
             else if (option == "-v")
                 options.verbose = true;
             else if (option == "-q")
@@ -103,12 +109,28 @@
 
 #if 1
     InstallerEngineConsole engine(0,0);
+    engine.readGlobalConfig();
     if (!options.rootdir.isEmpty())
         Settings::getInstance().setInstallDir(options.rootdir);
-        
-    engine.downloadPackageLists();
+
+    if (options.query && packages.size() > 0) {
+        for(int i = 0; i < packages.size(); i++)
+            engine.queryPackages(packages[i],options.list);
+        return 0;
+    }   
+    else if (options.query && options.all) {
+        engine.queryPackages();
+        return 0;
+    }
+
+/*
     if (options.list)
         engine.listPackages("Package List");
+*/
+
+    if(options.download || options.install)
+        engine.downloadPackageLists();
+
     if((options.download || options.install) && packages.size() > 0)
             engine.downloadPackages(packages);
     if(options.install && packages.size() > 0)
--- trunk/kdesupport/kdewin-installer/shared/database.cpp #677502:677503
@@ -100,15 +100,11 @@
     qDebug() << title;
     QList<Package*>::iterator it;
     for (it = m_database.begin(); it != m_database.end(); ++it)
-        qDebug() << (*it)->toString(true," - ");
+        printf("%s\n",(*it)->toString(true," - ").toAscii().data());
 }
 
-void Database::queryPackage(const QString &pkgName, bool listFiles)
+void Database::listPackageFiles(const QString &pkgName)
 {
-    if (pkgName.isEmpty()) {
-        listPackages();
-        return;
-    }
     Package *pkg = getPackage(pkgName);
     if (!pkg)
         return; 
--- trunk/kdesupport/kdewin-installer/shared/database.h #677502:677503
@@ -42,7 +42,7 @@
     virtual ~Database();
     bool readFromDirectory(const QString &dirPath=QString());
     void addPackage(const Package &package);
-    void queryPackage(const QString &pkgName=QString(), bool listFiles=false);
+    void listPackageFiles(const QString &pkgName);
     void listPackages(const QString &title=QString());
     Package *getPackage(const QString &pkgName, const QByteArray &version=QByteArray());
     bool addUnhandledPackages(PackageList *packageList);
[prev in list] [next in list] [prev in thread] [next in thread]