Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / views / versioncontrol / versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 175d362bc5528c5a5e30a79d0c7b45e340550fca..521ff8b900ab74044a8e302a294b47d8a2c0ee62 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -8,28 +8,26 @@
 
 #include "dolphin_versioncontrolsettings.h"
 #include "dolphindebug.h"
 
 #include "dolphin_versioncontrolsettings.h"
 #include "dolphindebug.h"

-#include "views/dolphinview.h"

 #include "kitemviews/kfileitemmodel.h"
 #include "updateitemstatesthread.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "updateitemstatesthread.h"

+#include "views/dolphinview.h"

 
 #include <KLocalizedString>
 
 #include <KLocalizedString>

-#include <KService>
-#include <KServiceTypeTrader>
-#include <KPluginLoader>
+#include <KPluginFactory>

 #include <KPluginMetaData>
 
 #include <QTimer>
 
 #include <KPluginMetaData>
 
 #include <QTimer>
 

-VersionControlObserver::VersionControlObserver(QObject* parent) :
-    QObject(parent),
-    m_pendingItemStatesUpdate(false),
-    m_silentUpdate(false),
-    m_view(nullptr),
-    m_model(nullptr),
-    m_dirVerificationTimer(nullptr),
-    m_pluginsInitialized(false),
-    m_plugin(nullptr),
-    m_updateItemStatesThread(nullptr)
+VersionControlObserver::VersionControlObserver(QObject *parent)
+    : QObject(parent)
+    , m_pendingItemStatesUpdate(false)
+    , m_silentUpdate(false)
+    , m_view(nullptr)
+    , m_model(nullptr)
+    , m_dirVerificationTimer(nullptr)
+    , m_pluginsInitialized(false)
+    , m_currentPlugin(nullptr)
+    , m_updateItemStatesThread(nullptr)

 {
     // The verification timer specifies the timeout until the shown directory
     // is checked whether it is versioned. Per default it is assumed that users
 {
     // The verification timer specifies the timeout until the shown directory
     // is checked whether it is versioned. Per default it is assumed that users


@@ -39,66 +37,78 @@ VersionControlObserver::VersionControlObserver(QObject* parent) :
     m_dirVerificationTimer = new QTimer(this);
     m_dirVerificationTimer->setSingleShot(true);
     m_dirVerificationTimer->setInterval(500);
     m_dirVerificationTimer = new QTimer(this);
     m_dirVerificationTimer->setSingleShot(true);
     m_dirVerificationTimer->setInterval(500);

-    connect(m_dirVerificationTimer, &QTimer::timeout,
-            this, &VersionControlObserver::verifyDirectory);
+    connect(m_dirVerificationTimer, &QTimer::timeout, this, &VersionControlObserver::verifyDirectory);

 }
 
 VersionControlObserver::~VersionControlObserver()
 {
 }
 
 VersionControlObserver::~VersionControlObserver()
 {

-    if (m_plugin) {
-        m_plugin->disconnect(this);
-        m_plugin = nullptr;
+    if (m_currentPlugin) {
+        m_currentPlugin->disconnect(this);

     }
     }

+    if (m_updateItemStatesThread) {
+        m_updateItemStatesThread->requestInterruption();
+        m_updateItemStatesThread->wait();
+        m_updateItemStatesThread->deleteLater();
+    }
+
+    if (m_currentPlugin) {
+        delete m_currentPlugin;
+        m_currentPlugin = nullptr;
+    }
+    m_plugins.clear();

 }
 
 }
 

