Move timeout logic to NetworkRequest

2017-10-27 22:04:05 +02:00
parent 41ec892bf8
commit 2de98dc1f8
3 changed files with 109 additions and 125 deletions
@@ -38,51 +38,6 @@ static QJsonObject parseJSONFromReply(QNetworkReply *reply)
    return jsonDoc.object();
 }

-static void urlFetchTimeout(const QString &url, const QObject *caller,
-                            std::function<void(QNetworkReply *)> successCallback, int timeoutMs)
-{
-    QTimer *timer = new QTimer;
-    timer->setSingleShot(true);
-
-    QEventLoop *loop = new QEventLoop;
-
-    util::NetworkRequest req(url);
-    req.setCaller(loop);
-    req.setOnReplyCreated([loop, timer](QNetworkReply *reply) {
-        QObject::connect(timer, &QTimer::timeout, loop, [=]() {
-            QObject::disconnect(reply, &QNetworkReply::finished, loop, &QEventLoop::quit);
-            reply->abort();
-            reply->deleteLater();
-        });
-    });
-    req.get([=](QNetworkReply *reply) {
-        if (reply->error() == QNetworkReply::NetworkError::NoError) {
-            successCallback(reply);
-        }
-
-        reply->deleteLater();
-        loop->quit();
-    });
-
-    QObject::connect(timer, SIGNAL(timeout()), loop, SLOT(quit()));
-
-    timer->start(timeoutMs);
-    loop->exec();
-    delete timer;
-    delete loop;
-}
-
-static void urlFetchJSONTimeout(const QString &url, const QObject *caller,
-                                std::function<void(QJsonObject &)> successCallback, int timeoutMs)
-{
-    urlFetchTimeout(url, caller,
-                    [=](QNetworkReply *reply) {
-                        auto node = parseJSONFromReply(reply);
-                        successCallback(node);
-                    },
-                    timeoutMs);
-}
-
 namespace twitch {

 static void get(QString url, const QObject *caller,