This commit is contained in:
parhelia512 2025-08-16 21:48:36 +08:00
parent 2b5fe2de05
commit 5b9b18c72d
2 changed files with 14 additions and 14 deletions

View File

@ -505,6 +505,20 @@ namespace Configs {
status->result->error = "Routing profile does not exist, try resetting the route profile in Routing Settings";
return;
}
// will be removed on November 1st, 2025
for (auto ruleItem = routeChain->Rules.begin(); ruleItem != routeChain->Rules.end(); ++ruleItem) {
for (auto ruleSetItem = (*ruleItem)->rule_set.begin(); ruleSetItem != (*ruleItem)->rule_set.end(); ++ruleSetItem) {
if ((*ruleSetItem).endsWith("_IP")) {
*ruleSetItem = "geoip-" + (*ruleSetItem).left((*ruleSetItem).length() - 3);
}
if ((*ruleSetItem).endsWith("_SITE")) {
*ruleSetItem = "geosite-" + (*ruleSetItem).left((*ruleSetItem).length() - 5);
}
}
}
routeChain->Save();
// copy for modification
routeChain = std::make_shared<RoutingChain>(*routeChain);

View File

@ -601,20 +601,6 @@ namespace Configs {
}
std::shared_ptr<QStringList> RoutingChain::get_used_rule_sets() {
// will be removed on November 1st, 2025
for (auto ruleItem = Rules.begin(); ruleItem != Rules.end(); ++ruleItem) {
for (auto ruleSetItem = (*ruleItem)->rule_set.begin(); ruleSetItem != (*ruleItem)->rule_set.end(); ++ruleSetItem) {
if ((*ruleSetItem).endsWith("_IP")) {
*ruleSetItem = "geoip-" + (*ruleSetItem).left((*ruleSetItem).length() - 3);
}
if ((*ruleSetItem).endsWith("_SITE")) {
*ruleSetItem = "geosite-" + (*ruleSetItem).left((*ruleSetItem).length() - 5);
}
}
}
Save();
auto res = std::make_shared<QStringList>();
for (const auto& item: Rules) {
for (const auto& ruleItem: item->rule_set) {