From 5b91b571be86b7f92a5190348d192513dbe27cdd Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Tue, 28 Aug 2018 06:33:35 +0500
Subject: [PATCH] Remove TaskUzOnline, because addresses are same with
 TaskTasix now.

---
 src/ui/FortFirewall.pro      |   2 --
 src/ui/i18n/i18n_ru.qm       | Bin 10522 -> 10284 bytes
 src/ui/i18n/i18n_ru.ts       |  13 ----------
 src/ui/task/taskinfo.cpp     |   5 ----
 src/ui/task/taskinfo.h       |   3 +--
 src/ui/task/taskmanager.cpp  |   1 -
 src/ui/task/taskuzonline.cpp |  46 -----------------------------------
 src/ui/task/taskuzonline.h   |  27 --------------------
 8 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 src/ui/task/taskuzonline.cpp
 delete mode 100644 src/ui/task/taskuzonline.h

diff --git a/src/ui/FortFirewall.pro b/src/ui/FortFirewall.pro
index 70458bc2..4bf8049c 100644
--- a/src/ui/FortFirewall.pro
+++ b/src/ui/FortFirewall.pro
@@ -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 \
diff --git a/src/ui/i18n/i18n_ru.qm b/src/ui/i18n/i18n_ru.qm
index da5c75512709639b685e1d5552e5206abad37599..edbe33e0e3d6e9f41c8c0977ab4430c74f2c3096 100644
GIT binary patch
delta 1062
zcmX9+eN2>f9RJ+&cF#R8_aJX~yd5vcAH5D;U63eKui|7;Ca8;W(<M_`y4uk&g&hK$
zo1-S35Rry@lRy|~py`a9mqs-jM3NI4V>5Mw+Sn>=(XtQYug|{E_xt;PUY>9J=H5-m
z;zKcjoDZZu4g{V8%pRcV1`vAyC>{qArh(Up$yq=NF(n=-8v?R|MAlhtkUHN3R!l+a
zIt#?<kbQSKKMy(J15z(RZj#9H<}!M6P%y(f_Gbj1*$sru5d^BA2P_XZ`aU5Rqe%N2
zi1`9V`F{bf9u(EF9~;5eqa;Y1z#Ek{B))>3wTZ0X#z(DO7`G3jm43i}!Iph1nRSjW
z_u>GFo0l<j#5R=V1u_l_kCin8`k3(I+Gd1ciwbqp8NjhsXx>o*h^0c`S`NAjg)2^l
z&ejXjF#w+bgy{4<kX|6V+P`NKJ~3nVSwQO-a~JCYqe0volgb1a#qsN9>^Ddi{d<Ww
zrM8V<($KWjwaC5h<5F+Wb{bkI&E;qzM&*|lzN5p$p!D$f2|8FWhb~9Ba7sRDaiLWw
zUpnyzp#CP`)GO(HMjrN60bZv(73DkcW%<D*4d^aKjF2e3MtSAO9Tf7GQjx@Wi9Y4P
z%S=u^p&U{~KsvmPX@$yoeCSs;6y@Hk8;q>O{?h9~K2(TH0($Jb*QBstVz0eQr>Rx;
zma%u4gkbOAf0v8z*e8a)Oeko-J-&@Xuc>j_BuKxiw!U+ii4LeApNs>X&#9f|pVH`l
zwfn*hf58KFsOeko*`nSGy<Y(+0rl^SJPw|6_)h=HsOlZ7%U>YDSx0pHPDY&Lm<V2{
zpj^k?wToO}Xr46IIHINBUP5TEZlF_lk+$dHeMYNmM+P}(=4qc59;LBSt*f3!-3eM>
z!9Tp2PTi6zJhN2~H98GCQ1!?!#Ef<NTpuG(SgAjB5?zx<@@xZ9H!}OT@cSd<$tFLQ
zHyVW>QfT~`Q5_m&GCrerb2g*RUB-lcMx=$m%DcwsKEI1MHEc{SL^yxUn9aXOd}Nw!
ztey8)nyV6RfXy(sb@OVI{APK_S0p%Z?y5cw2&Lwp5gu1UzggdLj{V;752B|u>uKk?
z<BjB7aDFqm#QV8(c$`MvcP#g4nEQ(@zkdTyB4kyLvY+y=^+C%|G@NHOuVzrmeO9!7
jN%t%d)H^RS!A;?L{fY3rqz_a{?RvN-W?-OW#Ua=Kkg^XP

delta 1159
zcmZWneN0tl9DXk6<9?iT?zwpBUM?S(i(HnAnmJ$?G)ifKXd(z&giVS&g&eK0D2lEi
z%fZk^S5QfEcBcUmq!&|`*dz>VO^9SJ(nj;60k%~ZwsftB*!rh`&h!4x`}@7m$NToI
zYcF^^!tVj348Uy!a_$GLjX>@&VBY{dF%CFR1Np>g0PE-RH=uYBNXRF$PIv|4(bs@Q
z0}wlpaBdn>>Q(k#fRvL8#O{UEERy571&q^>ImO!EkDTN!fZy7Uoa%=F{VrCez6;or
zkZbuI2yaDh#vedrBXW0e-(H6eO(bxK@N~r+B;JS8S_kX3*w@AbBUWRyA`37cGk7mX
zvDOS}Cqg7{S-{2JhPsC1fHGznbR_`sPlhciZh-(bGoTsV{>a3z0jo?SabZJaG#ht0
zZ0Lty08fnIZ2t;~u?wD=6u{Caq}{0pv{Iqm7Q?{46UNULbH7yd^_3HY;{H_(E&R0D
zd51i%m&BeAH&MS^oLy>RF!AEtm-OSz7jOSOLA@&^|EVDS&<3Oqod?>Ukv=(i3ozZ3
z&M6f%dPW*a-A=qIeLuuOZ=3Yf<oh(@l!YLPJjL?bZ#Gj%uIzJh&S{rlUBjSE2j$mg
z0TAmJ(48ocM_l87S-!q(m;u!qAAhQfMy?Tqel8k~TOQ^;o7Nj^Kc&;y0%Pmg%S?F6
z*jIU#2cI-fjL^}deB-6@jTG8pvU^G3Ibdpgu?{eYOb0sbyvYdD(USM*bd9O&*c6jK
zXBuoi&qR|=7kB#rImh&;Z#nzkG^ZZ^ok?vrr<eF2Bf(Dd(56yGywp5Vbrw*Mm}fsb
zL4p~JJC-$eS>i6uBP@9<>D0BvvbE+01x;Ia^|R0FuzZl+L}wpaI_v2)@|LAH^Di1`
zP;`mH7jIV@tSSj_D8b9bc(*d!%fua4<+k6-MdT?pYGx;eOsg?>f24q4)%d<5He6AY
znzQKOSvC6|D!!*zt@igbA-h^z;AO;V3+Py_23vV$-YB)}<1#=PQ77ku?5|X3GOiP^
zXxe_(`mnalVE_!Owy}$EH7Z_<D>-zA1beiy>cc=-p|<sFJ~GE{t^QCq8=3-xg1az5
zv3BomAm5zzi~f1u<JOUJ8g`x3BS!-~KS|HZTFIy3*DFT3A2X@%Y5kVQ9ePVT1B-6f
zhwA5bpXWpMUJ#h%y1<ljUtmg9LS<sRl9(bo#RtV?@li2LOcS%k<zhNKC_)YLP>F3Q
z=hqilVRV^ei)!*Jx0P4=0&nT}2L9GV;VJ*?Q)~~IqyOuB#OBo0!qTeei)vo@cQVvt
H+u{5N*K8)H

diff --git a/src/ui/i18n/i18n_ru.ts b/src/ui/i18n/i18n_ru.ts
index 4b76ea20..54fe128b 100644
--- a/src/ui/i18n/i18n_ru.ts
+++ b/src/ui/i18n/i18n_ru.ts
@@ -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>
diff --git a/src/ui/task/taskinfo.cpp b/src/ui/task/taskinfo.cpp
index 3dad5964..b399501b 100644
--- a/src/ui/task/taskinfo.cpp
+++ b/src/ui/task/taskinfo.cpp
@@ -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;
diff --git a/src/ui/task/taskinfo.h b/src/ui/task/taskinfo.h
index 4d4b5aff..3d7589f2 100644
--- a/src/ui/task/taskinfo.h
+++ b/src/ui/task/taskinfo.h
@@ -21,8 +21,7 @@ public:
     enum TaskType : qint16 {
         TypeNone = -1,
         UpdateChecker = 0,
-        Tasix,
-        Uzonline
+        Tasix
     };
     Q_ENUM(TaskType)
 
diff --git a/src/ui/task/taskmanager.cpp b/src/ui/task/taskmanager.cpp
index 0c3a01ca..ff29fddd 100644
--- a/src/ui/task/taskmanager.cpp
+++ b/src/ui/task/taskmanager.cpp
@@ -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)
diff --git a/src/ui/task/taskuzonline.cpp b/src/ui/task/taskuzonline.cpp
deleted file mode 100644
index 95d5e1cd..00000000
--- a/src/ui/task/taskuzonline.cpp
+++ /dev/null
@@ -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;
-}
diff --git a/src/ui/task/taskuzonline.h b/src/ui/task/taskuzonline.h
deleted file mode 100644
index d23d1f3a..00000000
--- a/src/ui/task/taskuzonline.h
+++ /dev/null
@@ -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