From 42b231c1fc1fb446939cb6636a5c240f115c4652 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:34:07 +0900
Subject: [PATCH] code fix

---
 cmake/nkr.cmake            |  2 +-
 db/TrafficLooper.cpp       |  9 +++++----
 fmt/Bean2External.cpp      |  2 --
 main/GuiUtils.hpp          |  2 --
 main/NekoRay_DataStore.hpp |  1 +
 main/main.cpp              | 11 +++++++----
 ui/ThemeManager.cpp        |  6 ++++--
 ui/ThemeManager.hpp        |  3 ---
 ui/mainwindow.cpp          |  4 +---
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/cmake/nkr.cmake b/cmake/nkr.cmake
index 68ec1fd..2a9ff38 100644
--- a/cmake/nkr.cmake
+++ b/cmake/nkr.cmake
@@ -3,4 +3,4 @@ file(STRINGS nekoray_version.txt NKR_VERSION)
 add_compile_definitions(NKR_VERSION=\"${NKR_VERSION}\")
 
 # Debug
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DNKR_DEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DNKR_CPP_DEBUG")
diff --git a/db/TrafficLooper.cpp b/db/TrafficLooper.cpp
index 0051739..d531dce 100644
--- a/db/TrafficLooper.cpp
+++ b/db/TrafficLooper.cpp
@@ -11,15 +11,16 @@ namespace NekoRay::traffic {
 
     std::unique_ptr<TrafficData> TrafficLooper::update_stats(TrafficData *item) {
 #ifndef NKR_NO_GRPC
+        auto interval = dataStore->traffic_loop_interval;
+        if (interval == 0) return nullptr;
         auto uplink = NekoRay::rpc::defaultClient->QueryStats(item->tag, "uplink");
         auto downlink = NekoRay::rpc::defaultClient->QueryStats(item->tag, "downlink");
 
+        // add diff
         item->downlink += downlink;
         item->uplink += uplink;
-
-        //?
-        item->downlink_rate = downlink * 1000 / dataStore->traffic_loop_interval;
-        item->uplink_rate = uplink * 1000 / dataStore->traffic_loop_interval;
+        item->downlink_rate = downlink * 1000 / interval;
+        item->uplink_rate = uplink * 1000 / interval;
 
         // return diff
         auto ret = std::make_unique<TrafficData>(item->tag);
diff --git a/fmt/Bean2External.cpp b/fmt/Bean2External.cpp
index 11485f8..f6bb100 100644
--- a/fmt/Bean2External.cpp
+++ b/fmt/Bean2External.cpp
@@ -1,7 +1,5 @@
 #include "db/ProxyEntity.hpp"
 #include "fmt/includes.h"
-#include "NaiveBean.hpp"
-
 
 #include <QFile>
 #include <QDir>
diff --git a/main/GuiUtils.hpp b/main/GuiUtils.hpp
index f860625..f40735e 100644
--- a/main/GuiUtils.hpp
+++ b/main/GuiUtils.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QWidget>
-
 // Dialogs
 
 #define Dialog_DialogBasicSettings "DialogBasicSettings"
diff --git a/main/NekoRay_DataStore.hpp b/main/NekoRay_DataStore.hpp
index 7f26a58..e7d8fa8 100644
--- a/main/NekoRay_DataStore.hpp
+++ b/main/NekoRay_DataStore.hpp
@@ -57,6 +57,7 @@ namespace NekoRay {
         bool flag_use_appdata = false;
         bool flag_many = false;
         bool flag_tray = false;
+        bool flag_debug = false;
 
         // Saved
 
diff --git a/main/main.cpp b/main/main.cpp
index a879bea..6284d95 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -39,7 +39,6 @@ int main(int argc, char *argv[]) {
     QDir::setCurrent(QApplication::applicationDirPath());
     if (QFile::exists("updater.old")) {
         QFile::remove("updater.old");
-        QFile::remove("sing-box.exe"); // v1.11
     }
 #ifndef Q_OS_WIN
     if (!QFile::exists("updater")) {
@@ -52,9 +51,13 @@ int main(int argc, char *argv[]) {
     if (args.contains("-many")) NekoRay::dataStore->flag_many = true;
     if (args.contains("-appdata")) NekoRay::dataStore->flag_use_appdata = true;
     if (args.contains("-tray")) NekoRay::dataStore->flag_tray = true;
+    if (args.contains("-debug")) NekoRay::dataStore->flag_debug = true;
 #ifdef NKR_CPP_USE_APPDATA
     NekoRay::dataStore->flag_use_appdata = true;
 #endif
+#ifdef NKR_CPP_DEBUG
+    NekoRay::dataStore->flag_debug = true;
+#endif
 
     // dirs & clean
     auto wd = QDir(QApplication::applicationDirPath());
@@ -95,13 +98,13 @@ int main(int argc, char *argv[]) {
     QDir dir;
     bool dir_success = true;
     if (!dir.exists("profiles")) {
-        dir_success = dir_success && dir.mkdir("profiles");
+        dir_success &= dir.mkdir("profiles");
     }
     if (!dir.exists("groups")) {
-        dir_success = dir_success && dir.mkdir("groups");
+        dir_success &= dir.mkdir("groups");
     }
     if (!dir.exists(ROUTES_PREFIX_NAME)) {
-        dir_success = dir_success && dir.mkdir(ROUTES_PREFIX_NAME);
+        dir_success &= dir.mkdir(ROUTES_PREFIX_NAME);
     }
     if (!dir_success) {
         QMessageBox::warning(nullptr, "Error", "No permission to write " + dir.absolutePath());
diff --git a/ui/ThemeManager.cpp b/ui/ThemeManager.cpp
index 65da7a1..1c112aa 100644
--- a/ui/ThemeManager.cpp
+++ b/ui/ThemeManager.cpp
@@ -1,7 +1,9 @@
-#include "ThemeManager.hpp"
-
+#include <QStyle>
+#include <QApplication>
 #include <QStyleFactory>
 
+#include "ThemeManager.hpp"
+
 ThemeManager *themeManager = new ThemeManager;
 
 extern QString ReadFileText(const QString &path);
diff --git a/ui/ThemeManager.hpp b/ui/ThemeManager.hpp
index d902bf6..1514f23 100644
--- a/ui/ThemeManager.hpp
+++ b/ui/ThemeManager.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <QStyle>
-#include <QApplication>
-
 class ThemeManager {
 public:
     QString system_style_name = "";
diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
index d56780e..1dfc22f 100644
--- a/ui/mainwindow.cpp
+++ b/ui/mainwindow.cpp
@@ -385,9 +385,7 @@ MainWindow::MainWindow(QWidget *parent)
     args.push_back(IS_NEKO_BOX ? "nekobox" : "nekoray");
     args.push_back("-port");
     args.push_back(Int2String(NekoRay::dataStore->core_port));
-#ifdef NKR_DEBUG
-    args.push_back("-debug");
-#endif
+    if (NekoRay::dataStore->flag_debug) args.push_back("-debug");
 
     // Start core
     core_process = new NekoRay::sys::CoreProcess(core_path, args);