github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

add: added support with comment-json - fix

Browse Source
This commit is contained in:
Qv2ray-dev 2020-03-11 21:10:04 +08:00
parent 8d7ac0a708
commit 26aaa14c9a
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/QvHelpers.cpp
View File

@ -1,5 +1,7 @@
#include "common/QvHelpers.hpp" #include "common/QvHelpers.hpp"
#include "libs/puresource/src/PureJson.hpp"
#include <QGraphicsEffect> #include <QGraphicsEffect>
#include <QGraphicsProxyWidget> #include <QGraphicsProxyWidget>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -42,7 +44,8 @@ namespace Qv2ray::common
QTextCodec::ConverterState state; QTextCodec::ConverterState state;
QTextCodec *codec = QTextCodec::codecForName("UTF-8"); QTextCodec *codec = QTextCodec::codecForName("UTF-8");
const QString text = codec->toUnicode(byteArray.constData(), byteArray.size(), &state); 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()) LOG(MODULE_FILEIO, "Not a valid UTF-8 sequence: " + source->fileName())
return source->readAll(); return source->readAll();
} }
@ -77,14 +80,14 @@ namespace Qv2ray::common
return JsonFromString(json); return JsonFromString(json);
} }
QString JsonToString(QJsonObject json, QJsonDocument::JsonFormat format) QString JsonToString(const QJsonObject &json, QJsonDocument::JsonFormat format)
{ {
QJsonDocument doc; QJsonDocument doc;
doc.setObject(json); doc.setObject(json);
return doc.toJson(format); return doc.toJson(format);
} }
QString JsonToString(QJsonArray array, QJsonDocument::JsonFormat format) QString JsonToString(const QJsonArray &array, QJsonDocument::JsonFormat format)
{ {
QJsonDocument doc; QJsonDocument doc;
doc.setArray(array); doc.setArray(array);
@ -108,19 +111,24 @@ namespace Qv2ray::common
} }
} }
QJsonObject JsonFromString(QString string) QJsonObject JsonFromString(const QString &string)
{ {
QJsonDocument doc = QJsonDocument::fromJson(string.toUtf8()); auto removeComment = RemoveComment(string);
if (removeComment != string)
{
LOG(MODULE_FILEIO, "Some comments have been removed from the json.")
}
QJsonDocument doc = QJsonDocument::fromJson(removeComment.toUtf8());
return doc.object(); return doc.object();
} }
QString Base64Encode(QString string) QString Base64Encode(const QString &string)
{ {
QByteArray ba = string.toUtf8(); QByteArray ba = string.toUtf8();
return ba.toBase64(); return ba.toBase64();
} }
QString Base64Decode(QString string) QString Base64Decode(const QString &string)
{ {
QByteArray ba = string.toUtf8(); QByteArray ba = string.toUtf8();
return QString(QByteArray::fromBase64(ba)); return QString(QByteArray::fromBase64(ba));
@ -143,27 +151,28 @@ namespace Qv2ray::common
return list; return list;
} }
QStringList GetFileList(QDir dir) QStringList GetFileList(const QDir &dir)
{ {
return dir.entryList(QStringList{ "*", "*.*" }, QDir::Hidden | QDir::Files); return dir.entryList(QStringList{ "*", "*.*" }, QDir::Hidden | QDir::Files);
} }
bool FileExistsIn(QDir dir, QString fileName) bool FileExistsIn(const QDir &dir, const QString &fileName)
{ {
return GetFileList(dir).contains(fileName); return GetFileList(dir).contains(fileName);
} }
void QvMessageBoxWarn(QWidget *parent, QString title, QString text) void QvMessageBoxWarn(QWidget *parent, const QString &title, const QString &text)
{ {
QMessageBox::warning(parent, title, text, QMessageBox::Ok | QMessageBox::Default, 0); QMessageBox::warning(parent, title, text, QMessageBox::Ok | QMessageBox::Default, 0);
} }
void QvMessageBoxInfo(QWidget *parent, QString title, QString text) void QvMessageBoxInfo(QWidget *parent, const QString &title, const QString &text)
{ {
QMessageBox::information(parent, title, text, QMessageBox::Ok | QMessageBox::Default, 0); QMessageBox::information(parent, title, text, QMessageBox::Ok | QMessageBox::Default, 0);
} }
QMessageBox::StandardButton QvMessageBoxAsk(QWidget *parent, QString title, QString text, QMessageBox::StandardButton extraButtons) QMessageBox::StandardButton QvMessageBoxAsk(QWidget *parent, const QString &title, const QString &text,
QMessageBox::StandardButton extraButtons)
{ {
return QMessageBox::question(parent, title, text, QMessageBox::Yes | QMessageBox::No | extraButtons); return QMessageBox::question(parent, title, text, QMessageBox::Yes | QMessageBox::No | extraButtons);
} }

20
src/common/QvHelpers.hpp
View File

@ -12,17 +12,17 @@
namespace Qv2ray::common namespace Qv2ray::common
{ {
QStringList GetFileList(QDir dir); QStringList GetFileList(const QDir &dir);
QString Base64Encode(QString string); QString Base64Encode(const QString &string);
QString Base64Decode(QString string); QString Base64Decode(const QString &string);
QStringList SplitLines(const QString &str); QStringList SplitLines(const QString &str);
list<string> SplitLines_std(const QString &_string); list<string> SplitLines_std(const QString &_string);
bool FileExistsIn(QDir dir, QString fileName); bool FileExistsIn(const QDir &dir, const QString &fileName);
const QString GenerateRandomString(int len = 12); const QString GenerateRandomString(int len = 12);
// //
void QvMessageBoxWarn(QWidget *parent, QString title, QString text); void QvMessageBoxWarn(QWidget *parent, const QString &title, const QString &text);
void QvMessageBoxInfo(QWidget *parent, QString title, QString text); void QvMessageBoxInfo(QWidget *parent, const QString &title, const QString &text);
QMessageBox::StandardButton QvMessageBoxAsk(QWidget *parent, QString title, QString text, QMessageBox::StandardButton QvMessageBoxAsk(QWidget *parent, const QString &title, const QString &text,
QMessageBox::StandardButton extraButtons = QMessageBox::NoButton); QMessageBox::StandardButton extraButtons = QMessageBox::NoButton);
// //
QString StringFromFile(const QString &filePath); QString StringFromFile(const QString &filePath);
@ -30,9 +30,9 @@ namespace Qv2ray::common
bool StringToFile(const QString &text, QFile &target); bool StringToFile(const QString &text, QFile &target);
bool StringToFile(const QString &text, const QString &targetpath); bool StringToFile(const QString &text, const QString &targetpath);
// //
QJsonObject JsonFromString(QString string); QJsonObject JsonFromString(const QString &string);
QString JsonToString(QJsonObject json, QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented); QString JsonToString(const QJsonObject &json, QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented);
QString JsonToString(QJsonArray array, QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented); QString JsonToString(const QJsonArray &array, QJsonDocument::JsonFormat format = QJsonDocument::JsonFormat::Indented);
QString VerifyJsonString(const QString &source); QString VerifyJsonString(const QString &source);
// //
QString FormatBytes(const int64_t bytes); QString FormatBytes(const int64_t bytes);