FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

save

This commit is contained in:
Martin Rotter 2021-01-15 13:46:52 +01:00
parent b2ef7e8121
commit 54d1a2b4b1
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librssguard/miscellaneous/databasequeries.cpp
View File

@ -1798,7 +1798,7 @@ bool DatabaseQueries::createOwnCloudAccount(const QSqlDatabase& db, int id_to_as
}
}
int DatabaseQueries::createAccount(const QSqlDatabase& db, const QString& code, bool* ok) {
int DatabaseQueries::createBaseAccount(const QSqlDatabase& db, const QString& code, bool* ok) {
QSqlQuery q(db);
// First obtain the ID, which can be assigned to this new account.
@ -1838,6 +1838,13 @@ int DatabaseQueries::createAccount(const QSqlDatabase& db, const QString& code,
}
}
void DatabaseQueries::editBaseAccount(const QSqlDatabase& db, ServiceRoot* account, bool* ok) {
Q_UNUSED(account)
Q_UNUSED(ok)
// TODO: edit proxy etc
}
bool DatabaseQueries::deleteFeed(const QSqlDatabase& db, int feed_custom_id, int account_id) {
QSqlQuery q(db);

3
src/librssguard/miscellaneous/databasequeries.h
View File

@ -88,7 +88,8 @@ class DatabaseQueries {
bool* ok = nullptr);
// Common account methods.
static int createAccount(const QSqlDatabase& db, const QString& code, bool* ok = nullptr);
static int createBaseAccount(const QSqlDatabase& db, const QString& code, bool* ok = nullptr);
static void editBaseAccount(const QSqlDatabase& db, ServiceRoot* account, bool* ok = nullptr);
static int updateMessages(QSqlDatabase db, const QList<Message>& messages, const QString& feed_custom_id,
int account_id, const QString& url, bool force_update, bool* any_message_changed, bool* ok = nullptr);
static bool deleteAccount(const QSqlDatabase& db, int account_id);

2
src/librssguard/services/gmail/gmailserviceroot.cpp
View File

@ -91,7 +91,7 @@ void GmailServiceRoot::saveAccountDataToDatabase() {
}
else {
bool saved;
int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
if (saved) {
if (DatabaseQueries::createGmailAccount(database, id_to_assign,

2
src/librssguard/services/inoreader/inoreaderserviceroot.cpp
View File

@ -61,7 +61,7 @@ void InoreaderServiceRoot::saveAccountDataToDatabase() {
}
else {
bool saved;
int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
if (saved) {
if (DatabaseQueries::createInoreaderAccount(database, id_to_assign,

2
src/librssguard/services/owncloud/owncloudserviceroot.cpp
View File

@ -142,7 +142,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
}
else {
bool saved;
int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
if (saved) {
if (DatabaseQueries::createOwnCloudAccount(database, id_to_assign, m_network->authUsername(),

2
src/librssguard/services/standard/standardserviceentrypoint.cpp
View File

@ -31,7 +31,7 @@ ServiceRoot* StandardServiceEntryPoint::createNewRoot() const {
// Switch DB.
QSqlDatabase database = qApp->database()->connection(QSL("StandardServiceEntryPoint"));
bool ok;
int new_id = DatabaseQueries::createAccount(database, code(), &ok);
int new_id = DatabaseQueries::createBaseAccount(database, code(), &ok);
if (ok) {
auto* root = new StandardServiceRoot();

2
src/librssguard/services/tt-rss/ttrssserviceroot.cpp
View File

@ -227,7 +227,7 @@ void TtRssServiceRoot::saveAccountDataToDatabase() {
}
else {
bool saved;
int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
if (saved) {
if (DatabaseQueries::createTtRssAccount(database, id_to_assign, m_network->username(),