Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 12:34:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
arm64v8a
2023-02-10 17:43:12 +09:00
parent cc0eae714d
commit 8c4feac34e
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ui/mainwindow.cpp
View File

@@ -831,6 +831,7 @@ void MainWindow::refresh_proxy_list_impl(const int &id, NekoRay::GroupSortAction
}
case NekoRay::GroupSortMethod::ByAddress:
case NekoRay::GroupSortMethod::ByName:
case NekoRay::GroupSortMethod::ByLatency:
case NekoRay::GroupSortMethod::ByType: {
std::sort(ui->proxyListTable->order.begin(), ui->proxyListTable->order.end(),
[=](int a, int b) {
@@ -845,25 +846,27 @@ void MainWindow::refresh_proxy_list_impl(const int &id, NekoRay::GroupSortAction
} else if (groupSortAction.method == NekoRay::GroupSortMethod::ByAddress) {
ms_a = NekoRay::profileManager->GetProfile(a)->bean->DisplayAddress();
ms_b = NekoRay::profileManager->GetProfile(b)->bean->DisplayAddress();
} else if (groupSortAction.method == NekoRay::GroupSortMethod::ByLatency) {
ms_a = NekoRay::profileManager->GetProfile(a)->full_test_report;
ms_b = NekoRay::profileManager->GetProfile(b)->full_test_report;
}
if (groupSortAction.descending) {
if (groupSortAction.method == NekoRay::GroupSortMethod::ByLatency) {
auto int_a = NekoRay::profileManager->GetProfile(a)->latency;
auto int_b = NekoRay::profileManager->GetProfile(b)->latency;
if (int_a > 0 && int_b > 0) {
return int_a > int_b;
}
}
return ms_a > ms_b;
} else {
return ms_a < ms_b;
}
});
break;
}
case NekoRay::GroupSortMethod::ByLatency: {
std::sort(ui->proxyListTable->order.begin(), ui->proxyListTable->order.end(),
[=](int a, int b) {
auto ms_a = NekoRay::profileManager->GetProfile(a)->latency;
auto ms_b = NekoRay::profileManager->GetProfile(b)->latency;
if (ms_a <= 0) ms_a = 114514;
if (ms_b <= 0) ms_b = 114514;
if (groupSortAction.descending) {
return ms_a > ms_b;
} else {
if (groupSortAction.method == NekoRay::GroupSortMethod::ByLatency) {
auto int_a = NekoRay::profileManager->GetProfile(a)->latency;
auto int_b = NekoRay::profileManager->GetProfile(b)->latency;
if (int_a > 0 && int_b > 0) {
return int_a < int_b;
}
}
return ms_a < ms_b;
}
});
@@ -1283,6 +1286,7 @@ void MainWindow::on_menu_resolve_domain_triggered() {
}
if (mw_sub_updating) return;
mw_sub_updating = true;
NekoRay::dataStore->resolve_count = profiles.count();
for (const auto &profile: profiles) {
profile->bean->ResolveDomainToIP([=] {