1 files changed, 5 insertions, 11 deletions

diff --git a/sinksh/syntax_modules/sink_count.cpp b/sinksh/syntax_modules/sink_count.cpp
index 84bbabd..5ab9ca5 100644
--- a/sinksh/syntax_modules/sink_count.cpp
+++ b/sinksh/syntax_modules/sink_count.cpp
@@ -41,20 +41,14 @@ namespace SinkCount
 
 bool count(const QStringList &args, State &state)
 {
-    auto resources = args;
-    auto type = !resources.isEmpty() ? resources.takeFirst() : QString();
-
-    if (!type.isEmpty() && !SinkshUtils::isValidStoreType(type)) {
-        state.printError(QObject::tr("Unknown type: %1").arg(type));
-        return false;
-    }
-
     Sink::Query query;
-    for (const auto &res : resources) {
-        query.resourceFilter(res.toLatin1());
+    query.setId("count");
+    if (!SinkshUtils::applyFilter(query, args)) {
+        state.printError(QObject::tr("Options: $type $filter"));
+        return false;
     }
 
-    auto model = SinkshUtils::loadModel(type, query);
+    auto model = SinkshUtils::loadModel(query.type(), query);
     QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
         if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
             state.printLine(QObject::tr("Counted results %1").arg(model->rowCount(QModelIndex())));