feat: use base64 encoding for URL in config

use base64 encoding for URL in config file Log:use base64 encoding for URL in config file
linuxdeepin · Dec 20, 2022 · 3d3fb43 · 3d3fb43
1 parent 1e1fcef
commit 3d3fb43
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/grand-search/gui/searchconfig/searchenginewidget.cpp b/src/grand-search/gui/searchconfig/searchenginewidget.cpp
@@ -14,6 +14,8 @@
 #include <DStyleOption>
 #include <DLineEdit>
 
+#include <QByteArray>
+
 #define Margin  10
 
 DWIDGET_USE_NAMESPACE
@@ -93,7 +95,7 @@ SearchEngineWidget::SearchEngineWidget(QWidget *parent)
     m_lineEdit->setPlaceholderText(tr("You need to use \"%0\" to replace the keyword in the URL"));
     if(userChoice == GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM){
         QString searchEngineCustom = SearchConfig::instance()->getConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, "").toString();
-        m_lineEdit->setText(searchEngineCustom);
+        m_lineEdit->setText(QString::fromStdString(QByteArray::fromBase64(searchEngineCustom.toUtf8()).toStdString()));
         m_lineEdit->setVisible(true);
     } else {
         m_lineEdit->setVisible(false);
@@ -125,7 +127,7 @@ void SearchEngineWidget::checkedChangedIndex(int index)
 
         if(text == GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM){
             QString searchEngineCustom = SearchConfig::instance()->getConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, "").toString();
-            m_lineEdit->setText(searchEngineCustom);
+            m_lineEdit->setText(QString::fromStdString(QByteArray::fromBase64(searchEngineCustom.toUtf8()).toStdString()));
             m_lineEdit->setVisible(true);
         } else {
             m_lineEdit->setVisible(false);
@@ -157,6 +159,6 @@ void SearchEngineWidget::setCustomSearchEngineAddress(const QString &text)
         m_lineEdit->showAlertMessage(tr("Invalid URL"), m_lineEdit, 2000);
     } else {
         m_lineEdit->setAlert(false);
-        SearchConfig::instance()->setConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, text);
+        SearchConfig::instance()->setConfig(GRANDSEARCH_WEB_GROUP, GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, QString::fromStdString(text.toUtf8().toBase64().toStdString()));
     }
 }
diff --git a/src/libgrand-search-daemon/searcher/web/statictextworker.cpp b/src/libgrand-search-daemon/searcher/web/statictextworker.cpp
@@ -8,6 +8,8 @@
 #include "configuration/configer.h"
 #include "global/searchhelper.h"
 
+#include <QByteArray>
+
 using namespace GrandSearch;
 
 StaticTextWorker::StaticTextWorker(const QString &name, QObject *parent) : ProxyWorker(name, parent)
@@ -113,7 +115,8 @@ QString StaticTextWorker::createUrl(const QString &searchEngine) const
 
     auto config = Configer::instance()->group(GRANDSEARCH_WEB_GROUP);
     QString searchEngineAddr = config->value(GRANDSEARCH_WEB_SEARCHENGINE_CUSTOM_ADDR, QString(""));
-    if(searchEngineAddr.isEmpty()) {
+    searchEngineAddr = QString::fromStdString(QByteArray::fromBase64(searchEngineAddr.toUtf8()).toStdString());
+    if(searchEngineAddr.isEmpty() || !searchEngineAddr.contains("%0")) {
         if (SearchHelper::instance()->isSimplifiedChinese()) {
             searchEngineAddr = baidu;
         } else {

diff --git a/translations/dde-grand-search_zh_CN.ts b/translations/dde-grand-search_zh_CN.ts
@@ -251,7 +251,7 @@
     <message>
         <location filename="../src/grand-search/gui/searchconfig/searchenginewidget.cpp" line="87"/>
         <source>You need to use &quot;%0&quot; to replace the keyword in the URL</source>
-        <translation>需要使用 &quot;%0&quot; 来替换URL中关键词</translation>
+        <translation>需要使用 “%0” 来替换URL中关键词</translation>
     </message>
     <message>
         <location filename="../src/grand-search/gui/searchconfig/searchenginewidget.cpp" line="87"/>