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

Merge branch 'dev-subscriptions' into dev

Browse Source
This commit is contained in:
Leroy.H.Y 2019-09-14 14:59:07 +08:00
commit 0752209ce0
No known key found for this signature in database
GPG Key ID: 6AC1673B587DC37D
11 changed files with 291 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/QvCoreConfigOperations.h
View File

@ -50,6 +50,7 @@ namespace Qv2ray
// //
// -------------------------- BEGIN CONFIG VALIDATIONS --------------------------------------------- // -------------------------- BEGIN CONFIG VALIDATIONS ---------------------------------------------
int VerifyVMessProtocolString(QString vmess); int VerifyVMessProtocolString(QString vmess);
QString GetVmessFromBase64OrPlain(QByteArray arr);
// //
// -------------------------- BEGIN CONFIG CONVERSIONS --------------------------------------------- // -------------------------- BEGIN CONFIG CONVERSIONS ---------------------------------------------
// Save Connection Config // Save Connection Config

7
src/QvCoreConfigOperations_Verification.cpp
View File

@ -1,4 +1,5 @@
#include "QvCoreConfigOperations.h" #include "QvCoreConfigOperations.h"
#include "QvUtils.h"
namespace Qv2ray namespace Qv2ray
{ {
@ -22,5 +23,11 @@ namespace Qv2ray
return -2; return -2;
} }
} }
QString GetVmessFromBase64OrPlain(QByteArray arr)
{
auto result = QString::fromUtf8(arr).trimmed();
return result.startsWith("vmess://") ? result : Base64Decode(result);
}
} }
} }

14
src/QvHTTPRequestHelper.cpp
View File

