From a5cf9222ff4823c3d81a63bfa41484777c7e4be2 Mon Sep 17 00:00:00 2001 From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com> Date: Wed, 11 Mar 2020 20:55:52 +0800 Subject: [PATCH] add: added support with comment-json --- src/common/QvHelpers.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/QvHelpers.cpp b/src/common/QvHelpers.cpp index 1999b94c..1bca9224 100644 --- a/src/common/QvHelpers.cpp +++ b/src/common/QvHelpers.cpp @@ -1,5 +1,7 @@ #include "common/QvHelpers.hpp" +#include "libs/puresource/src/PureJson.hpp" + #include #include #include @@ -42,7 +44,8 @@ namespace Qv2ray::common QTextCodec::ConverterState state; QTextCodec *codec = QTextCodec::codecForName("UTF-8"); const QString text = codec->toUnicode(byteArray.constData(), byteArray.size(), &state); - if (state.invalidChars > 0) { + if (state.invalidChars > 0) + { LOG(MODULE_FILEIO, "Not a valid UTF-8 sequence: " + source->fileName()) return source->readAll(); } @@ -73,7 +76,7 @@ namespace Qv2ray::common QJsonObject JSONFromFile(QFile *sourceFile) { - QString json = StringFromFile(sourceFile); + QString json = RemoveComment(StringFromFile(sourceFile)); return JsonFromString(json); }