for a better visibilty, separate ActionThread and Task class iomplementation

CCMAIL: smit.meh@gmail.com
CCBUGS: 303980

rawconverter/CMakeLists.txt

@@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES(
 SET(kipiplugin_rawconverter_PART_SRCS plugin/plugin_rawconverter.cpp
                                       manager/rawdecodingiface.cpp
                                       manager/actionthread.cpp
+                                      manager/task.cpp
                                       dialogs/batchdialog.cpp
                                       dialogs/singledialog.cpp
                                       dialogs/myimagelist.cpp

rawconverter/manager/actionthread.cpp

@@ -26,26 +26,12 @@
 
 // KDE includes
 
-#include <klocale.h>
-#include <kstandarddirs.h>
 #include <threadweaver/ThreadWeaver.h>
 #include <threadweaver/JobCollection.h>
 
-// LibKIPI includes
-
-#include <libkipi/interface.h>
-#include <libkipi/pluginloader.h>
-
-// LibKDcraw includes
-
-#include <libkdcraw/dcrawinfocontainer.h>
-
 // Local includes
 
-#include "actions.h"
-#include "rawdecodingiface.h"
-#include "kphostsettings.h"
-#include "kpmetadata.h"
+#include "task.h"
 
 namespace KIPIRawConverterPlugin
 {
@@ -65,209 +51,6 @@ public:
 
 //------------------------------------------------------------
 
-class Task::Private
-{
-public:
-
-    Private()
-    {
-        cancel                 = false;
-        iface                  = 0;
-        PluginLoader* const pl = PluginLoader::instance();
-        if (pl)
-        {
-            iface = pl->interface();
-        }
-    }
-
-    bool                               cancel;
-
-    KUrl                               url;
-    Action                             action;
-
-    RawDecodingIface                   dcrawIface;
-
-    Interface*                         iface;
-
-    KPSaveSettingsWidget::OutputFormat outputFormat;
-
-    RawDecodingSettings                rawDecodingSettings;
-};
-
-Task::Task(QObject* const parent, const KUrl& fileUrl, const Action& action)
-    : Job(parent), d(new Private)
-{
-    d->url    = fileUrl;
-    d->action = action;
-}
-
-Task::~Task()
-{
-    slotCancel();
-    delete d;
-}
-
-void Task::setSettings(const RawDecodingSettings& rawDecodingSettings,
-                       KPSaveSettingsWidget::OutputFormat outputFormat)
-{
-    d->rawDecodingSettings = rawDecodingSettings;
-    d->outputFormat        = outputFormat;
-}
-
-void Task::slotCancel()
-{
-    d->cancel = true;
-    d->dcrawIface.cancel();
-}
-
-void Task::run()
-{
-    if (d->cancel)
-    {
-        return;
-    }
-
-    switch (d->action)
-    {
-        case IDENTIFY:
-        case IDENTIFY_FULL:
-        {
-            // Identify Camera model.
-            DcrawInfoContainer info;
-            {
-                KPFileReadLocker(d->iface, d->url.toLocalFile());
-                d->dcrawIface.rawFileIdentify(info, d->url.toLocalFile());
-            }
-
-            QString identify = i18n("Cannot identify RAW image");
-
-            if (info.isDecodable)
-            {
-                if (d->action == IDENTIFY)
-                {
-                    identify = info.make + QString("-") + info.model;
-                }
-                else
-                {
-                    identify = i18n("<br>Make: %1<br>",   info.make);
-                    identify.append(i18n("Model: %1<br>", info.model));
-
-                    if (info.dateTime.isValid())
-                    {
-                        identify.append(i18n("Created: %1<br>",
-                        KGlobal::locale()->formatDateTime(info.dateTime,
-                                                          KLocale::ShortDate, true)));
-                    }
-
-                    if (info.aperture != -1.0)
-                    {
-                        identify.append(i18n("Aperture: f/%1<br>", QString::number(info.aperture)));
-                    }
-
-                    if (info.focalLength != -1.0)
-                    {
-                        identify.append(i18n("Focal: %1 mm<br>", info.focalLength));
-                    }
-
-                    if (info.exposureTime != -1.0)
-                    {
-                        identify.append(i18n("Exposure: 1/%1 s<br>", info.exposureTime));
-                    }
-
-                    if (info.sensitivity != -1)
-                    {
-                        identify.append(i18n("Sensitivity: %1 ISO", info.sensitivity));
-                    }
-                }
-            }
-
-            ActionData ad;
-            ad.action  = d->action;
-            ad.fileUrl = d->url;
-            ad.message = identify;
-            ad.success = true;
-            emit signalFinished(ad);
-            break;
-        }
-
-        case THUMBNAIL:
-        {
-            // Get embedded RAW file thumbnail.
-            QImage image;
-            {
-                KPFileReadLocker(d->iface, d->url.toLocalFile());
-                d->dcrawIface.loadRawPreview(image, d->url.toLocalFile());
-            }
-
-            ActionData ad;
-            ad.action  = d->action;
-            ad.fileUrl = d->url;
-            ad.image   = image;
-            ad.success = true;
-            emit signalFinished(ad);
-            break;
-        }
-
-        case PREVIEW:
-        {
-            ActionData ad1;
-            ad1.action   = PREVIEW;
-            ad1.fileUrl  = d->url;
-            ad1.starting = true;
-            emit signalStarting(ad1);
-
-            QString destPath;
-            bool result = false;
-            {
-                KPFileReadLocker(d->iface, d->url.toLocalFile());
-                result = d->dcrawIface.decodeHalfRAWImage(d->url.toLocalFile(), destPath,
-                                                          d->outputFormat, d->rawDecodingSettings);
-            }
-
-            ActionData ad2;
-            ad2.action   = PREVIEW;
-            ad2.fileUrl  = d->url;
-            ad2.destPath = destPath;
-            ad2.success  = result;
-            emit signalFinished(ad2);
-            break;
-        }
-
-        case PROCESS:
-        {
-            ActionData ad1;
-            ad1.action   = PROCESS;
-            ad1.fileUrl  = d->url;
-            ad1.starting = true;
-            emit signalStarting(ad1);
-
-            QString destPath;
-            bool result = false;
-
-            {
-                KPFileReadLocker(d->iface, d->url.toLocalFile());
-                result = d->dcrawIface.decodeRAWImage(d->url.toLocalFile(), destPath,
-                                                      d->outputFormat, d->rawDecodingSettings);
-            }
-
-            ActionData ad2;
-            ad2.action   = PROCESS;
-            ad2.fileUrl  = d->url;
-            ad2.destPath = destPath;
-            ad2.success  = result;
-            emit signalFinished(ad2);
-            break;
-        }
-
-        default:
-        {
-            qCritical() << "Unknown action specified";
-        }
-    }
-}
-
-//------------------------------------------------------------
-
 ActionThread::ActionThread(QObject* const parent)
     : RActionThreadBase(parent), d(new Private)
 {

rawconverter/manager/actionthread.h

@@ -32,7 +32,6 @@
 // KDE includes
 
 #include <kurl.h>
-#include <threadweaver/Job.h>
 
 // LibKDcraw includes
 
@@ -42,18 +41,15 @@
 // Local includes
 
 #include "kpsavesettingswidget.h"
-
 #include "actions.h"
 
-using namespace KIPIPlugins;
 using namespace KDcrawIface;
 using namespace ThreadWeaver;
+using namespace KIPIPlugins;
 
 namespace KIPIRawConverterPlugin
 {
 
-class ActionData;
-
 class ActionThread : public RActionThreadBase
 {
     Q_OBJECT
@@ -95,39 +91,6 @@ private:
     Private* const d;
 };
 
-// -----------------------------------------------------------------------------------------------------------------------
-
-class Task : public Job
-{
-    Q_OBJECT
-
-public:
-
-    Task(QObject* const parent, const KUrl& url, const Action& action);
-    ~Task();
-
-    void setSettings(const RawDecodingSettings& rawDecodingSettings,
-                     KPSaveSettingsWidget::OutputFormat outputFormat);
-
-Q_SIGNALS:
-
-    void signalStarting(const KIPIRawConverterPlugin::ActionData& ad);
-    void signalFinished(const KIPIRawConverterPlugin::ActionData& ad);
-
-public Q_SLOTS:
-
-    void slotCancel();
-
-protected:
-
-    void run();
-
-private:
-
-    class Private;
-    Private* const d;
-};
-
 }  // namespace KIPIRawConverterPlugin
 
 #endif /* ACTIONTHREAD_H */

rawconverter/manager/task.cpp

+/* ============================================================
+ *
+ * This file is a part of kipi-plugins project
+ * http://www.digikam.org
+ *
+ * Date        : 2003-12-03
+ * Description : a class to manage plugin actions using threads
+ *
+ * Copyright (C) 2003-2005 by Renchi Raju <renchi dot raju at gmail dot com>
+ * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2012      by Smit Mehta <smit dot meh at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * ============================================================ */
+
+#include "task.moc"
+
+// KDE includes
+
+#include <klocale.h>
+
+// LibKIPI includes
+
+#include <libkipi/interface.h>
+#include <libkipi/pluginloader.h>
+
+// LibKDcraw includes
+
+#include <libkdcraw/dcrawinfocontainer.h>
+
+// Local includes
+
+#include "rawdecodingiface.h"
+#include "kphostsettings.h"
+#include "kpmetadata.h"
+
+namespace KIPIRawConverterPlugin
+{
+
+class Task::Private
+{
+public:
+
+    Private()
+    {
+        cancel                 = false;
+        iface                  = 0;
+        PluginLoader* const pl = PluginLoader::instance();
+        if (pl)
+        {
+            iface = pl->interface();
+        }
+    }
+
+    bool                               cancel;
+
+    KUrl                               url;
+    Action                             action;
+
+    RawDecodingIface                   dcrawIface;
+
+    Interface*                         iface;
+
+    KPSaveSettingsWidget::OutputFormat outputFormat;
+
+    RawDecodingSettings                rawDecodingSettings;
+};
+
+Task::Task(QObject* const parent, const KUrl& fileUrl, const Action& action)
+    : Job(parent), d(new Private)
+{
+    d->url    = fileUrl;
+    d->action = action;
+}
+
+Task::~Task()
+{
+    slotCancel();
+    delete d;
+}
+
+void Task::setSettings(const RawDecodingSettings& rawDecodingSettings,
+                       KPSaveSettingsWidget::OutputFormat outputFormat)
+{
+    d->rawDecodingSettings = rawDecodingSettings;
+    d->outputFormat        = outputFormat;
+}
+
+void Task::slotCancel()
+{
+    d->cancel = true;
+    d->dcrawIface.cancel();
+}
+
+void Task::run()
+{
+    if (d->cancel)
+    {
+        return;
+    }
+
+    switch (d->action)
+    {
+        case IDENTIFY:
+        case IDENTIFY_FULL:
+        {
+            // Identify Camera model.
+            DcrawInfoContainer info;
+            {
+                KPFileReadLocker(d->iface, d->url.toLocalFile());
+                d->dcrawIface.rawFileIdentify(info, d->url.toLocalFile());
+            }
+
+            QString identify = i18n("Cannot identify RAW image");
+
+            if (info.isDecodable)
+            {
+                if (d->action == IDENTIFY)
+                {
+                    identify = info.make + QString("-") + info.model;
+                }
+                else
+                {
+                    identify = i18n("<br>Make: %1<br>",   info.make);
+                    identify.append(i18n("Model: %1<br>", info.model));
+
+                    if (info.dateTime.isValid())
+                    {
+                        identify.append(i18n("Created: %1<br>",
+                        KGlobal::locale()->formatDateTime(info.dateTime,
+                                                          KLocale::ShortDate, true)));
+                    }
+
+                    if (info.aperture != -1.0)
+                    {
+                        identify.append(i18n("Aperture: f/%1<br>", QString::number(info.aperture)));
+                    }
+
+                    if (info.focalLength != -1.0)
+                    {
+                        identify.append(i18n("Focal: %1 mm<br>", info.focalLength));
+                    }
+
+                    if (info.exposureTime != -1.0)
+                    {
+                        identify.append(i18n("Exposure: 1/%1 s<br>", info.exposureTime));
+                    }
+
+                    if (info.sensitivity != -1)
+                    {
+                        identify.append(i18n("Sensitivity: %1 ISO", info.sensitivity));
+                    }
+                }
+            }
+
+            ActionData ad;
+            ad.action  = d->action;
+            ad.fileUrl = d->url;
+            ad.message = identify;
+            ad.success = true;
+            emit signalFinished(ad);
+            break;
+        }
+
+        case THUMBNAIL:
+        {
+            // Get embedded RAW file thumbnail.
+            QImage image;
+            {
+                KPFileReadLocker(d->iface, d->url.toLocalFile());
+                d->dcrawIface.loadRawPreview(image, d->url.toLocalFile());
+            }
+
+            ActionData ad;
+            ad.action  = d->action;
+            ad.fileUrl = d->url;
+            ad.image   = image;
+            ad.success = true;
+            emit signalFinished(ad);
+            break;
+        }
+
+        case PREVIEW:
+        {
+            ActionData ad1;
+            ad1.action   = PREVIEW;
+            ad1.fileUrl  = d->url;
+            ad1.starting = true;
+            emit signalStarting(ad1);
+
+            QString destPath;
+            bool result = false;
+            {
+                KPFileReadLocker(d->iface, d->url.toLocalFile());
+                result = d->dcrawIface.decodeHalfRAWImage(d->url.toLocalFile(), destPath,
+                                                          d->outputFormat, d->rawDecodingSettings);
+            }
+
+            ActionData ad2;
+            ad2.action   = PREVIEW;
+            ad2.fileUrl  = d->url;
+            ad2.destPath = destPath;
+            ad2.success  = result;
+            emit signalFinished(ad2);
+            break;
+        }
+
+        case PROCESS:
+        {
+            ActionData ad1;
+            ad1.action   = PROCESS;
+            ad1.fileUrl  = d->url;
+            ad1.starting = true;
+            emit signalStarting(ad1);
+
+            QString destPath;
+            bool result = false;
+
+            {
+                KPFileReadLocker(d->iface, d->url.toLocalFile());
+                result = d->dcrawIface.decodeRAWImage(d->url.toLocalFile(), destPath,
+                                                      d->outputFormat, d->rawDecodingSettings);
+            }
+
+            ActionData ad2;
+            ad2.action   = PROCESS;
+            ad2.fileUrl  = d->url;
+            ad2.destPath = destPath;
+            ad2.success  = result;
+            emit signalFinished(ad2);
+            break;
+        }
+
+        default:
+        {
+            qCritical() << "Unknown action specified";
+        }
+    }
+}
+
+}  // namespace KIPIRawConverterPlugin

rawconverter/manager/task.h

+/* ============================================================
+ *
+ * This file is a part of kipi-plugins project
+ * http://www.digikam.org
+ *
+ * Date        : 2003-12-03
+ * Description : a class to manage plugin actions using threads
+ *
+ * Copyright (C) 2003-2005 by Renchi Raju <renchi dot raju at gmail dot com>
+ * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2012      by Smit Mehta <smit dot meh at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * ============================================================ */
+
+#ifndef TASK_H
+#define TASK_H
+
+// KDE includes
+
+#include <kurl.h>
+#include <threadweaver/Job.h>
+
+// LibKDcraw includes
+
+#include <libkdcraw/rawdecodingsettings.h>
+
+// Local includes
+
+#include "kpsavesettingswidget.h"
+#include "actions.h"
+
+using namespace ThreadWeaver;
+using namespace KIPIPlugins;
+using namespace KDcrawIface;
+
+namespace KIPIRawConverterPlugin
+{
+
+class Task : public Job
+{
+    Q_OBJECT
+
+public:
+
+    Task(QObject* const parent, const KUrl& url, const Action& action);
+    ~Task();
+
+    void setSettings(const RawDecodingSettings& rawDecodingSettings,