From c9f928ea2ea10220d40cddf9d7fc8009a22cf02a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 29 Jan 2018 13:43:40 +0100
Subject: Support UUID's without curly braces

---
 sinksh/syntax_modules/sink_list.cpp | 3 +++
 sinksh/syntax_modules/sink_sync.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'sinksh/syntax_modules')

diff --git a/sinksh/syntax_modules/sink_list.cpp b/sinksh/syntax_modules/sink_list.cpp
index b002438..a56740d 100644
--- a/sinksh/syntax_modules/sink_list.cpp
+++ b/sinksh/syntax_modules/sink_list.cpp
@@ -42,6 +42,9 @@ namespace SinkList
 static QByteArray compressId(bool compress, const QByteArray &id)
 {
     if (!compress) {
+        if (id.startsWith('{')) {
+            return id.mid(1, id.length() - 2);
+        }
         return id;
     }
     auto compactId = id.mid(1, id.length() - 2).split('-');
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index 8b48785..f165f58 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -49,7 +49,7 @@ bool sync(const QStringList &args, State &state)
     Sink::Query query;
     if (!options.positionalArguments.isEmpty() && !SinkshUtils::isValidStoreType(options.positionalArguments.first())) {
         //We have only specified a resource
-        query.resourceFilter(options.positionalArguments.first().toLatin1());
+        query.resourceFilter(SinkshUtils::parseUid(options.positionalArguments.first().toLatin1()));
     } else {
         //We have specified a full filter
         if (!SinkshUtils::applyFilter(query, options.positionalArguments)) {
-- 
cgit v1.2.3