@ -2,7 +2,7 @@
#include <QByteArray> #include <QByteArray>
namespace Qv2ray namespace Qv2ray
{ {
QvHttpRequestHelper::QvHttpRequestHelper(QObject *parent) : QObject(parent), reply(), request() QvHttpRequestHelper::QvHttpRequestHelper()
{ {
} }
@ -29,6 +29,18 @@ namespace Qv2ray
request.setRawHeader(key, value); request.setRawHeader(key, value);
} }
QByteArray QvHttpRequestHelper::syncget(const QString &url)
{
this->setUrl(url);
reply = accessManager.get(request);
reply->waitForReadyRead(5000);
if (!reply->isReadable())
return QByteArray();
else
return reply->readAll();
}
void QvHttpRequestHelper::get(const QString &url) void QvHttpRequestHelper::get(const QString &url)
{ {
this->setUrl(url); this->setUrl(url);

3
src/QvHTTPRequestHelper.h
View File

@ -32,11 +32,12 @@ namespace Qv2ray
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QvHttpRequestHelper(QObject *parent); explicit QvHttpRequestHelper();
~QvHttpRequestHelper(); ~QvHttpRequestHelper();
bool setUrl(const QString &url); bool setUrl(const QString &url);
void setHeader(const QByteArray &key, const QByteArray &value); void setHeader(const QByteArray &key, const QByteArray &value);
// get // get
QByteArray syncget(const QString &url);
void get(const QString &url); void get(const QString &url);
// insert // insert
void post(const QString &url, const QByteArray &data); void post(const QString &url, const QByteArray &data);

1
src/QvTinyLog.h
View File

@ -17,5 +17,6 @@ using namespace std;
#define MODULE_UI "UI" #define MODULE_UI "UI"
#define MODULE_NETWORK "NETWORK" #define MODULE_NETWORK "NETWORK"
#define MODULE_FILE "FILE" #define MODULE_FILE "FILE"
#define MODULE_SUBSCRIPTION "SUBSCRIPTION"
#endif // QVTINYLOG_H #endif // QVTINYLOG_H

9
src/w_MainWindow.cpp
View File

@ -19,13 +19,14 @@
#include "w_ImportConfig.h" #include "w_ImportConfig.h"
#include "w_ConnectionEditWindow.h" #include "w_ConnectionEditWindow.h"
#include "w_MainWindow.h" #include "w_MainWindow.h"
#include "w_SubscribeEditor.h"
#define TRAY_TOOLTIP_PREFIX "Qv2ray " QV2RAY_VERSION_STRING "\r\n" #define TRAY_TOOLTIP_PREFIX "Qv2ray " QV2RAY_VERSION_STRING "\r\n"
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), : QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
HTTPRequestHelper(this), HTTPRequestHelper(),
hTray(new QSystemTrayIcon(this)), hTray(new QSystemTrayIcon(this)),
vinstance(new Qv2Instance(this)) vinstance(new Qv2Instance(this))
{ {
@ -499,3 +500,9 @@ void MainWindow::on_editConfigButton_clicked()
connect(w, &ConnectionEditWindow::s_reload_config, this, &MainWindow::save_reload_globalconfig); connect(w, &ConnectionEditWindow::s_reload_config, this, &MainWindow::save_reload_globalconfig);
w->show(); w->show();
} }
void MainWindow::on_pushButton_clicked()
{
SubscribeEditor *w = new SubscribeEditor(this);
w->show();
}

2
src/w_MainWindow.h
View File

@ -57,6 +57,8 @@ class MainWindow : public QMainWindow
void on_editConfigButton_clicked(); void on_editConfigButton_clicked();
void on_pushButton_clicked();
private: private:
void on_action_StartThis_triggered(); void on_action_StartThis_triggered();
void on_action_RenameConnection_triggered(); void on_action_RenameConnection_triggered();

9
src/w_MainWindow.ui
View File

@ -37,7 +37,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="2,3"> <layout class="QGridLayout" name="gridLayout" columnstretch="2,3">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,0,0,0,0">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
@ -72,6 +72,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>#Subsciptions</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">

50
src/w_SubscribeEditor.cpp
View File

@ -1,6 +1,9 @@
#include "w_SubscribeEditor.h" #include "w_SubscribeEditor.h"
#include "ui_w_SubscribeEditor.h" #include "ui_w_SubscribeEditor.h"
#include "QvHTTPRequestHelper.h" #include "QvHTTPRequestHelper.h"
#include "QvUtils.h"
#include "QvCoreConfigOperations.h"
SubscribeEditor::SubscribeEditor(QWidget *parent) : SubscribeEditor::SubscribeEditor(QWidget *parent) :
QDialog(parent), QDialog(parent),
@ -37,3 +40,50 @@ void SubscribeEditor::on_buttonBox_accepted()
SetGlobalConfig(conf); SetGlobalConfig(conf);
emit s_update_config(); emit s_update_config();
} }
void SubscribeEditor::on_addSubsButton_clicked()
{
ui->subsribeTable->insertRow(ui->subsribeTable->rowCount());
}
void SubscribeEditor::on_updateButton_clicked()
{
if (isUpdateInProgress) {
QvMessageBox(this, tr("#UpdateInProcess"), tr("#TryLater"));
return;
}
isUpdateInProgress = true;
int index = ui->subsribeTable->currentRow();
auto name = ui->subsribeTable->item(index, 0)->text();
auto url = ui->subsribeTable->item(index, 1)->text();
auto data = helper.syncget(url);
ProcessSubscriptionEntry(data, name);
}
void SubscribeEditor::ProcessSubscriptionEntry(QByteArray result, QString subsciptionName)
{
auto content = GetVmessFromBase64OrPlain(result).replace("\r", "");
if (!content.isEmpty()) {
auto vmessList = content.split("\n");
for (auto vmess : vmessList) {
auto config = ConvertConfigFromVMessString(vmess, QV2RAY_CONFIG_TYPE_SUBSCRIPTION);
if (subscriptions.contains(subsciptionName)) {
}
}
isUpdateInProgress = false;
}
}
void SubscribeEditor::on_updateAllButton_clicked()
{
for (auto rowIndex = 0; ui->subscribeList->count(); rowIndex++) {
auto url = ui->subsribeTable->item(rowIndex, 1)->text();
helper.get(url);
}
}

13
src/w_SubscribeEditor.h
View File

