improve ui

CMakeLists.txt

@@ -89,15 +89,17 @@ set(PROJECT_SOURCES
         3rdparty/qrcodegen.cpp
         3rdparty/QtExtKeySequenceEdit.cpp
 
-        qv2ray/ui/LogHighlighter.cpp
-        qv2ray/ui/QvAutoCompleteTextEdit.cpp
-        qv2ray/utils/HTTPRequestHelper.cpp
-        qv2ray/components/proxy/QvProxyConfigurator.cpp
-        qv2ray/ui/widgets/common/QJsonModel.cpp
-
-        qv2ray/ui/widgets/editors/w_JsonEditor.cpp
-        qv2ray/ui/widgets/editors/w_JsonEditor.hpp
-        qv2ray/ui/widgets/editors/w_JsonEditor.ui
+        qv2ray/v2/ui/LogHighlighter.cpp
+        qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp
+        qv2ray/v2/utils/HTTPRequestHelper.cpp
+        qv2ray/v2/components/proxy/QvProxyConfigurator.cpp
+        qv2ray/v2/ui/widgets/common/QJsonModel.cpp
+        qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp
+        qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp
+        qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui
+
+        qv2ray/v3/components/GeositeReader/GeositeReader.cpp
+        qv2ray/v3/components/GeositeReader/picoproto.cpp
 
         rpc/gRPC.cpp
 

qv2ray/ui/widgets/editors/w_JsonEditor.hpp → qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "qv2ray/wrapper.hpp"
-#include "qv2ray/ui/widgets/common/QJsonModel.hpp"
+#include "qv2ray/v2/ui/widgets/common/QJsonModel.hpp"
 #include "ui_w_JsonEditor.h"
 
 

qv2ray/v3/components/GeositeReader/GeositeReader.cpp

@@ -0,0 +1,42 @@
+#include "GeositeReader.hpp"
+
+#include "qv2ray/wrapper.hpp"
+#include "picoproto.hpp"
+
+#include <QFile>
+#include <QMap>
+
+namespace Qv2ray::components::GeositeReader {
+    QMap<QString, QStringList> GeositeEntries;
+
+    QStringList ReadGeoSiteFromFile(const QString &filepath, bool allowCache) {
+        if (GeositeEntries.contains(filepath) && allowCache)
+            return GeositeEntries.value(filepath);
+
+        QStringList list;
+        qInfo() << "Reading geosites from:" << filepath;
+        QFile f(filepath);
+        bool opened = f.open(QFile::OpenModeFlag::ReadOnly);
+
+        if (!opened) {
+            qInfo() << "File cannot be opened:" << filepath;
+            return list;
+        }
+
+        const auto content = f.readAll();
+        f.close();
+        {
+            picoproto::Message root;
+            root.ParseFromBytes((unsigned char *) content.data(), content.size());
+
+            list.reserve(root.GetMessageArray(1).size());
+            for (const auto &geosite: root.GetMessageArray(1))
+                list << QString::fromStdString(geosite->GetString(1));
+        }
+
+        qInfo() << "Loaded" << list.count() << "geosite entries from data file.";
+        list.sort();
+        GeositeEntries[filepath] = list;
+        return list;
+    }
+} // namespace Qv2ray::components::geosite

qv2ray/v3/components/GeositeReader/GeositeReader.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <QString>
+
+namespace Qv2ray::components::GeositeReader {
+    QStringList ReadGeoSiteFromFile(const QString &filepath, bool allowCache = true);
+} // namespace Qv2ray::components::GeositeReader