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

fix #1278

Browse Source
This commit is contained in:
Martin Rotter 2024-01-22 14:27:09 +01:00
parent cff455af12
commit 2d7907c22f
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librssguard/database/databasequeries.cpp
View File

@ -1863,7 +1863,8 @@ UpdatedArticles DatabaseQueries::updateMessages(const QSqlDatabase& db,
.replace(QSL(":author"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_author))) .replace(QSL(":author"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_author)))
.replace(QSL(":date_created"), QString::number(msg->m_created.toMSecsSinceEpoch())) .replace(QSL(":date_created"), QString::number(msg->m_created.toMSecsSinceEpoch()))
.replace(QSL(":contents"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_contents))) .replace(QSL(":contents"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_contents)))
.replace(QSL(":enclosures"), Enclosures::encodeEnclosuresToString(msg->m_enclosures)) .replace(QSL(":enclosures"),
DatabaseFactory::escapeQuery(Enclosures::encodeEnclosuresToString(msg->m_enclosures)))
.replace(QSL(":custom_id"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_customId))) .replace(QSL(":custom_id"), DatabaseFactory::escapeQuery(unnulifyString(msg->m_customId)))
.replace(QSL(":custom_hash"), unnulifyString(msg->m_customHash)) .replace(QSL(":custom_hash"), unnulifyString(msg->m_customHash))
.replace(QSL(":score"), QString::number(msg->m_score)) .replace(QSL(":score"), QString::number(msg->m_score))

14
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -259,6 +259,17 @@ void TextBrowserViewer::loadMessages(const QList<Message>& messages, RootItem* r
html_messages.m_html = html_messages.m_html.replace(exp_symbols, QString()); html_messages.m_html = html_messages.m_html.replace(exp_symbols, QString());
/*
// Replace base64 images.
QRegularExpression exp_base64("src=\"data: ?image\\/[^;]+;base64,([^\"]+)\"");
QRegularExpressionMatch exp_base64_match;
while ((exp_base64_match = exp_base64.match(html_messages.m_html)).hasMatch()) {
QString base64_img = exp_base64_match.captured(1);
QByteArray data_img = QByteArray::fromBase64Encoding(base64_img);
}
*/
#if !defined(NDEBUG) #if !defined(NDEBUG)
// IOFactory::writeFile("aaa.html", html_messages.m_html.toUtf8()); // IOFactory::writeFile("aaa.html", html_messages.m_html.toUtf8());
#endif #endif
@ -537,7 +548,8 @@ void TextBrowserViewer::resourceDownloaded(const QUrl& url,
downloadNextNeededResource(); downloadNextNeededResource();
} }
PreparedHtml TextBrowserViewer::prepareLegacyHtmlForMessage(const QList<Message>& messages, RootItem* selected_item) const { PreparedHtml TextBrowserViewer::prepareLegacyHtmlForMessage(const QList<Message>& messages,
RootItem* selected_item) const {
PreparedHtml html; PreparedHtml html;
bool acc_displays_enclosures = bool acc_displays_enclosures =
selected_item == nullptr || selected_item->getParentServiceRoot()->displaysEnclosures(); selected_item == nullptr || selected_item->getParentServiceRoot()->displaysEnclosures();

4
src/librssguard/miscellaneous/application.cpp
View File

@ -44,7 +44,7 @@
#include <QThreadPool> #include <QThreadPool>
#include <QTimer> #include <QTimer>
#if defined(MEDIAPLAYER_LIBMPV_OPENGL) #if defined(NO_LITE) && defined(MEDIAPLAYER_LIBMPV_OPENGL)
#include <QQuickWindow> #include <QQuickWindow>
#endif #endif
@ -84,7 +84,7 @@
Application::Application(const QString& id, int& argc, char** argv, const QStringList& raw_cli_args) Application::Application(const QString& id, int& argc, char** argv, const QStringList& raw_cli_args)
: SingleApplication(id, argc, argv), m_rawCliArgs(raw_cli_args), m_updateFeedsLock(new Mutex()) { : SingleApplication(id, argc, argv), m_rawCliArgs(raw_cli_args), m_updateFeedsLock(new Mutex()) {
#if defined(MEDIAPLAYER_LIBMPV_OPENGL) #if defined(NO_LITE) && defined(MEDIAPLAYER_LIBMPV_OPENGL)
// HACK: Force rendering system to use OpenGL backend. // HACK: Force rendering system to use OpenGL backend.
#if QT_VERSION_MAJOR < 6 #if QT_VERSION_MAJOR < 6
QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsApi::OpenGL); QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsApi::OpenGL);