github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 19:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: small refactors

Browse Source
This commit is contained in:
QxQ 2020-10-20 22:31:08 +08:00
parent ab72af7392
commit 6b56096ef7
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
6024 6025

6
src/base/models/QvConfigIdentifier.hpp
View File

@ -157,8 +157,6 @@ namespace Qv2ray::base
API_OUTBOUND_BLACKHOLE = 3, API_OUTBOUND_BLACKHOLE = 3,
}; };
#define CurrentStatAPIType (GlobalConfig.uiConfig.graphConfig.useOutboundStats ? API_OUTBOUND_PROXY : API_INBOUND)
typedef long qvspeed; typedef long qvspeed;
typedef quint64 qvdata; typedef quint64 qvdata;
typedef QPair<qvspeed, qvspeed> QvStatsSpeed; typedef QPair<qvspeed, qvspeed> QvStatsSpeed;
@ -192,9 +190,7 @@ namespace Qv2ray::base
ConnectionStatsEntryObject &operator[](StatisticsType i) ConnectionStatsEntryObject &operator[](StatisticsType i)
{ {
while (entries.count() <= i) while (entries.count() <= i)
{
entries.append(ConnectionStatsEntryObject{}); entries.append(ConnectionStatsEntryObject{});
}
return entries[i]; return entries[i];
} }
QJsonValue toJson() const QJsonValue toJson() const
@ -203,7 +199,6 @@ namespace Qv2ray::base
} }
void loadJson(const QJsonValue &d) void loadJson(const QJsonValue &d)
{ {
entries.clear();
JsonStructHelper::Deserialize(entries, d); JsonStructHelper::Deserialize(entries, d);
} }
void Clear() void Clear()
@ -239,7 +234,6 @@ namespace Qv2ray::base
{}; {};
JSONSTRUCT_REGISTER(ProtocolSettingsInfoObject, F(protocol, address, port)) JSONSTRUCT_REGISTER(ProtocolSettingsInfoObject, F(protocol, address, port))
}; };
//
template<typename T> template<typename T>
inline uint qHash(IDType<T> key) inline uint qHash(IDType<T> key)

2
src/core/CoreUtils.hpp
View File

