From ee5953d6ea4aa3888b32f69066e092f9c753544a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 5 Feb 2014 08:51:42 +0100 Subject: [PATCH] Adjustable download timeout + some tweaking. --- src/core/feedsmodelstandardfeed.cpp | 11 ++++------ src/core/networkfactory.cpp | 10 +++++---- src/core/networkfactory.h | 4 +++- src/gui/formsettings.cpp | 2 ++ src/gui/formsettings.ui | 34 +++++++++++++++++++++++++---- 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index dadee87c3..15f24e9c5 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/src/core/feedsmodelstandardfeed.cpp @@ -129,16 +129,13 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { void FeedsModelStandardFeed::update() { QByteArray feed_contents; - int download_timeout = Settings::instance()->value(APP_CFG_FEEDS, - "download_timeout", - DOWNLOAD_TIMEOUT).toInt(); - - // TODO: Provide download time-measures debugging - // outputs here. + int download_timeout = Settings::instance()->value(APP_CFG_FEEDS, "feed_update_timeout", DOWNLOAD_TIMEOUT).toInt(); QNetworkReply::NetworkError download_result = NetworkFactory::downloadFeedFile(url(), download_timeout, feed_contents, - this); + passwordProtected(), + username(), + password()); if (download_result != QNetworkReply::NoError) { qWarning("Error during fetching of new messages for feed '%s' (id %d).", diff --git a/src/core/networkfactory.cpp b/src/core/networkfactory.cpp index 3fcb69bd1..7b456d0cc 100644 --- a/src/core/networkfactory.cpp +++ b/src/core/networkfactory.cpp @@ -13,7 +13,9 @@ NetworkFactory::NetworkFactory() { QNetworkReply::NetworkError NetworkFactory::downloadFeedFile(const QString &url, int timeout, QByteArray &output, - FeedsModelStandardFeed *feed) { + bool protected_contents, + const QString &username, + const QString &password) { // Original asynchronous behavior of QNetworkAccessManager // is replaced by synchronous behavior in order to make // process of downloading of a file easier to understand. @@ -27,9 +29,9 @@ QNetworkReply::NetworkError NetworkFactory::downloadFeedFile(const QString &url, QObject originatingObject; // Set credential information as originating object. - originatingObject.setProperty("protected", feed->passwordProtected()); - originatingObject.setProperty("username", feed->username()); - originatingObject.setProperty("password", feed->password()); + originatingObject.setProperty("protected", protected_contents); + originatingObject.setProperty("username", username); + originatingObject.setProperty("password", password); request.setOriginatingObject(&originatingObject); // Set url for this reques. diff --git a/src/core/networkfactory.h b/src/core/networkfactory.h index edc04a1f1..e3fcaf648 100644 --- a/src/core/networkfactory.h +++ b/src/core/networkfactory.h @@ -17,7 +17,9 @@ class NetworkFactory { static QNetworkReply::NetworkError downloadFeedFile(const QString &url, int timeout, QByteArray &output, - FeedsModelStandardFeed *feed); + bool protected_contents = false, + const QString &username = QString(), + const QString &password = QString()); }; #endif // NETWORKFACTORY_H diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index b23a58da2..6a4b4fb23 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -156,12 +156,14 @@ void FormSettings::loadFeedsMessages() { m_ui->m_checkRemoveReadMessagesOnExit->setChecked(Settings::instance()->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool()); m_ui->m_checkAutoUpdate->setChecked(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_enabled", false).toBool()); m_ui->m_spinAutoUpdateInterval->setValue(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_interval", DEFAULT_AUTO_UPDATE_INTERVAL).toInt()); + m_ui->m_spinFeedUpdateTimeout->setValue(Settings::instance()->value(APP_CFG_FEEDS, "feed_update_timeout", DOWNLOAD_TIMEOUT).toInt()); } void FormSettings::saveFeedsMessages() { Settings::instance()->setValue(APP_CFG_MESSAGES, "clear_read_on_exit", m_ui->m_checkRemoveReadMessagesOnExit->isChecked()); Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_enabled", m_ui->m_checkAutoUpdate->isChecked()); Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_interval", m_ui->m_spinAutoUpdateInterval->value()); + Settings::instance()->setValue(APP_CFG_FEEDS, "feed_update_timeout", m_ui->m_spinFeedUpdateTimeout->value()); FormMain::instance()->tabWidget()->feedMessageViewer()->feedsView()->updateAutoUpdateStatus(); } diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index 59e470638..d47378d2f 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -102,8 +102,8 @@ Authors of this application are NOT responsible for lost data. 0 0 - 564 - 363 + 100 + 30 @@ -180,8 +180,8 @@ Authors of this application are NOT responsible for lost data. 0 0 - 558 - 337 + 167 + 219 @@ -781,6 +781,32 @@ Authors of this application are NOT responsible for lost data. + + + + Feed connection timeout + + + + + + + Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted. + + + ms + + + 1000 + + + 15000 + + + 100 + + +