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

List:       kde-commits
Subject:    playground/sysadmin/shaman
From:       Dario Freddi <drf () kde ! org>
Date:       2009-12-25 16:05:30
Message-ID: 1261757130.420182.16252.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1066057 by dafre:

More work on providers and local packages

Signed-off-by: Dario Freddi <drf@kde.org>

 M  +17 -6     libshaman/backends/aqpm/AqpmPlugin.cpp  
 M  +15 -3     libshaman/shamanprovider.cpp  
 M  +2 -1      libshaman/shamanprovider.h  
 M  +5 -0      libshaman/shamanproviderplugin.cpp  
 M  +2 -1      libshaman/shamanproviderplugin.h  
 M  +1 -0      libshaman/shamantransactioninterface.h  
 M  +1 -2      plugins/aur/AurPlugin.cpp  
 M  +1 -1      plugins/aur/AurPlugin.h  


--- trunk/playground/sysadmin/shaman/libshaman/backends/aqpm/AqpmPlugin.cpp \
#1066056:1066057 @@ -727,15 +727,26 @@
     Backend::instance()->clearQueue();
 
     foreach (Shaman::AbstractPackage *package, backend()->queuedPackages()) {
-        switch (package->action()) {
-            case Shaman::AbstractPackage::Install:
-            case Shaman::AbstractPackage::Upgrade:
-                Backend::instance()->addItemToQueue(package->name(), \
QueueItem::Sync); +        switch (package->type()) {
+            case Shaman::AbstractPackage::LocalPackageType:
+                Backend::instance()->addItemToQueue(qobject_cast< \
Shaman::LocalPackage* >(package)->path().toLocalFile(), +                             \
QueueItem::FromFile);  break;
-            case Shaman::AbstractPackage::Uninstall:
-                Backend::instance()->addItemToQueue(package->name(), \
QueueItem::Remove); +            case Shaman::AbstractPackage::BackendPackageType:
+                switch (package->action()) {
+                    case Shaman::AbstractPackage::Install:
+                    case Shaman::AbstractPackage::Upgrade:
+                        Backend::instance()->addItemToQueue(package->name(), \
QueueItem::Sync); +                        break;
+                    case Shaman::AbstractPackage::Uninstall:
+                        Backend::instance()->addItemToQueue(package->name(), \
QueueItem::Remove); +                        break;
+                    default:
+                        break;
+                }
                 break;
             default:
+                kWarning() << "I got a package which is not from local fs or from \
backend, there's something screwed";  break;
         }
     }
--- trunk/playground/sysadmin/shaman/libshaman/shamanprovider.cpp #1066056:1066057
@@ -71,19 +71,31 @@
     return d->state;
 }
 
-bool Provider::cancelProcessing()
+void Provider::cancelProcessing()
 {
-
+    Q_D(Provider);
+    d->plugin->cancelProcessing();
 }
 
 void Provider::markAdditionalTargetsForQueue()
 {
-
+    Q_D(Provider);
+    d->plugin->setState(Shaman::Backend::MarkingAdditionalTargets);
+    d->plugin->markAdditionalTargetsForQueue();
 }
 
 void Provider::process()
 {
+    Q_D(Provider);
+    d->plugin->setState(Shaman::Backend::OnTransaction);
+    d->plugin->process();
+}
 
+void Provider::reload()
+{
+    Q_D(Provider);
+    d->plugin->setState(Shaman::Backend::Reloading);
+    d->plugin->reload();
 }
 
 void Provider::search(const QString& search)
--- trunk/playground/sysadmin/shaman/libshaman/shamanprovider.h #1066056:1066057
@@ -45,7 +45,8 @@
 
         void markAdditionalTargetsForQueue();
         void process();
-        bool cancelProcessing();
+        void cancelProcessing();
+        void reload();
 
         AbstractPackage::List packages() const;
         QSet< AbstractPackage* > allAvailablePackages() const;
--- trunk/playground/sysadmin/shaman/libshaman/shamanproviderplugin.cpp \
#1066056:1066057 @@ -34,6 +34,11 @@
     d->provider->d_ptr->state = state;
 }
 
+void ProviderPlugin::reload()
+{
+    setState(Shaman::Backend::Idling);
+}
+
 void ProviderPlugin::setAdditionalTargetsForQueue(const \
Shaman::AbstractPackage::List& packages)  {
     Q_D(ProviderPlugin);
--- trunk/playground/sysadmin/shaman/libshaman/shamanproviderplugin.h \
#1066056:1066057 @@ -38,7 +38,8 @@
 
         virtual void markAdditionalTargetsForQueue() = 0;
         virtual void process() = 0;
-        virtual bool cancelProcessing() = 0;
+        virtual void cancelProcessing() = 0;
+        virtual void reload();
 
         virtual void search(const QString &search) = 0;
 
--- trunk/playground/sysadmin/shaman/libshaman/shamantransactioninterface.h \
#1066056:1066057 @@ -111,6 +111,7 @@
              */
             ProviderError = 9,
             HookError = 10,
+            CanceledByUser = 255,
             /**
              * An unknown Error occurred.
              */
--- trunk/playground/sysadmin/shaman/plugins/aur/AurPlugin.cpp #1066056:1066057
@@ -39,9 +39,8 @@
 {
 }
 
-bool AurPlugin::cancelProcessing()
+void AurPlugin::cancelProcessing()
 {
-    return true;
 }
 
 void AurPlugin::markAdditionalTargetsForQueue()
--- trunk/playground/sysadmin/shaman/plugins/aur/AurPlugin.h #1066056:1066057
@@ -27,7 +27,7 @@
         virtual void init();
         virtual void process();
         virtual void markAdditionalTargetsForQueue();
-        virtual bool cancelProcessing();
+        virtual void cancelProcessing();
         virtual void search(const QString &search);
 
     public slots:


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