Split NetworkTimeouts and RedirectFollower to it's own files

- Follow redirects by default
2019-08-20 23:31:23 +02:00
parent 1330197036
commit 9c485c4d94
10 changed files with 338 additions and 197 deletions
--- a/src/core/networktimeouts.cpp
+++ b/src/core/networktimeouts.cpp
@@ -0,0 +1,90 @@
+/*
+ * Strawberry Music Player
+ * This file was part of Clementine.
+ * Copyright 2010, David Sansome <me@davidsansome.com>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QtGlobal>
+#include <QObject>
+#include <QUrl>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QTimerEvent>
+
+#include "core/closure.h"
+#include "networktimeouts.h"
+#include "redirectfollower.h"
+
+NetworkTimeouts::NetworkTimeouts(int timeout_msec, QObject *parent)
+    : QObject(parent), timeout_msec_(timeout_msec) {}
+
+void NetworkTimeouts::AddReply(QNetworkReply *reply) {
+
+  if (timers_.contains(reply)) return;
+
+  connect(reply, SIGNAL(destroyed()), SLOT(ReplyFinished()));
+  connect(reply, SIGNAL(finished()), SLOT(ReplyFinished()));
+  timers_[reply] = startTimer(timeout_msec_);
+
+}
+
+void NetworkTimeouts::AddReply(RedirectFollower *reply) {
+
+  if (redirect_timers_.contains(reply)) {
+    return;
+  }
+
+  NewClosure(reply, SIGNAL(destroyed()), this, SLOT(RedirectFinished(RedirectFollower*)), reply);
+  NewClosure(reply, SIGNAL(finished()), this, SLOT(RedirectFinished(RedirectFollower*)), reply);
+  redirect_timers_[reply] = startTimer(timeout_msec_);
+
+}
+
+void NetworkTimeouts::ReplyFinished() {
+
+  QNetworkReply *reply = reinterpret_cast<QNetworkReply*>(sender());
+  if (timers_.contains(reply)) {
+    killTimer(timers_.take(reply));
+  }
+
+}
+
+void NetworkTimeouts::RedirectFinished(RedirectFollower *reply) {
+
+  if (redirect_timers_.contains(reply)) {
+    killTimer(redirect_timers_.take(reply));
+  }
+
+}
+
+void NetworkTimeouts::timerEvent(QTimerEvent *e) {
+
+  QNetworkReply *reply = timers_.key(e->timerId());
+  if (reply) {
+    reply->abort();
+  }
+
+  RedirectFollower *redirect = redirect_timers_.key(e->timerId());
+  if (redirect) {
+    redirect->abort();
+  }
+
+}
+
+