From cb554d77da6192b84109354701396a9e16134636 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 13 Feb 2016 19:11:49 +0100
Subject: Reuse ResourceAccess where we can

---
 common/resourcecontrol.cpp | 8 ++++----
 common/store.cpp           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index 83558bd..20125ac 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -43,7 +43,7 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
     return ResourceAccess::connectToServer(identifier).then<void, QSharedPointer<QLocalSocket>>([identifier, time](QSharedPointer<QLocalSocket> socket, KAsync::Future<void> &future) {
         //We can't currently reuse the socket
         socket->close();
-        auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(identifier);
+        auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier);
         resourceAccess->open();
         resourceAccess->sendCommand(Sink::Commands::ShutdownCommand).then<void>([&future, resourceAccess, time]() {
             Trace() << "Shutdown complete." << Log::TraceTime(time->elapsed());
@@ -61,7 +61,7 @@ KAsync::Job<void> ResourceControl::start(const QByteArray &identifier)
     Trace() << "start " << identifier;
     auto time = QSharedPointer<QTime>::create();
     time->start();
-    auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(identifier);
+    auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier);
     resourceAccess->open();
     return resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess, time]() {
         Trace() << "Start complete." << Log::TraceTime(time->elapsed());
@@ -74,7 +74,7 @@ KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resou
     return KAsync::iterate(resourceIdentifier)
     .template each<void, QByteArray>([](const QByteArray &resource, KAsync::Future<void> &future) {
         Trace() << "Flushing message queue " << resource;
-        auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(resource);
+        auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource);
         resourceAccess->open();
         resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() {
             future.setFinished();
@@ -95,7 +95,7 @@ KAsync::Job<void> ResourceControl::inspect(const Inspection &inspectionCommand)
     auto time = QSharedPointer<QTime>::create();
     time->start();
     Trace() << "Sending inspection " << resource;
-    auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(resource);
+    auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource);
     resourceAccess->open();
     auto notifier = QSharedPointer<Sink::Notifier>::create(resourceAccess);
     auto id = QUuid::createUuid().toByteArray();
diff --git a/common/store.cpp b/common/store.cpp
index 6f080b5..2f88c6d 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -158,7 +158,7 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
     Trace() << "Remove data from disk " << identifier;
     auto time = QSharedPointer<QTime>::create();
     time->start();
-    auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(identifier);
+    auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier);
     resourceAccess->open();
     return resourceAccess->sendCommand(Sink::Commands::RemoveFromDiskCommand).then<void>([resourceAccess, time]() {
         Trace() << "Remove from disk complete." << Log::TraceTime(time->elapsed());
@@ -171,7 +171,7 @@ KAsync::Job<void> Store::synchronize(const Sink::Query &query)
     return KAsync::iterate(query.resources)
     .template each<void, QByteArray>([query](const QByteArray &resource, KAsync::Future<void> &future) {
         Trace() << "Synchronizing " << resource;
-        auto resourceAccess = QSharedPointer<Sink::ResourceAccess>::create(resource);
+        auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource);
         resourceAccess->open();
         resourceAccess->synchronizeResource(true, false).then<void>([&future, resourceAccess]() {
             future.setFinished();
-- 
cgit v1.2.3