FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-02-06 20:33:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work on batch size - load from network class.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-12 12:49:39 +02:00
parent 855d4cc796
commit 25719af9cc
6 changed files with 112 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/services/owncloud/gui/formeditowncloudaccount.cpp
View File

@ -22,15 +22,17 @@
#include "services/owncloud/network/owncloudnetworkfactory.h"
#include "miscellaneous/iconfactory.h"
#include "network-web/networkfactory.h"
#include "gui/guiutilities.h"
FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
: QDialog(parent), m_ui(new Ui::FormEditOwnCloudAccount), m_editableRoot(nullptr) {
m_ui->setupUi(this);
m_btnOk = m_ui->m_buttonBox->button(QDialogButtonBox::Ok);
setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
setWindowIcon(qApp->icons()->fromTheme(QSL("owncloud")));
m_ui->m_lblTestResult->label()->setWordWrap(true);
GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("owncloud")));
m_ui->m_lblTestResult->label()->setWordWrap(true);
m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
"of feeds will be probably much slower and may time-out often."));
m_ui->m_lblDescription->setText(tr("Note that at least version %1 is required.").arg(MINIMAL_OC_VERSION));
@ -40,13 +42,32 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
tr("No test done yet."),
tr("Here, results of connection test are shown."));
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_txtUsername->lineEdit());
m_ui->m_lblLimitMessages->setText(
tr("Limiting number of downloaded messages per feed makes updating of feeds faster but if your feed contains "
"bigger number of messages than specified limit, then some messages might not be downloaded during feed update."));
connect(m_ui->m_spinLimitMessages, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [ = ](int value) {
if (value <= 0) {
m_ui->m_spinLimitMessages->setSuffix(QSL(" ") + tr("= unlimited"));
}
else {
m_ui->m_spinLimitMessages->setSuffix(QSL(" ") + tr("messages"));
}
});
GuiUtilities::setLabelAsNotice(*m_ui->m_lblLimitMessages, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblServerSideUpdateInformation, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblDescription, false);
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_spinLimitMessages);
setTabOrder(m_ui->m_spinLimitMessages, m_ui->m_txtUsername->lineEdit());
setTabOrder(m_ui->m_txtUsername->lineEdit(), m_ui->m_txtPassword->lineEdit());
setTabOrder(m_ui->m_txtPassword->lineEdit(), m_ui->m_checkShowPassword);
setTabOrder(m_ui->m_checkShowPassword, m_ui->m_btnTestSetup);
setTabOrder(m_ui->m_btnTestSetup, m_ui->m_buttonBox);
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditOwnCloudAccount::displayPassword);
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditOwnCloudAccount::displayPassword);
connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditOwnCloudAccount::onClickedOk);
connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditOwnCloudAccount::onClickedCancel);
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::onPasswordChanged);
@ -56,7 +77,8 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::checkOkButton);
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::checkOkButton);
connect(m_ui->m_btnTestSetup, &QPushButton::clicked, this, &FormEditOwnCloudAccount::performTest);
onPasswordChanged();
onPasswordChanged();
onUsernameChanged();
onUrlChanged();
checkOkButton();
@ -88,10 +110,12 @@ void FormEditOwnCloudAccount::displayPassword(bool display) {
void FormEditOwnCloudAccount::performTest() {
OwnCloudNetworkFactory factory;
factory.setAuthUsername(m_ui->m_txtUsername->lineEdit()->text());
factory.setAuthPassword(m_ui->m_txtPassword->lineEdit()->text());
factory.setUrl(m_ui->m_txtUrl->lineEdit()->text());
factory.setForceServerSideUpdate(m_ui->m_checkServerSideUpdate->isChecked());
OwnCloudStatusResponse result = factory.status();
if (result.isLoaded()) {

49
src/services/owncloud/gui/formeditowncloudaccount.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
<height>334</height>
<width>602</width>
<height>391</height>
</rect>
</property>
<property name="windowTitle">
@ -60,7 +60,7 @@
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="m_gbAuthentication">
<property name="toolTip">
<string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>
@ -111,14 +111,14 @@
</layout>
</widget>
</item>
<item row="5" column="0">
<item row="7" column="0">
<widget class="QPushButton" name="m_btnTestSetup">
<property name="text">
<string>&amp;Test setup</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="7" column="1">
<widget class="LabelWithStatus" name="m_lblTestResult" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -131,6 +131,45 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Limit number of downloaded messages per feed</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="m_spinLimitMessages">
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="suffix">
<string> = unlimited</string>
</property>
<property name="minimum">
<number>-1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>-1</number>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="m_lblLimitMessages">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>

16
src/services/owncloud/network/owncloudnetworkfactory.cpp
View File

@ -34,7 +34,7 @@
OwnCloudNetworkFactory::OwnCloudNetworkFactory()
: m_url(QString()), m_fixedUrl(QString()), m_forceServerSideUpdate(false),
m_authUsername(QString()), m_authPassword(QString()), m_urlUser(QString()), m_urlStatus(QString()),
m_authUsername(QString()), m_authPassword(QString()), m_batchSize(-1), m_urlUser(QString()), m_urlStatus(QString()),
m_urlFolders(QString()), m_urlFeeds(QString()), m_urlMessages(QString()), m_urlFeedsUpdate(QString()),
m_urlDeleteFeed(QString()), m_urlRenameFeed(QString()), m_userId(QString()) {
}
@ -247,7 +247,7 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id) {
}
QString final_url = m_urlMessages.arg(QString::number(feed_id),
QString::number(-1),
QString::number(batchSize()),
QString::number(0));
QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url,
@ -375,12 +375,20 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::markMessagesStarred(RootItem
return (m_lastError = network_reply.first);
}
int OwnCloudNetworkFactory::batchSize() const {
return m_batchSize;
}
void OwnCloudNetworkFactory::setBatchSize(int batch_size) {
m_batchSize = batch_size;
}
QString OwnCloudNetworkFactory::userId() const {
return m_userId;
return m_userId;
}
void OwnCloudNetworkFactory::setUserId(const QString& userId) {
m_userId = userId;
m_userId = userId;
}
OwnCloudResponse::OwnCloudResponse(const QString& raw_content) {

13
src/services/owncloud/network/owncloudnetworkfactory.h
View File

@ -134,13 +134,18 @@ class OwnCloudNetworkFactory {
QNetworkReply::NetworkError markMessagesStarred(RootItem::Importance importance, const QStringList& feed_ids,
const QStringList& guid_hashes);
private:
QString m_url;
QString m_fixedUrl;
bool m_forceServerSideUpdate;
// Gets/sets the amount of messages to obtain during single feed update.
int batchSize() const;
void setBatchSize(int batch_size);
private:
QString m_url;
QString m_fixedUrl;
bool m_forceServerSideUpdate;
QString m_authUsername;
QString m_authPassword;
QNetworkReply::NetworkError m_lastError;
int m_batchSize;
// Endpoints.
QString m_urlUser;

20
src/services/tt-rss/gui/formeditttrssaccount.cpp
View File

@ -23,15 +23,17 @@
#include "services/tt-rss/network/ttrssnetworkfactory.h"
#include "miscellaneous/iconfactory.h"
#include "network-web/networkfactory.h"
#include "gui/guiutilities.h"
FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent)
: QDialog(parent), m_ui(new Ui::FormEditTtRssAccount), m_editableRoot(nullptr) {
m_ui->setupUi(this);
m_btnOk = m_ui->m_buttonBox->button(QDialogButtonBox::Ok);
setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
setWindowIcon(qApp->icons()->fromTheme(QSL("tinytinyrss")));
m_ui->m_lblTestResult->label()->setWordWrap(true);
GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("tinytinyrss")));
m_ui->m_lblTestResult->label()->setWordWrap(true);
m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
"of feeds will be probably much slower and may time-out often."));
m_ui->m_lblDescription->setText(tr("Note that at least API level %1 is required.").arg(MINIMAL_API_LEVEL));
@ -43,7 +45,11 @@ FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent)
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
tr("No test done yet."),
tr("Here, results of connection test are shown."));
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblDescription, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblServerSideUpdateInformation, false);
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_txtUsername->lineEdit());
setTabOrder(m_ui->m_txtUsername->lineEdit(), m_ui->m_txtPassword->lineEdit());
setTabOrder(m_ui->m_txtPassword->lineEdit(), m_ui->m_checkShowPassword);
@ -53,7 +59,8 @@ FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent)
setTabOrder(m_ui->m_txtHttpPassword->lineEdit(), m_ui->m_checkShowHttpPassword);
setTabOrder(m_ui->m_checkShowHttpPassword, m_ui->m_btnTestSetup);
setTabOrder(m_ui->m_btnTestSetup, m_ui->m_buttonBox);
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditTtRssAccount::displayPassword);
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditTtRssAccount::displayPassword);
connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditTtRssAccount::onClickedOk);
connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditTtRssAccount::onClickedCancel);
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onPasswordChanged);
@ -68,7 +75,8 @@ FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent)
connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditTtRssAccount::onHttpPasswordChanged);
connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditTtRssAccount::onHttpUsernameChanged);
connect(m_ui->m_checkShowHttpPassword, &QCheckBox::toggled, this, &FormEditTtRssAccount::displayHttpPassword);
onPasswordChanged();
onPasswordChanged();
onUsernameChanged();
onUrlChanged();
onHttpPasswordChanged();

4
src/services/tt-rss/gui/formeditttrssaccount.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
<height>444</height>
<width>604</width>
<height>490</height>
</rect>
</property>
<property name="windowTitle">