pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ttrss: fix downloading icons, now uses more proper relative URL detection

Browse source
This commit is contained in:
Martin Rotter 2023-01-24 08:04:40 +01:00
parent ebdde9646a
commit 2e76ae5b13
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/librssguard/miscellaneous/application.cpp
View file

@ -471,7 +471,6 @@ QString Application::userDataAppFolder() const {
// In "app" folder, we would like to separate all user data into own subfolder, // In "app" folder, we would like to separate all user data into own subfolder,
// therefore stick to "data" folder in this mode. // therefore stick to "data" folder in this mode.
return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("data4")); return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("data4"));
;
} }
QString Application::userDataFolder() { QString Application::userDataFolder() {

7
src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp
View file

@ -926,11 +926,10 @@ RootItem* TtRssGetFeedsCategoriesResponse::feedsCategories(TtRssNetworkFactory*
if (obtain_icons) { if (obtain_icons) {
QString icon_path = QString icon_path =
item[QSL("icon")].type() == QJsonValue::String ? item[QSL("icon")].toString() : QString(); item[QSL("icon")].type() == QJsonValue::Type::String ? item[QSL("icon")].toString() : QString();
if (!icon_path.isEmpty()) { if (!icon_path.isEmpty()) {
// Chop the "api/" suffix out and append QString full_icon_address = QUrl(base_address).resolved(icon_path).toString();
QString full_icon_address = base_address + QL1C('/') + icon_path;
QPixmap icon; QPixmap icon;
QList<QPair<QByteArray, QByteArray>> headers; QList<QPair<QByteArray, QByteArray>> headers;
@ -941,7 +940,7 @@ RootItem* TtRssGetFeedsCategoriesResponse::feedsCategories(TtRssNetworkFactory*
auto res = auto res =
NetworkFactory::downloadIcon({{full_icon_address, true}}, DOWNLOAD_TIMEOUT, icon, headers, proxy); NetworkFactory::downloadIcon({{full_icon_address, true}}, DOWNLOAD_TIMEOUT, icon, headers, proxy);
if (res == QNetworkReply::NoError) { if (res == QNetworkReply::NetworkError::NoError) {
feed->setIcon(icon); feed->setIcon(icon);
} }
else { else {