[ws] Fix websearch breaking users search engines config

albertlauncher · Aug 14, 2023 · 4f2691c · 4f2691c
1 parent c4e9870
commit 4f2691c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/websearch/CMakeLists.txt b/websearch/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(websearch VERSION 1.6)
+project(websearch VERSION 1.7)
 albert_plugin(
     NAME WebSearch
     DESCRIPTION "Open websearches"

diff --git a/websearch/src/configwidget.cpp b/websearch/src/configwidget.cpp
@@ -153,7 +153,7 @@ static void handleAcceptedEditor(const SearchEngineEditor &editor, SearchEngine
 
         auto image = editor.icon_image->scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
-        auto dst = plugin.dataDir()->filePath(QString("%1.png").arg(engine.guid));
+        auto dst = plugin.dataDir()->filePath(QString("%1.png").arg(engine.id));
         if (!image.save(dst)){
             GWARN(QString("Could not save image to '%1'.").arg(dst));
             return;
@@ -189,7 +189,7 @@ void ConfigWidget::onButton_new()
 {
     if (SearchEngineEditor editor(":default", "", "", "", this); editor.exec()){
         SearchEngine engine;
-        engine.guid = QUuid::createUuid().toString(QUuid::WithoutBraces).left(8);
+        engine.id = QUuid::createUuid().toString(QUuid::WithoutBraces).left(8);
         engine.iconUrl = ":default";
         handleAcceptedEditor(editor, engine, *plugin_);
         auto engines = plugin_->engines();

diff --git a/websearch/src/plugin.cpp b/websearch/src/plugin.cpp
@@ -26,7 +26,7 @@ static QByteArray serializeEngines(const vector<SearchEngine> &engines)
     QJsonArray array;
     for (const SearchEngine& engine : engines) {
         QJsonObject object;
-        object["guid"] = engine.guid;
+        object["id"] = engine.id;
         object["name"] = engine.name;
         object["url"] = engine.url;
         object["trigger"] = engine.trigger;
@@ -43,7 +43,17 @@ static vector<SearchEngine> deserializeEngines(const QByteArray &json)
     for (const auto &value : array) {
         QJsonObject object = value.toObject();
         SearchEngine searchEngine;
-        searchEngine.guid = object["guid"].toString();
+
+        // Todo remove this in future releasea
+        if (object.contains("id")){
+            searchEngine.id = object["id"].toString();
+        } else if (object.contains("guid")){
+            searchEngine.id = object["guid"].toString();
+        }
+
+        if (searchEngine.id.isEmpty())
+            searchEngine.id = QUuid::createUuid().toString(QUuid::WithoutBraces).left(8);
+
         searchEngine.name = object["name"].toString();
         searchEngine.trigger = object["trigger"].toString();
         searchEngine.iconUrl = object["iconPath"].toString();
@@ -89,7 +99,7 @@ void Plugin::restoreDefaultEngines()
         for (const auto &value : array) {
             QJsonObject object = value.toObject();
             SearchEngine searchEngine;
-            searchEngine.guid = QUuid::createUuid().toString(QUuid::WithoutBraces).left(8);
+            searchEngine.id = QUuid::createUuid().toString(QUuid::WithoutBraces).left(8);
             searchEngine.name = object["name"].toString();
             searchEngine.trigger = object["trigger"].toString();
             searchEngine.iconUrl = object["iconPath"].toString();
@@ -105,7 +115,7 @@ static shared_ptr<StandardItem> buildItem(const SearchEngine &se, const QString
 {
     QString url = QString(se.url).replace("%s", QUrl::toPercentEncoding(search_term));
     return StandardItem::make(
-        se.guid,
+        se.id,
         se.name,
         QString("Search %1 for '%2'").arg(se.name, search_term),
         QString("%1 %2").arg(se.name, search_term),

diff --git a/websearch/src/plugin.h b/websearch/src/plugin.h
@@ -8,7 +8,7 @@
 
 struct SearchEngine
 {
-    QString guid;
+    QString id;
     QString name;
     QString trigger;
     QString iconUrl;