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

fix export/import

Browse Source
This commit is contained in:
Martin Rotter 2021-03-09 07:10:36 +01:00
parent 6fa7c1bd03
commit 5cb6e9e791
9 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.9.0" date="2021-03-08"/> <release version="3.9.0" date="2021-03-09"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

20
resources/initial_feeds/feeds-en.opml
View File

File diff suppressed because one or more lines are too long

2
src/librssguard/core/feedsmodel.h
View File

@ -158,7 +158,7 @@ class RSSGUARD_DLLSPEC FeedsModel : public QAbstractItemModel {
inline QVariant FeedsModel::data(const QModelIndex& index, int role) const { inline QVariant FeedsModel::data(const QModelIndex& index, int role) const {
switch (role) { switch (role) {
case Qt::FontRole: case Qt::ItemDataRole::FontRole:
return itemForIndex(index)->countOfUnreadMessages() > 0 ? m_boldFont : m_normalFont; return itemForIndex(index)->countOfUnreadMessages() > 0 ? m_boldFont : m_normalFont;
default: default:

24
src/librssguard/database/mariadbdriver.cpp
View File

@ -150,7 +150,8 @@ QSqlDatabase MariaDbDriver::initializeDatabase(const QString& connection_name) {
database.setPassword(qApp->settings()->password(GROUP(Database), SETTING(Database::MySQLPassword)).toString()); database.setPassword(qApp->settings()->password(GROUP(Database), SETTING(Database::MySQLPassword)).toString());
if (!database.open()) { if (!database.open()) {
qFatal("Cannot open MySQL database: %s.", qPrintable(database.lastError().text())); qFatal("Cannot open MySQL database: %s. Make sure your DB server is running and "
"start application again.", qPrintable(database.lastError().text()));
} }
else { else {
QSqlQuery query_db(database); QSqlQuery query_db(database);
@ -187,11 +188,11 @@ QSqlDatabase MariaDbDriver::initializeDatabase(const QString& connection_name) {
if (installed_db_schema.toInt() < QString(APP_DB_SCHEMA_VERSION).toInt()) { if (installed_db_schema.toInt() < QString(APP_DB_SCHEMA_VERSION).toInt()) {
if (updateDatabaseSchema(database, installed_db_schema, database_name)) { if (updateDatabaseSchema(database, installed_db_schema, database_name)) {
qDebugNN << LOGSEC_DB qDebugNN << LOGSEC_DB
<< "Database schema was updated from '" << "Database schema was updated from"
<< installed_db_schema << QUOTE_W_SPACE(installed_db_schema)
<< "' to '" << "to"
<< APP_DB_SCHEMA_VERSION << QUOTE_W_SPACE(APP_DB_SCHEMA_VERSION)
<< "' successully or it is already up to date."; << "successully or it is already up to date.";
} }
else { else {
qFatal("Database schema was not updated from '%s' to '%s' successully.", qFatal("Database schema was not updated from '%s' to '%s' successully.",
@ -204,7 +205,6 @@ QSqlDatabase MariaDbDriver::initializeDatabase(const QString& connection_name) {
query_db.finish(); query_db.finish();
} }
// Everything is initialized now.
m_databaseInitialized = true; m_databaseInitialized = true;
return database; return database;
} }
@ -237,12 +237,10 @@ bool MariaDbDriver::updateDatabaseSchema(const QSqlDatabase& database,
// Increment the version. // Increment the version.
qDebugNN << LOGSEC_DB qDebugNN << LOGSEC_DB
<< "Updating database schema: '" << "Updating database schema "
<< working_version << QUOTE_W_SPACE(working_version)
<< "' -> '" << "->"
<< working_version + 1 << QUOTE_W_SPACE_DOT(working_version + 1);
<< "'.";
working_version++; working_version++;
} }

8
src/librssguard/miscellaneous/iconfactory.cpp
View File

@ -22,10 +22,10 @@ QIcon IconFactory::fromByteArray(QByteArray array) {
QIcon icon; QIcon icon;
QBuffer buffer(&array); QBuffer buffer(&array);
buffer.open(QIODevice::ReadOnly); buffer.open(QIODevice::OpenModeFlag::ReadOnly);
QDataStream in(&buffer); QDataStream in(&buffer);
in.setVersion(QDataStream::Qt_4_7); in.setVersion(QDataStream::Version::Qt_4_7);
in >> icon; in >> icon;
buffer.close(); buffer.close();
return icon; return icon;
@ -35,10 +35,10 @@ QByteArray IconFactory::toByteArray(const QIcon& icon) {
QByteArray array; QByteArray array;
QBuffer buffer(&array); QBuffer buffer(&array);
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::OpenModeFlag::WriteOnly);
QDataStream out(&buffer); QDataStream out(&buffer);
out.setVersion(QDataStream::Qt_4_7); out.setVersion(QDataStream::Version::Qt_4_7);
out << icon; out << icon;
buffer.close(); buffer.close();
return array.toBase64(); return array.toBase64();

4
src/librssguard/services/abstract/feed.cpp
View File

@ -2,9 +2,9 @@
#include "services/abstract/feed.h" #include "services/abstract/feed.h"
#include "database/databasequeries.h"
#include "definitions/definitions.h" #include "definitions/definitions.h"
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
#include "database/databasequeries.h"
#include "miscellaneous/feedreader.h" #include "miscellaneous/feedreader.h"
#include "miscellaneous/iconfactory.h" #include "miscellaneous/iconfactory.h"
#include "miscellaneous/mutex.h" #include "miscellaneous/mutex.h"
@ -52,7 +52,7 @@ QList<Message> Feed::undeletedMessages() const {
QVariant Feed::data(int column, int role) const { QVariant Feed::data(int column, int role) const {
switch (role) { switch (role) {
case Qt::ForegroundRole: case Qt::ItemDataRole::ForegroundRole:
switch (status()) { switch (status()) {
case Status::NewMessages: case Status::NewMessages:
return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight]; return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight];

13
src/librssguard/services/abstract/rootitem.cpp
View File

@ -122,11 +122,8 @@ int RootItem::row() const {
} }
QVariant RootItem::data(int column, int role) const { QVariant RootItem::data(int column, int role) const {
Q_UNUSED(column)
Q_UNUSED(role)
switch (role) { switch (role) {
case Qt::ToolTipRole: case Qt::ItemDataRole::ToolTipRole:
if (column == FDS_MODEL_TITLE_INDEX) { if (column == FDS_MODEL_TITLE_INDEX) {
QString tool_tip = m_title; QString tool_tip = m_title;
@ -150,7 +147,7 @@ QVariant RootItem::data(int column, int role) const {
return QVariant(); return QVariant();
} }
case Qt::EditRole: case Qt::ItemDataRole::EditRole:
if (column == FDS_MODEL_TITLE_INDEX) { if (column == FDS_MODEL_TITLE_INDEX) {
return m_title; return m_title;
} }
@ -161,7 +158,7 @@ QVariant RootItem::data(int column, int role) const {
return QVariant(); return QVariant();
} }
case Qt::DisplayRole: case Qt::ItemDataRole::DisplayRole:
if (column == FDS_MODEL_TITLE_INDEX) { if (column == FDS_MODEL_TITLE_INDEX) {
return m_title; return m_title;
} }
@ -177,7 +174,7 @@ QVariant RootItem::data(int column, int role) const {
return QVariant(); return QVariant();
} }
case Qt::DecorationRole: case Qt::ItemDataRole::DecorationRole:
if (column == FDS_MODEL_TITLE_INDEX) { if (column == FDS_MODEL_TITLE_INDEX) {
return fullIcon(); return fullIcon();
} }
@ -185,7 +182,7 @@ QVariant RootItem::data(int column, int role) const {
return QVariant(); return QVariant();
} }
case Qt::TextAlignmentRole: case Qt::ItemDataRole::TextAlignmentRole:
if (column == FDS_MODEL_COUNTS_INDEX) { if (column == FDS_MODEL_COUNTS_INDEX) {
return Qt::AlignmentFlag::AlignCenter; return Qt::AlignmentFlag::AlignCenter;
} }

16
src/librssguard/services/standard/standardfeedsimportexportmodel.cpp
View File

@ -78,7 +78,7 @@ bool FeedsImportExportModel::exportToOMPL20(QByteArray& result) {
outline_category.setAttribute(QSL("description"), child_item->description()); outline_category.setAttribute(QSL("description"), child_item->description());
if (!child_item->icon().isNull()) { if (!child_item->icon().isNull()) {
outline_category.setAttributeNS(APP_URL, QSL("rssguard:icon"), QString(qApp->icons()->toByteArray(child_item->icon()))); outline_category.setAttribute(QSL("rssguard:icon"), QString(qApp->icons()->toByteArray(child_item->icon())));
} }
active_element.appendChild(outline_category); active_element.appendChild(outline_category);
@ -98,11 +98,11 @@ bool FeedsImportExportModel::exportToOMPL20(QByteArray& result) {
outline_feed.setAttribute(QSL("encoding"), child_feed->encoding()); outline_feed.setAttribute(QSL("encoding"), child_feed->encoding());
outline_feed.setAttribute(QSL("title"), child_feed->title()); outline_feed.setAttribute(QSL("title"), child_feed->title());
outline_feed.setAttributeNS(APP_URL, QSL("rssguard:xmlUrlType"), QString::number(int(child_feed->sourceType()))); outline_feed.setAttribute(QSL("rssguard:xmlUrlType"), QString::number(int(child_feed->sourceType())));
outline_feed.setAttributeNS(APP_URL, QSL("rssguard:postProcess"), child_feed->postProcessScript()); outline_feed.setAttribute(QSL("rssguard:postProcess"), child_feed->postProcessScript());
if (!child_feed->icon().isNull()) { if (!child_feed->icon().isNull()) {
outline_feed.setAttributeNS(APP_URL, QSL("rssguard:icon"), QString(qApp->icons()->toByteArray(child_feed->icon()))); outline_feed.setAttribute(QSL("rssguard:icon"), QString(qApp->icons()->toByteArray(child_feed->icon())));
} }
switch (child_feed->type()) { switch (child_feed->type()) {
@ -215,9 +215,9 @@ void FeedsImportExportModel::importAsOPML20(const QByteArray& data, bool fetch_m
QString feed_encoding = child_element.attribute(QSL("encoding"), DEFAULT_FEED_ENCODING); QString feed_encoding = child_element.attribute(QSL("encoding"), DEFAULT_FEED_ENCODING);
QString feed_type = child_element.attribute(QSL("version"), DEFAULT_FEED_TYPE).toUpper(); QString feed_type = child_element.attribute(QSL("version"), DEFAULT_FEED_TYPE).toUpper();
QString feed_description = child_element.attribute(QSL("description")); QString feed_description = child_element.attribute(QSL("description"));
QIcon feed_icon = qApp->icons()->fromByteArray(child_element.attributeNS(APP_URL, QSL("icon")).toLocal8Bit()); QIcon feed_icon = qApp->icons()->fromByteArray(child_element.attribute(QSL("rssguard:icon")).toLocal8Bit());
QString source_type = child_element.attributeNS(APP_URL, QSL("xmlUrlType")); QString source_type = child_element.attribute(QSL("rssguard:xmlUrlType"));
QString post_process = child_element.attributeNS(APP_URL, QSL("postProcess")); QString post_process = child_element.attribute(QSL("rssguard:postProcess"));
auto* new_feed = new StandardFeed(active_model_item); auto* new_feed = new StandardFeed(active_model_item);
new_feed->setTitle(feed_title); new_feed->setTitle(feed_title);
@ -259,7 +259,7 @@ void FeedsImportExportModel::importAsOPML20(const QByteArray& data, bool fetch_m
// Add category and continue. // Add category and continue.
QString category_title = child_element.attribute(QSL("text")); QString category_title = child_element.attribute(QSL("text"));
QString category_description = child_element.attribute(QSL("description")); QString category_description = child_element.attribute(QSL("description"));
QIcon category_icon = qApp->icons()->fromByteArray(child_element.attributeNS(APP_URL, QSL("icon")).toLocal8Bit()); QIcon category_icon = qApp->icons()->fromByteArray(child_element.attribute(QSL("rssguard:icon")).toLocal8Bit());
if (category_title.isEmpty()) { if (category_title.isEmpty()) {
qWarningNN << LOGSEC_CORE qWarningNN << LOGSEC_CORE

5
src/librssguard/services/standard/standardserviceroot.cpp
View File

@ -3,12 +3,12 @@
#include "services/standard/standardserviceroot.h" #include "services/standard/standardserviceroot.h"
#include "core/feedsmodel.h" #include "core/feedsmodel.h"
#include "database/databasequeries.h"
#include "definitions/definitions.h" #include "definitions/definitions.h"
#include "exceptions/applicationexception.h" #include "exceptions/applicationexception.h"
#include "exceptions/scriptexception.h" #include "exceptions/scriptexception.h"
#include "gui/messagebox.h" #include "gui/messagebox.h"
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
#include "database/databasequeries.h"
#include "miscellaneous/iconfactory.h" #include "miscellaneous/iconfactory.h"
#include "miscellaneous/mutex.h" #include "miscellaneous/mutex.h"
#include "miscellaneous/settings.h" #include "miscellaneous/settings.h"
@ -82,6 +82,9 @@ void StandardServiceRoot::start(bool freshly_activated) {
MessageBox::show(qApp->mainFormWidget(), QMessageBox::Critical, tr("Error when loading initial feeds"), ex.message()); MessageBox::show(qApp->mainFormWidget(), QMessageBox::Critical, tr("Error when loading initial feeds"), ex.message());
} }
} }
else {
requestItemExpand({ this }, true);
}
} }
checkArgumentsForFeedAdding(); checkArgumentsForFeedAdding();