mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove TaskUzOnline, because addresses are same with TaskTasix now.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2018-08-28 06:33:35 +05:00
parent f9e472b61f
commit 5b91b571be
8 changed files with 1 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/FortFirewall.pro
View File

@ -42,7 +42,6 @@ SOURCES += \
task/taskmanager.cpp \
task/tasktasix.cpp \
task/taskupdatechecker.cpp \
task/taskuzonline.cpp \
task/taskworker.cpp \
translationmanager.cpp \
util/conf/addressrange.cpp \
@ -100,7 +99,6 @@ HEADERS += \
task/taskmanager.h \
task/tasktasix.h \
task/taskupdatechecker.h \
task/taskuzonline.h \
task/taskworker.h \
translationmanager.h \
util/conf/addressrange.h \

BIN
src/ui/i18n/i18n_ru.qm
View File

Binary file not shown.

13
src/ui/i18n/i18n_ru.ts
View File

@ -167,11 +167,6 @@
<source>TAS-IX Addresses Downloader</source>
<translation>Загрузчик TAS-IX адресов</translation>
</message>
<message>
<location filename="../task/taskinfo.cpp" line="52"/>
<source>UzOnline Addresses Downloader</source>
<translation>Загрузчик UzOnline адресов</translation>
</message>
</context>
<context>
<name>TaskTasix</name>
@ -189,14 +184,6 @@
<translation>Новая версия!</translation>
</message>
</context>
<context>
<name>TaskUzonline</name>
<message>
<location filename="../task/taskuzonline.h" line="23"/>
<source>UzOnline addresses updated!</source>
<translation>UzOnline адреса обновлены!</translation>
</message>
</context>
<context>
<name>qml</name>
<message>

5
src/ui/task/taskinfo.cpp
View File

@ -6,7 +6,6 @@
#include "../util/dateutil.h"
#include "tasktasix.h"
#include "taskupdatechecker.h"
#include "taskuzonline.h"
#define TASK_INFO_VERSION 1
@ -48,8 +47,6 @@ QString TaskInfo::title() const
return tr("Update Checker");
case Tasix:
return tr("TAS-IX Addresses Downloader");
case Uzonline:
return tr("UzOnline Addresses Downloader");
default:
Q_UNREACHABLE();
return QString();
@ -199,8 +196,6 @@ TaskWorker *TaskInfo::createWorker()
return new TaskUpdateChecker(this);
case Tasix:
return new TaskTasix(this);
case Uzonline:
return new TaskUzonline(this);
default:
Q_UNREACHABLE();
return nullptr;

3
src/ui/task/taskinfo.h
View File

@ -21,8 +21,7 @@ public:
enum TaskType : qint16 {
TypeNone = -1,
UpdateChecker = 0,
Tasix,
Uzonline
Tasix
};
Q_ENUM(TaskType)

1
src/ui/task/taskmanager.cpp
View File

@ -28,7 +28,6 @@ void TaskManager::setupTasks()
{
appendTaskInfo(new TaskInfo(TaskInfo::UpdateChecker, this));
appendTaskInfo(new TaskInfo(TaskInfo::Tasix, this));
appendTaskInfo(new TaskInfo(TaskInfo::Uzonline, this));
}
void TaskManager::appendTaskInfo(TaskInfo *taskInfo)

46
src/ui/task/taskuzonline.cpp
View File

@ -1,46 +0,0 @@
#include "taskuzonline.h"
#include <QRegularExpression>
#include <QVector>
#include "../util/net/netdownloader.h"
TaskUzonline::TaskUzonline(QObject *parent) :
TaskTasix(parent)
{
}
void TaskUzonline::setupDownloader()
{
downloader()->setUrl("https://alltor.me/viewtopic.php?p=1345405");
}
QStringList TaskUzonline::parseUzonlineBuffer(const QByteArray &buffer)
{
const int startPos = buffer.indexOf("=UZONLINE=START=");
const int endPos = buffer.indexOf("=UZONLINE=END=", startPos + 1);
if (startPos < 0 || endPos < 0)
return QStringList();
const QRegularExpression re(R"(([\d.]+)[^\d.]*-[^\d.]*([\d.]+))");
QStringList list;
// Parse lines
const QString text = QString::fromLatin1(buffer.constData() + startPos,
endPos - startPos);
foreach (const QStringRef &line, text.splitRef(
"<br", QString::SkipEmptyParts)) {
const QRegularExpressionMatch match = re.match(line);
if (!match.hasMatch())
continue;
const QString ip1 = match.captured(1);
const QString ip2 = match.captured(2);
list.append(ip1 + '-' + ip2);
}
return list;
}

27
src/ui/task/taskuzonline.h
View File

@ -1,27 +0,0 @@
#ifndef TASKUZONLINE_H
#define TASKUZONLINE_H
#include "tasktasix.h"
class TaskUzonline : public TaskTasix
{
Q_OBJECT
public:
explicit TaskUzonline(QObject *parent = nullptr);
static QStringList parseUzonlineBuffer(const QByteArray &buffer);
protected:
void setupDownloader() override;
virtual QStringList parseCustomBuffer(const QByteArray &buffer) const override {
return parseUzonlineBuffer(buffer);
}
QString successMessage() const override {
return tr("UzOnline addresses updated!");
}
};
#endif // TASKUZONLINE_H