-void VersionControlObserver::setModel(KFileItemModel* model)
+void VersionControlObserver::setModel(KFileItemModel *model)

 {
     if (m_model) {
 {
     if (m_model) {

-        disconnect(m_model, &KFileItemModel::itemsInserted,
-                   this, &VersionControlObserver::delayedDirectoryVerification);
-        disconnect(m_model, &KFileItemModel::itemsChanged,
-                   this, &VersionControlObserver::slotItemsChanged);
+        if (m_currentPlugin) {
+            delete m_currentPlugin;
+            m_currentPlugin = nullptr;
+        }
+        if (m_updateItemStatesThread) {
+            m_updateItemStatesThread->requestInterruption();
+        }
+        disconnect(m_model, &KFileItemModel::itemsInserted, this, &VersionControlObserver::delayedDirectoryVerification);
+        disconnect(m_model, &KFileItemModel::itemsChanged, this, &VersionControlObserver::slotItemsChanged);
+        disconnect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &VersionControlObserver::verifyDirectory);

     }
 
     m_model = model;
 
     if (model) {
     }
 
     m_model = model;
 
     if (model) {

-        connect(m_model, &KFileItemModel::itemsInserted,
-                this, &VersionControlObserver::delayedDirectoryVerification);
-        connect(m_model, &KFileItemModel::itemsChanged,
-                this, &VersionControlObserver::slotItemsChanged);
+        connect(m_model, &KFileItemModel::itemsInserted, this, &VersionControlObserver::delayedDirectoryVerification);
+        connect(m_model, &KFileItemModel::itemsChanged, this, &VersionControlObserver::slotItemsChanged);
+        connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &VersionControlObserver::verifyDirectory);

     }
 }
 
     }
 }
 

-KFileItemModel* VersionControlObserver::model() const
+KFileItemModel *VersionControlObserver::model() const

 {
     return m_model;
 }
 
 {
     return m_model;
 }
 

-void VersionControlObserver::setView(DolphinView* view)
+void VersionControlObserver::setView(DolphinView *view)

 {
     if (m_view) {
 {
     if (m_view) {

-        disconnect(m_view, &DolphinView::activated,
-                   this, &VersionControlObserver::delayedDirectoryVerification);
+        disconnect(m_view, &DolphinView::activated, this, &VersionControlObserver::delayedDirectoryVerification);

     }
 
     m_view = view;
 
     if (m_view) {
     }
 
     m_view = view;
 
     if (m_view) {

-        connect(m_view, &DolphinView::activated,
-                this, &VersionControlObserver::delayedDirectoryVerification);
+        connect(m_view, &DolphinView::activated, this, &VersionControlObserver::delayedDirectoryVerification);

     }
 }
 
     }
 }
 

-DolphinView* VersionControlObserver::view() const
+DolphinView *VersionControlObserver::view() const

 {
     return m_view;
 }
 
 {
     return m_view;
 }
 

-QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) const
+QList<QAction *> VersionControlObserver::actions(const KFileItemList &items) const

 {
     bool hasNullItems = false;
 {
     bool hasNullItems = false;

-    for (const KFileItem& item : items) {
+    for (const KFileItem &item : items) {

         if (item.isNull()) {
             qCWarning(DolphinDebug) << "Requesting version-control-actions for empty items";
             hasNullItems = true;
         if (item.isNull()) {
             qCWarning(DolphinDebug) << "Requesting version-control-actions for empty items";
             hasNullItems = true;


@@ -111,10 +121,10 @@ QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) cons
     }
 
     if (isVersionControlled()) {
     }
 
     if (isVersionControlled()) {

-        return m_plugin->versionControlActions(items);
+        return m_currentPlugin->versionControlActions(items);

     } else {
     } else {

-        QList<QAction*> actions;
-        for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+        QList<QAction *> actions;
+        for (const KVersionControlPlugin *plugin : std::as_const(m_plugins)) {

             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;
             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;


@@ -123,24 +133,34 @@ QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) cons
 
 void VersionControlObserver::delayedDirectoryVerification()
 {
 
 void VersionControlObserver::delayedDirectoryVerification()
 {

+    if (!isVersionControlled()) {
+        m_dirVerificationTimer->stop();
+        return;
+    }
+

     m_silentUpdate = false;
     m_dirVerificationTimer->start();
 }
 
 void VersionControlObserver::silentDirectoryVerification()
 {
     m_silentUpdate = false;
     m_dirVerificationTimer->start();
 }
 
 void VersionControlObserver::silentDirectoryVerification()
 {

+    if (!isVersionControlled()) {
+        m_dirVerificationTimer->stop();
+        return;
+    }
+

     m_silentUpdate = true;
     m_dirVerificationTimer->start();
 }
 
     m_silentUpdate = true;
     m_dirVerificationTimer->start();
 }
 

-void VersionControlObserver::slotItemsChanged(const KItemRangeList& itemRanges, const QSet<QByteArray>& roles)
+void VersionControlObserver::slotItemsChanged(const KItemRangeList &itemRanges, const QSet<QByteArray> &roles)

 {
     Q_UNUSED(itemRanges)
 
 {
     Q_UNUSED(itemRanges)
 

-    // Because "version" role is emitted by VCS plugin (ourselfs) we don't need to
+    // Because "version" role is emitted by VCS plugin (ourselves) we don't need to

     // analyze it and update directory item states information. So lets check if
     // there is only "version".
     // analyze it and update directory item states information. So lets check if
     // there is only "version".

-    if ( !(roles.count() == 1 && roles.contains("version")) ) {
+    if (!(roles.count() == 1 && roles.contains("version"))) {

         delayedDirectoryVerification();
     }
 }
         delayedDirectoryVerification();
     }
 }


@@ -156,42 +176,42 @@ void VersionControlObserver::verifyDirectory()
         return;
     }
 
         return;
     }
 

-    if (m_plugin != nullptr) {
-        if (!rootItem.url().path().startsWith(m_localRepoRoot) || !QFile::exists(m_localRepoRoot + '/' + m_plugin->fileName())) {
-            m_plugin = nullptr;
+    if (m_currentPlugin && rootItem.url().path().startsWith(m_localRepoRoot) && QFile::exists(m_localRepoRoot + '/' + m_currentPlugin->fileName())) {
+        // current directory is still versionned
+        updateItemStates();
+        return;
+    }

 
 

-            // The directory is not versioned. Reset the verification timer to a higher
-            // value, so that browsing through non-versioned directories is not slown down
-            // by an immediate verification.
-            m_dirVerificationTimer->setInterval(500);
-        } else {
-            // View was versionned but should not be anymore
-            updateItemStates();
-        }
-    } else if ((m_plugin = searchPlugin(rootItem.url()))) {
+    if ((m_currentPlugin = searchPlugin(rootItem.url()))) {

         // The directory is versioned. Assume that the user will further browse through
         // versioned directories and decrease the verification timer.
         m_dirVerificationTimer->setInterval(100);
         updateItemStates();
         // The directory is versioned. Assume that the user will further browse through
         // versioned directories and decrease the verification timer.
         m_dirVerificationTimer->setInterval(100);
         updateItemStates();

+        return;

     }
     }

+
+    // The directory is not versioned. Reset the verification timer to a higher
+    // value, so that browsing through non-versioned directories is not slown down
+    // by an immediate verification.
+    m_dirVerificationTimer->setInterval(500);

 }
 
 void VersionControlObserver::slotThreadFinished()
 {
 }
 
 void VersionControlObserver::slotThreadFinished()
 {

-    UpdateItemStatesThread* thread = m_updateItemStatesThread;
+    UpdateItemStatesThread *thread = m_updateItemStatesThread;

     m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates())
 
     m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates())
 

-    if (!m_plugin || !thread) {
+    if (!m_currentPlugin || !thread) {

         return;
     }
 
         return;
     }
 

-    const QMap<QString, QVector<ItemState> >& itemStates = thread->itemStates();
-    QMap<QString, QVector<ItemState> >::const_iterator it = itemStates.constBegin();
+    const QMap<QString, QVector<ItemState>> &itemStates = thread->itemStates();
+    QMap<QString, QVector<ItemState>>::const_iterator it = itemStates.constBegin();

     for (; it != itemStates.constEnd(); ++it) {
     for (; it != itemStates.constEnd(); ++it) {

-        const QVector<ItemState>& items = it.value();
+        const QVector<ItemState> &items = it.value();

 
 

-        for (const ItemState& item : items) {
-            const KFileItem& fileItem = item.first;
+        for (const ItemState &item : items) {
+            const KFileItem &fileItem = item.first;

             const KVersionControlPlugin::ItemVersion version = item.second;
             QHash<QByteArray, QVariant> values;
             values.insert("version", QVariant(version));
             const KVersionControlPlugin::ItemVersion version = item.second;
             QHash<QByteArray, QVariant> values;
             values.insert("version", QVariant(version));


@@ -214,7 +234,7 @@ void VersionControlObserver::slotThreadFinished()
 
 void VersionControlObserver::updateItemStates()
 {
 
 void VersionControlObserver::updateItemStates()
 {

-    Q_ASSERT(m_plugin);
+    Q_ASSERT(m_currentPlugin);

     if (m_updateItemStatesThread) {
         // An update is currently ongoing. Wait until the thread has finished
         // the update (see slotThreadFinished()).
     if (m_updateItemStatesThread) {
         // An update is currently ongoing. Wait until the thread has finished
         // the update (see slotThreadFinished()).


@@ -222,25 +242,22 @@ void VersionControlObserver::updateItemStates()
         return;
     }
 
         return;
     }
 

-    QMap<QString, QVector<ItemState> > itemStates;
+    QMap<QString, QVector<ItemState>> itemStates;

     createItemStatesList(itemStates);
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {
     createItemStatesList(itemStates);
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {

-            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information..."));
+            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information…"));

         }
         }

-        m_updateItemStatesThread = new UpdateItemStatesThread(m_plugin, itemStates);
-        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished,
-                this, &VersionControlObserver::slotThreadFinished);
-        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished,
-                m_updateItemStatesThread, &UpdateItemStatesThread::deleteLater);
+        m_updateItemStatesThread = new UpdateItemStatesThread(m_currentPlugin, itemStates);
+        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, this, &VersionControlObserver::slotThreadFinished);
+        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, m_updateItemStatesThread, &UpdateItemStatesThread::deleteLater);

 
         m_updateItemStatesThread->start(); // slotThreadFinished() is called when finished
     }
 }
 
 
         m_updateItemStatesThread->start(); // slotThreadFinished() is called when finished
     }
 }
 

