5 files changed, 15 insertions, 48 deletions

diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 14b0aab..0e26c5a 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -89,28 +89,14 @@ QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Sink::Query qu
     return model;
 }
 
-QStringList resourceIds(State &state)
+QStringList resourceIds()
 {
-    QStringList resources;
     Sink::Query query;
     query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
-
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model, &resources](const QModelIndex &index, int start, int end) mutable {
-        for (int i = start; i <= end; i++) {
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            state.commandFinished();
-        }
-    });
-
-    state.commandStarted();
-
+    QStringList resources;
+    for (const auto &r : getStore("resource").read(query)) {
+        resources << r.identifier();
+    }
     return resources;
 }
 
@@ -121,7 +107,7 @@ QStringList debugareaCompleter(const QStringList &, const QString &fragment, Sta
 
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state)
 {
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state)
@@ -131,7 +117,7 @@ QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &
         return Utils::filteredCompletions(s_types, fragment);
     }
 
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state)
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index 72d9a14..1537ecd 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -50,7 +50,7 @@ bool clear(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear);
+    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear, Syntax::NotInteractive);
     clear.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << clear;
diff --git a/sinksh/syntax_modules/sink_remove.cpp b/sinksh/syntax_modules/sink_remove.cpp
index b374824..d474518 100644
--- a/sinksh/syntax_modules/sink_remove.cpp
+++ b/sinksh/syntax_modules/sink_remove.cpp
@@ -98,7 +98,7 @@ bool resource(const QStringList &args, State &state)
 Syntax::List syntax()
 {
     Syntax remove("remove", QObject::tr("Remove items in a resource"), &SinkRemove::remove);
-    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource);//, Syntax::EventDriven);
+    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource, Syntax::NotInteractive);
     resource.completer = &SinkshUtils::resourceCompleter;
     remove.children << resource;
 
diff --git a/sinksh/syntax_modules/sink_stat.cpp b/sinksh/syntax_modules/sink_stat.cpp
index 06586d9..9f0fe44 100644
--- a/sinksh/syntax_modules/sink_stat.cpp
+++ b/sinksh/syntax_modules/sink_stat.cpp
@@ -70,30 +70,11 @@ bool statAllResources(State &state)
 {
     Sink::Query query;
     query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
-
-    //SUUUPER ugly, but can't think of a better way with 2 glasses of wine in me on Christmas day
-    static QStringList resources;
-    resources.clear();
-
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model](const QModelIndex &index, int start, int end) mutable {
-        for (int i = start; i <= end; i++) {
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            statResources(resources, state);
-            state.commandFinished();
-        }
-    });
-
-    if (!model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool()) {
-        return true;
+    QStringList resources;
+    for (const auto &r : SinkshUtils::getStore("resource").read(query)) {
+        resources << r.identifier();
     }
-
+    statResources(resources, state);
     return false;
 }
 
@@ -109,7 +90,7 @@ bool stat(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::EventDriven);
+    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::NotInteractive);
     state.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << state;
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index 3006202..208b869 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -56,7 +56,7 @@ bool sync(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven );
+    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven);
     sync.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << sync;