FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No needed suffix.

Browse Source
This commit is contained in:
Martin Rotter 2016-09-15 07:36:14 +02:00
parent a07b458a2b
commit b46dce2e49
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/text/CHANGELOG
View File

@ -1,6 +1,9 @@
3.3.6 3.3.6
————— —————
Changed:
▪ TT-RSS plugin now does NOT require service URL to be entered with "/api/" suffix. In other words, do not use that suffix now, RSS Guard will add it silently when it needs to.
Fixed: Fixed:
▪ Fixed problem with strings in core being rendered untranslated. (bug #60) ▪ Fixed problem with strings in core being rendered untranslated. (bug #60)

6
src/services/tt-rss/gui/formeditaccount.cpp
View File

@ -40,7 +40,7 @@ FormEditAccount::FormEditAccount(QWidget *parent)
m_ui->m_txtHttpPassword->lineEdit()->setPlaceholderText(tr("HTTP authentication password")); m_ui->m_txtHttpPassword->lineEdit()->setPlaceholderText(tr("HTTP authentication password"));
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account")); m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account"));
m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your TT-RSS account")); m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your TT-RSS account"));
m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("FULL URL of your TT-RSS instance WITH trailing \"/api/\" string")); m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your TT-RSS instance WITHOUT trailing \"/api/\" string"));
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information, m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
tr("No test done yet."), tr("No test done yet."),
tr("Here, results of connection test are shown.")); tr("Here, results of connection test are shown."));
@ -254,8 +254,8 @@ void FormEditAccount::onUrlChanged() {
if (url.isEmpty()) { if (url.isEmpty()) {
m_ui->m_txtUrl->setStatus(WidgetWithStatus::Error, tr("URL cannot be empty.")); m_ui->m_txtUrl->setStatus(WidgetWithStatus::Error, tr("URL cannot be empty."));
} }
else if (!url.endsWith(QL1S("/api/"))) { else if (url.endsWith(QL1S("/api/")) || url.endsWith(QL1S("/api"))) {
m_ui->m_txtUrl->setStatus(WidgetWithStatus::Warning, tr("URL should end with \"/api/\".")); m_ui->m_txtUrl->setStatus(WidgetWithStatus::Warning, tr("URL should NOT end with \"/api/\"."));
} }
else { else {
m_ui->m_txtUrl->setStatus(WidgetWithStatus::Ok, tr("URL is okay.")); m_ui->m_txtUrl->setStatus(WidgetWithStatus::Ok, tr("URL is okay."));

41
src/services/tt-rss/network/ttrssnetworkfactory.cpp
View File

@ -34,7 +34,7 @@
TtRssNetworkFactory::TtRssNetworkFactory() TtRssNetworkFactory::TtRssNetworkFactory()
: m_url(QString()), m_username(QString()), m_password(QString()), m_forceServerSideUpdate(false), m_authIsUsed(false), : m_bareUrl(QString()), m_fullUrl(QString()), m_username(QString()), m_password(QString()), m_forceServerSideUpdate(false), m_authIsUsed(false),
m_authUsername(QString()), m_authPassword(QString()), m_sessionId(QString()), m_authUsername(QString()), m_authPassword(QString()), m_sessionId(QString()),
m_lastLoginTime(QDateTime()), m_lastError(QNetworkReply::NoError) { m_lastLoginTime(QDateTime()), m_lastError(QNetworkReply::NoError) {
} }
@ -43,11 +43,22 @@ TtRssNetworkFactory::~TtRssNetworkFactory() {
} }
QString TtRssNetworkFactory::url() const { QString TtRssNetworkFactory::url() const {
return m_url; return m_bareUrl;
} }
void TtRssNetworkFactory::setUrl(const QString &url) { void TtRssNetworkFactory::setUrl(const QString &url) {
m_url = url; m_bareUrl = url;
if (!m_bareUrl.endsWith(QSL("/"))) {
m_bareUrl = m_bareUrl + QSL("/");
}
if (!m_bareUrl.endsWith(QSL("api/"))) {
m_fullUrl = m_bareUrl + QSL("api/");
}
else {
m_fullUrl = m_bareUrl;
}
} }
QString TtRssNetworkFactory::username() const { QString TtRssNetworkFactory::username() const {
@ -87,7 +98,7 @@ TtRssLoginResponse TtRssNetworkFactory::login() {
json["password"] = m_password; json["password"] = m_password;
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, qApp->settings()->value(GROUP(Feeds),
SETTING(Feeds::UpdateTimeout)).toInt(), SETTING(Feeds::UpdateTimeout)).toInt(),
QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
@ -114,7 +125,7 @@ TtRssResponse TtRssNetworkFactory::logout() {
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, qApp->settings()->value(GROUP(Feeds),
SETTING(Feeds::UpdateTimeout)).toInt(), SETTING(Feeds::UpdateTimeout)).toInt(),
QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
@ -147,7 +158,7 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() {
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -158,7 +169,7 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() {
login(); login();
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
result = TtRssGetFeedsCategoriesResponse(QString::fromUtf8(result_raw)); result = TtRssGetFeedsCategoriesResponse(QString::fromUtf8(result_raw));
@ -188,7 +199,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -199,7 +210,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim
login(); login();
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
result = TtRssGetHeadlinesResponse(QString::fromUtf8(result_raw)); result = TtRssGetHeadlinesResponse(QString::fromUtf8(result_raw));
@ -227,7 +238,7 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -238,7 +249,7 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList
login(); login();
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -269,7 +280,7 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -280,7 +291,7 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString
login(); login();
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE, result_raw, CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
@ -303,7 +314,7 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id) {
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
TtRssUnsubscribeFeedResponse result(QString::fromUtf8(result_raw)); TtRssUnsubscribeFeedResponse result(QString::fromUtf8(result_raw));
@ -313,7 +324,7 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id) {
login(); login();
json["sid"] = m_sessionId; json["sid"] = m_sessionId;
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
m_authIsUsed, m_authUsername, m_authPassword); m_authIsUsed, m_authUsername, m_authPassword);
result = TtRssUnsubscribeFeedResponse(QString::fromUtf8(result_raw)); result = TtRssUnsubscribeFeedResponse(QString::fromUtf8(result_raw));

3
src/services/tt-rss/network/ttrssnetworkfactory.h
View File

@ -171,7 +171,8 @@ class TtRssNetworkFactory {
//TtRssGetConfigResponse getConfig(); //TtRssGetConfigResponse getConfig();
private: private:
QString m_url; QString m_bareUrl;
QString m_fullUrl;
QString m_username; QString m_username;
QString m_password; QString m_password;
bool m_forceServerSideUpdate; bool m_forceServerSideUpdate;