-int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState> >& itemStates,
-                                                 const int firstIndex)
+int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState>> &itemStates, const int firstIndex)

 {
     const int itemCount = m_model->count();
     const int currentExpansionLevel = m_model->expandedParentsCount(firstIndex);
 {
     const int itemCount = m_model->count();
     const int currentExpansionLevel = m_model->expandedParentsCount(firstIndex);


@@ -267,7 +284,7 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
     }
 
     if (!items.isEmpty()) {
     }
 
     if (!items.isEmpty()) {

-        const QUrl& url = items.first().first.url();
+        const QUrl &url = items.first().first.url();

         itemStates.insert(url.adjusted(QUrl::RemoveFilename).path(), items);
     }
 
         itemStates.insert(url.adjusted(QUrl::RemoveFilename).path(), items);
     }
 


@@ -277,78 +294,45 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
 void VersionControlObserver::initPlugins()
 {
     if (!m_pluginsInitialized) {
 void VersionControlObserver::initPlugins()
 {
     if (!m_pluginsInitialized) {

-        // No searching for plugins has been done yet. Query the KServiceTypeTrader for
-        // all fileview version control plugins and remember them in 'plugins'.
+        // No searching for plugins has been done yet. Query all fileview version control
+        // plugins and remember them in 'plugins'.

         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 

-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("dolphin/vcs"));
-
-        QSet<QString> loadedPlugins;
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));

 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {

-                KPluginLoader loader(p.fileName());
-                KPluginFactory *factory = loader.factory();
-                KVersionControlPlugin *plugin = factory->create<KVersionControlPlugin>();
+                auto plugin = KPluginFactory::instantiatePlugin<KVersionControlPlugin>(p, parent()).plugin;

                 if (plugin) {
                     m_plugins.append(plugin);
                 if (plugin) {
                     m_plugins.append(plugin);

-                    loadedPlugins += p.name();

                 }
             }
         }
 
                 }
             }
         }
 

