Changeset 1ba9324 in confclerk_git for src

Timestamp:

04/18/12 20:26:48 (11 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

dadb922

Parents:

d466553

Message:

Handle redirects when importing schedules over the network.

Fixes: #39

File:

• src/gui/mainwindow.cpp (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -335 +335 @@
 }
 
-void MainWindow::networkQueryFinished(QNetworkReply *aReply)
-{
-    if ( aReply->error() != QNetworkReply::NoError )
-    {
+void MainWindow::networkQueryFinished(QNetworkReply *aReply) {
+    if (aReply->error() != QNetworkReply::NoError) {
         error_message(QString("Error occured during download: ") + aReply->errorString());
-    }
-    else
-    {
-        importData(aReply->readAll(), aReply->url().toEncoded());
+    } else {
+        QUrl redirectUrl = aReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+        if (!redirectUrl.isEmpty()) {
+            if (redirectUrl != aReply->request().url()) {
+                importFromNetwork(redirectUrl.toString());
+                return; // don't enable controls
+            } else {
+                error_message(QString("Error: Cyclic redirection from %1 to itself.").arg(redirectUrl.toString()));
+            }
+        } else {
+            importData(aReply->readAll(), aReply->url().toEncoded());
+        }
     }
     setEnabled(true);