@ -3,6 +3,8 @@
#include "base/models/QvConfigIdentifier.hpp" #include "base/models/QvConfigIdentifier.hpp"
#include "base/models/QvSafeType.hpp" #include "base/models/QvSafeType.hpp"
#define CurrentStatAPIType (GlobalConfig.uiConfig.graphConfig.useOutboundStats ? API_OUTBOUND_PROXY : API_INBOUND)
namespace Qv2ray::core namespace Qv2ray::core
{ {
const inline GroupId DefaultGroupId{ "000000000000" }; const inline GroupId DefaultGroupId{ "000000000000" };

18
src/core/handler/ConfigHandler.cpp
View File

@ -68,14 +68,14 @@ namespace Qv2ray::core::handler
} }
// //
kernelHandler = new KernelInstanceHandler(this); kernelHandler = new KernelInstanceHandler(this);
connect(kernelHandler, &KernelInstanceHandler::OnCrashed, this, &QvConfigHandler::OnKernelCrashed_p); connect(kernelHandler, &KernelInstanceHandler::OnCrashed, this, &QvConfigHandler::p_OnKernelCrashed);
connect(kernelHandler, &KernelInstanceHandler::OnStatsDataAvailable, this, &QvConfigHandler::OnStatsDataArrived_p); connect(kernelHandler, &KernelInstanceHandler::OnStatsDataAvailable, this, &QvConfigHandler::p_OnStatsDataArrived);
connect(kernelHandler, &KernelInstanceHandler::OnKernelLogAvailable, this, &QvConfigHandler::OnKernelLogAvailable); connect(kernelHandler, &KernelInstanceHandler::OnKernelLogAvailable, this, &QvConfigHandler::OnKernelLogAvailable);
connect(kernelHandler, &KernelInstanceHandler::OnConnected, this, &QvConfigHandler::OnConnected); connect(kernelHandler, &KernelInstanceHandler::OnConnected, this, &QvConfigHandler::OnConnected);
connect(kernelHandler, &KernelInstanceHandler::OnDisconnected, this, &QvConfigHandler::OnDisconnected); connect(kernelHandler, &KernelInstanceHandler::OnDisconnected, this, &QvConfigHandler::OnDisconnected);
// //
pingHelper = new LatencyTestHost(5, this); pingHelper = new LatencyTestHost(5, this);
connect(pingHelper, &LatencyTestHost::OnLatencyTestCompleted, this, &QvConfigHandler::OnLatencyDataArrived_p); connect(pingHelper, &LatencyTestHost::OnLatencyTestCompleted, this, &QvConfigHandler::p_OnLatencyDataArrived);
// //
// Save per 1 hour. // Save per 1 hour.
saveTimerId = startTimer(1 * 60 * 60 * 1000); saveTimerId = startTimer(1 * 60 * 60 * 1000);
@ -345,7 +345,7 @@ namespace Qv2ray::core::handler
SaveConnectionConfig(); SaveConnectionConfig();
} }
void QvConfigHandler::OnKernelCrashed_p(const ConnectionGroupPair &id, const QString &errMessage) void QvConfigHandler::p_OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage)
{ {
LOG("Kernel crashed: " + errMessage); LOG("Kernel crashed: " + errMessage);
emit OnDisconnected(id); emit OnDisconnected(id);
@ -366,7 +366,7 @@ namespace Qv2ray::core::handler
return connectionRootCache.value(id); return connectionRootCache.value(id);
} }
void QvConfigHandler::OnLatencyDataArrived_p(const ConnectionId &id, const LatencyTestResult &result) void QvConfigHandler::p_OnLatencyDataArrived(const ConnectionId &id, const LatencyTestResult &result)
{ {
CheckValidId(id, nothing); CheckValidId(id, nothing);
connections[id].latency = result.avg; connections[id].latency = result.avg;
@ -495,7 +495,7 @@ namespace Qv2ray::core::handler
if (!groups[id].isSubscription) if (!groups[id].isSubscription)
return; return;
asyncRequestHelper->AsyncHttpGet(groups[id].subscriptionOption.address, [=](const QByteArray &d) { asyncRequestHelper->AsyncHttpGet(groups[id].subscriptionOption.address, [=](const QByteArray &d) {
CHUpdateSubscription_p(id, d); p_CHUpdateSubscription(id, d);
emit OnSubscriptionAsyncUpdateFinished(id); emit OnSubscriptionAsyncUpdateFinished(id);
}); });
} }
@ -505,10 +505,10 @@ namespace Qv2ray::core::handler
if (!groups[id].isSubscription) if (!groups[id].isSubscription)
return false; return false;
const auto data = NetworkRequestHelper::HttpGet(groups[id].subscriptionOption.address); const auto data = NetworkRequestHelper::HttpGet(groups[id].subscriptionOption.address);
return CHUpdateSubscription_p(id, data); return p_CHUpdateSubscription(id, data);
} }
bool QvConfigHandler::CHUpdateSubscription_p(const GroupId &id, const QByteArray &data) bool QvConfigHandler::p_CHUpdateSubscription(const GroupId &id, const QByteArray &data)
{ {
CheckValidId(id, false); CheckValidId(id, false);
// //
@ -721,7 +721,7 @@ namespace Qv2ray::core::handler
return hasErrorOccured; return hasErrorOccured;
} }
void QvConfigHandler::OnStatsDataArrived_p(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data) void QvConfigHandler::p_OnStatsDataArrived(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data)
{ {
if (id.isEmpty()) if (id.isEmpty())
return; return;

8
src/core/handler/ConfigHandler.hpp
View File

@ -161,15 +161,15 @@ namespace Qv2ray::core::handler
void OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage); void OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage);
// //
private slots: private slots:
void OnKernelCrashed_p(const ConnectionGroupPair &id, const QString &errMessage); void p_OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage);
void OnLatencyDataArrived_p(const ConnectionId &id, const LatencyTestResult &data); void p_OnLatencyDataArrived(const ConnectionId &id, const LatencyTestResult &data);
void OnStatsDataArrived_p(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data); void p_OnStatsDataArrived(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data);
protected: protected:
void timerEvent(QTimerEvent *event) override; void timerEvent(QTimerEvent *event) override;
private: private:
bool CHUpdateSubscription_p(const GroupId &id, const QByteArray &data); bool p_CHUpdateSubscription(const GroupId &id, const QByteArray &data);
private: private:
int saveTimerId; int saveTimerId;