-        // Deprecated: load plugins using KService. This mechanism will be removed with KF6
-        const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin"));
-        for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
-            if (loadedPlugins.contains((*it)->property("Name", QVariant::String).toString())) {
-                continue;
-            }
-            if (enabledPlugins.contains((*it)->name())) {
-                KPluginLoader pluginLoader(*(*it));
-                // Need to cast to int, because pluginVersion() returns -1 as
-                // an unsigned int for plugins without versions.
-                if (int(pluginLoader.pluginVersion()) < 2) {
-                    qCWarning(DolphinDebug) << "Can't load old plugin" << (*it)->name();
-                    continue;
-                }
-                KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>(this);
-                if (plugin) {
-                    m_plugins.append(plugin);
-                }
-            }
-        }
-
-        for (auto &plugin : qAsConst(m_plugins)) {
-            connect(plugin, &KVersionControlPlugin::itemVersionsChanged,
-                this, &VersionControlObserver::silentDirectoryVerification);
-            connect(plugin, &KVersionControlPlugin::infoMessage,
-                this, &VersionControlObserver::infoMessage);
-            connect(plugin, &KVersionControlPlugin::errorMessage,
-                this, &VersionControlObserver::errorMessage);
-            connect(plugin, &KVersionControlPlugin::operationCompletedMessage,
-                this, &VersionControlObserver::operationCompletedMessage);
+        for (const auto *plugin : std::as_const(m_plugins)) {
+            connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
+            connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
+            connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);
+            connect(plugin, &KVersionControlPlugin::operationCompletedMessage, this, &VersionControlObserver::operationCompletedMessage);

         }
 
         m_pluginsInitialized = true;
     }
 }
 
         }
 
         m_pluginsInitialized = true;
     }
 }
 

-KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& directory)
+KVersionControlPlugin *VersionControlObserver::searchPlugin(const QUrl &directory)

 {
     initPlugins();
 
     // Verify whether the current directory is under a version system
 {
     initPlugins();
 
     // Verify whether the current directory is under a version system

-    for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
-        if (!plugin) {
-            continue;
-        }
-
+    for (KVersionControlPlugin *plugin : std::as_const(m_plugins)) {

         // first naively check if we are at working copy root
         const QString fileName = directory.path() + '/' + plugin->fileName();
         if (QFile::exists(fileName)) {
             m_localRepoRoot = directory.path();
             return plugin;
         }
         // first naively check if we are at working copy root
         const QString fileName = directory.path() + '/' + plugin->fileName();
         if (QFile::exists(fileName)) {
             m_localRepoRoot = directory.path();
             return plugin;
         }

+

         const QString root = plugin->localRepositoryRoot(directory.path());
         if (!root.isEmpty()) {
             m_localRepoRoot = root;
         const QString root = plugin->localRepositoryRoot(directory.path());
         if (!root.isEmpty()) {
             m_localRepoRoot = root;


@@ -360,6 +344,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
 
 bool VersionControlObserver::isVersionControlled() const
 {
 
 bool VersionControlObserver::isVersionControlled() const
 {

-    return m_plugin != nullptr;
+    return m_currentPlugin != nullptr;

 }
 
 }
 

+#include "moc_versioncontrolobserver.cpp"