WIP
All checks were successful
PostmarketOS Build / Prepare (push) Successful in 5s
PostmarketOS Build / Build for aarch64 (push) Successful in 39s
PostmarketOS Build / Build for x86_64 (push) Successful in 13s

Signed-off-by: Vasiliy Doylov <nekocwd@mainlining.org>
This commit is contained in:
Vasiliy Doylov 2025-06-22 02:03:46 +03:00
parent a023832fea
commit bd8b1038d3
Signed by: NekoCWD
GPG key ID: B7BE22D44474A582

View file

@ -27,15 +27,15 @@ namespace Singularity.Utils {
* `meow_meow_meow` to make our saves compatible with SingBox configuration. * `meow_meow_meow` to make our saves compatible with SingBox configuration.
*/ */
public Json.Node fix_dash(Json.Node node, bool serialize = true) { public Json.Node fix_dash(Json.Node node, bool serialize = true) {
var type = node.get_value_type(); // var type = node.get_value_type();
if (type == typeof (Json.Object)) { // if (type == typeof (Json.Object)) {
var obj = node.get_object(); // var obj = node.get_object();
foreach (var name in obj.get_members()) { // foreach (var name in obj.get_members()) {
var value = obj.get_member(name); // var value = obj.get_member(name);
obj.set_member(serialize ? name.replace("-", "_") : name.replace("_", "-"), value); // obj.set_member(serialize ? name.replace("-", "_") : name.replace("_", "-"), value);
obj.remove_member(name); // obj.remove_member(name);
} // }
} // }
return node.copy(); return node.copy();
} }
@ -44,21 +44,21 @@ namespace Singularity.Utils {
* to make our saves compatible with SingBox configuration. * to make our saves compatible with SingBox configuration.
*/ */
public Json.Node fix_type(Json.Node node) { public Json.Node fix_type(Json.Node node) {
const string TYPE_NAME_SRC = "type-name"; // const string TYPE_NAME_SRC = "type-name";
const string TYPE_NAME_DST = "type"; // const string TYPE_NAME_DST = "type";
var obj = node.get_object(); // var obj = node.get_object();
if (obj.has_member(TYPE_NAME_SRC)) { // if (obj.has_member(TYPE_NAME_SRC)) {
var type_name = obj.get_member(TYPE_NAME_SRC); // var type_name = obj.get_member(TYPE_NAME_SRC);
obj.set_member(TYPE_NAME_DST, type_name); // obj.set_member(TYPE_NAME_DST, type_name);
obj.remove_member(TYPE_NAME_SRC); // obj.remove_member(TYPE_NAME_SRC);
} else if (obj.has_member(TYPE_NAME_DST)) { // } else if (obj.has_member(TYPE_NAME_DST)) {
var type_name = obj.get_member(TYPE_NAME_DST); // var type_name = obj.get_member(TYPE_NAME_DST);
obj.set_member(TYPE_NAME_SRC, type_name); // obj.set_member(TYPE_NAME_SRC, type_name);
obj.remove_member(TYPE_NAME_DST); // obj.remove_member(TYPE_NAME_DST);
} else { // } else {
warning("Object has no type to fix it"); // warning("Object has no type to fix it");
} // }
return node.copy(); return node.copy();
} }