@ -3,6 +3,8 @@
#include <QDialog> #include <QDialog>
#include "QvUtils.h" #include "QvUtils.h"
#include "QvHTTPRequestHelper.h"
namespace Ui namespace Ui
{ {
class w_SubscribeEditor; class w_SubscribeEditor;
@ -19,11 +21,22 @@ class SubscribeEditor : public QDialog
private slots: private slots:
void on_buttonBox_accepted(); void on_buttonBox_accepted();
void on_addSubsButton_clicked();
void on_updateButton_clicked();
void on_updateAllButton_clicked();
signals: signals:
void s_update_config(); void s_update_config();
private: private:
void ProcessSubscriptionEntry(QByteArray result, QString subsciptionName);
bool isUpdateInProgress = false;
Ui::w_SubscribeEditor *ui; Ui::w_SubscribeEditor *ui;
QvHttpRequestHelper helper;
QMap<QString, QList<QJsonObject>> subscriptions;
}; };
#endif // W_SUBSCRIBEEDITOR_H #endif // W_SUBSCRIBEEDITOR_H

246
src/w_SubscribeEditor.ui
View File

@ -19,31 +19,130 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QDialogButtonBox" name="buttonBox"> <layout class="QGridLayout" name="gridLayout" columnstretch="0,3,2">
<property name="geometry"> <item row="0" column="0">
<rect> <layout class="QVBoxLayout" name="verticalLayout">
<x>6</x> <item>
<y>446</y> <widget class="QToolButton" name="addSubsButton">
<width>174</width> <property name="sizePolicy">
<height>34</height> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
</rect> <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="orientation"> <property name="toolTip">
<enum>Qt::Horizontal</enum> <string>#AddConnection</string>
</property> </property>
<property name="standardButtons"> <property name="text">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <string>A</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/add_connection_btn.png</normaloff>:/icons/add_connection_btn.png</iconset>
</property> </property>
</widget> </widget>
<widget class="QGroupBox" name="groupBox"> </item>
<property name="geometry"> <item>
<rect> <widget class="QToolButton" name="removeSubsButton">
<x>433</x> <property name="sizePolicy">
<y>226</y> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<width>281</width> <horstretch>0</horstretch>
<height>214</height> <verstretch>0</verstretch>
</rect> </sizepolicy>
</property> </property>
<property name="toolTip">
<string>#RemoveConnection</string>
</property>
<property name="text">
<string>R</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/remove_connection_btn.png</normaloff>:/icons/remove_connection_btn.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="updateAllButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QTableWidget" name="subsribeTable">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="rowCount">
<number>0</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>114</number>
</attribute>
<attribute name="horizontalHeaderShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<attribute name="verticalHeaderShowSortIndicator" stdset="0">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string>#SubsGroupName</string>
</property>
</column>
<column>
<property name="text">
<string>#SubsGroupURL</string>
</property>
</column>
</widget>
</item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QListWidget" name="subscribeList"/>
</item>
<item>
<widget class="QPushButton" name="updateButton">
<property name="text">
<string>#Update Subscription</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>#ConfigDetail</string> <string>#ConfigDetail</string>
</property> </property>
@ -95,104 +194,21 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QListWidget" name="subscribeList">
<property name="geometry">
<rect>
<x>430</x>
<y>10</y>
<width>281</width>
<height>211</height>
</rect>
</property>
</widget>
<widget class="QTableWidget" name="subsribeTable">
<property name="geometry">
<rect>
<x>50</x>
<y>10</y>
<width>371</width>
<height>431</height>
</rect>
</property>
<property name="rowCount">
<number>0</number>
</property>
<column>
<property name="text">
<string>#SubsGroupName</string>
</property>
</column>
<column>
<property name="text">
<string>#SubsGroupURL</string>
</property>
</column>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>8</x>
<y>10</y>
<width>34</width>
<height>431</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolButton" name="addSubsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>#AddConnection</string>
</property>
<property name="text">
<string>A</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/add_connection_btn.png</normaloff>:/icons/add_connection_btn.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeSubsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>#RemoveConnection</string>
</property>
<property name="text">
<string>R</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/remove_connection_btn.png</normaloff>:/icons/remove_connection_btn.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item row="1" column="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../resources.qrc"/> <include location="../resources.qrc"/>