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

Removed some redundant code.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-20 07:30:11 +02:00
parent d51a9e87ea
commit 738929e280
14 changed files with 137 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rssguard.pro
View File

@ -298,7 +298,6 @@ HEADERS += src/core/feeddownloader.h \
src/services/owncloud/network/owncloudnetworkfactory.h \
src/services/owncloud/owncloudcategory.h \
src/services/owncloud/owncloudfeed.h \
src/services/owncloud/owncloudrecyclebin.h \
src/services/owncloud/owncloudserviceentrypoint.h \
src/services/owncloud/owncloudserviceroot.h \
src/services/standard/gui/formstandardcategorydetails.h \
@ -314,7 +313,6 @@ HEADERS += src/core/feeddownloader.h \
src/services/tt-rss/network/ttrssnetworkfactory.h \
src/services/tt-rss/ttrsscategory.h \
src/services/tt-rss/ttrssfeed.h \
src/services/tt-rss/ttrssrecyclebin.h \
src/services/tt-rss/ttrssserviceentrypoint.h \
src/services/tt-rss/ttrssserviceroot.h \
src/gui/settings/settingspanel.h \
@ -339,7 +337,9 @@ HEADERS += src/core/feeddownloader.h \
src/gui/treeviewcolumnsmenu.h \
src/services/abstract/labelsrootitem.h \
src/services/abstract/label.h \
src/miscellaneous/externaltool.h
src/miscellaneous/externaltool.h \
src/services/inoreader/definitions.h \
src/services/inoreader/inoreaderentrypoint.h
SOURCES += src/core/feeddownloader.cpp \
src/core/feedsmodel.cpp \
@ -425,7 +425,6 @@ SOURCES += src/core/feeddownloader.cpp \
src/services/owncloud/network/owncloudnetworkfactory.cpp \
src/services/owncloud/owncloudcategory.cpp \
src/services/owncloud/owncloudfeed.cpp \
src/services/owncloud/owncloudrecyclebin.cpp \
src/services/owncloud/owncloudserviceentrypoint.cpp \
src/services/owncloud/owncloudserviceroot.cpp \
src/services/standard/gui/formstandardcategorydetails.cpp \
@ -440,7 +439,6 @@ SOURCES += src/core/feeddownloader.cpp \
src/services/tt-rss/network/ttrssnetworkfactory.cpp \
src/services/tt-rss/ttrsscategory.cpp \
src/services/tt-rss/ttrssfeed.cpp \
src/services/tt-rss/ttrssrecyclebin.cpp \
src/services/tt-rss/ttrssserviceentrypoint.cpp \
src/services/tt-rss/ttrssserviceroot.cpp \
src/gui/settings/settingspanel.cpp \
@ -465,7 +463,8 @@ SOURCES += src/core/feeddownloader.cpp \
src/gui/treeviewcolumnsmenu.cpp \
src/services/abstract/labelsrootitem.cpp \
src/services/abstract/label.cpp \
src/miscellaneous/externaltool.cpp
src/miscellaneous/externaltool.cpp \
src/services/inoreader/inoreaderentrypoint.cpp
OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm

7
src/definitions/definitions.h
View File

@ -21,9 +21,10 @@
#include <QtGlobal>
#define SERVICE_CODE_STD_RSS "std-rss"
#define SERVICE_CODE_TT_RSS "tt-rss"
#define SERVICE_CODE_OWNCLOUD "owncloud"
#define SERVICE_CODE_STD_RSS "std-rss"
#define SERVICE_CODE_TT_RSS "tt-rss"
#define SERVICE_CODE_OWNCLOUD "owncloud"
#define SERVICE_CODE_INOREADER "inoreader"
#define ARGUMENTS_LIST_SEPARATOR "\n"

2
src/gui/dialogs/formaddaccount.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>685</width>
<height>271</height>
<height>300</height>
</rect>
</property>
<property name="windowTitle">

5
src/miscellaneous/feedreader.cpp
View File

@ -19,6 +19,7 @@
#include "miscellaneous/feedreader.h"
#include "services/abstract/serviceroot.h"
#include "services/inoreader/inoreaderentrypoint.h"
#include "services/owncloud/owncloudserviceentrypoint.h"
#include "services/standard/standardserviceentrypoint.h"
#include "services/tt-rss/ttrssserviceentrypoint.h"
@ -45,6 +46,7 @@ FeedReader::FeedReader(QObject* parent)
m_feedsProxyModel = new FeedsProxyModel(m_feedsModel, this);
m_messagesModel = new MessagesModel(this);
m_messagesProxyModel = new MessagesProxyModel(m_messagesModel, this);
connect(m_autoUpdateTimer, &QTimer::timeout, this, &FeedReader::executeNextAutoUpdate);
updateAutoUpdateStatus();
asyncCacheSaveFinished();
@ -63,9 +65,10 @@ FeedReader::~FeedReader() {
QList<ServiceEntryPoint*> FeedReader::feedServices() {
if (m_feedServices.isEmpty()) {
// NOTE: All installed services create their entry points here.
m_feedServices.append(new InoreaderEntryPoint());
m_feedServices.append(new OwnCloudServiceEntryPoint());
m_feedServices.append(new StandardServiceEntryPoint());
m_feedServices.append(new TtRssServiceEntryPoint());
m_feedServices.append(new OwnCloudServiceEntryPoint());
}
return m_feedServices;

28
src/services/abstract/feed.cpp
View File

@ -48,12 +48,38 @@ QVariant Feed::data(int column, int role) const {
switch (role) {
case Qt::ToolTipRole:
if (column == FDS_MODEL_TITLE_INDEX) {
QString auto_update_string;
switch (autoUpdateType()) {
case DontAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("does not use auto-update");
break;
case DefaultAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("uses global settings");
break;
case SpecificAutoUpdate:
default:
//: Describes feed auto-update status.
auto_update_string = tr("uses specific settings "
"(%n minute(s) to next auto-update)",
0,
autoUpdateRemainingInterval());
break;
}
//: Tooltip for feed.
return tr("%1"
"%2\n\n"
"Auto-update status: %3").arg(title(),
description().isEmpty() ? QString() : QString('\n') + description(),
getAutoUpdateStatusDescription());
auto_update_string);
}
else {
return RootItem::data(column, role);

6
src/services/abstract/recyclebin.cpp
View File

@ -22,6 +22,7 @@
#include "miscellaneous/databasequeries.h"
#include "miscellaneous/iconfactory.h"
#include "miscellaneous/textfactory.h"
#include "services/abstract/cacheforserviceroot.h"
#include "services/abstract/serviceroot.h"
#include <QThread>
@ -97,6 +98,11 @@ QList<Message> RecycleBin::undeletedMessages() const {
bool RecycleBin::markAsReadUnread(RootItem::ReadStatus status) {
QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
ServiceRoot* parent_root = getParentServiceRoot();
CacheForServiceRoot* cache = dynamic_cast<CacheForServiceRoot*>(parent_root);
if (cache != nullptr) {
cache->addMessageStatesToCache(parent_root->customIDSOfMessagesForItem(this), status);
}
if (DatabaseQueries::markBinReadUnread(database, parent_root->accountId(), status)) {
updateCounts(false);

22
src/services/tt-rss/ttrssrecyclebin.h → src/services/inoreader/definitions.h
View File

@ -16,23 +16,9 @@
// You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#ifndef TTRSSRECYCLEBIN_H
#define TTRSSRECYCLEBIN_H
#ifndef INOREADER_DEFINITIONS_H
#define INOREADER_DEFINITIONS_H
#include "services/abstract/recyclebin.h"
#define INOREADER_API_VERSION "0"
class TtRssServiceRoot;
class TtRssRecycleBin : public RecycleBin {
Q_OBJECT
public:
explicit TtRssRecycleBin(RootItem* parent = nullptr);
virtual ~TtRssRecycleBin();
TtRssServiceRoot* serviceRoot();
bool markAsReadUnread(ReadStatus status);
};
#endif // TTRSSRECYCLEBIN_H
#endif // INOREADER_DEFINITIONS_H

65
src/services/inoreader/inoreaderentrypoint.cpp Executable file
View File

@ -0,0 +1,65 @@
// This file is part of RSS Guard.
//
// Copyright (C) 2011-2017 by Martin Rotter <rotter.martinos@gmail.com>
//
// RSS Guard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// RSS Guard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "services/inoreader/inoreaderentrypoint.h"
#include "definitions/definitions.h"
#include "miscellaneous/application.h"
#include "miscellaneous/databasequeries.h"
#include "miscellaneous/iconfactory.h"
#include "services/inoreader/definitions.h"
InoreaderEntryPoint::InoreaderEntryPoint() {}
InoreaderEntryPoint::~InoreaderEntryPoint() {}
ServiceRoot* InoreaderEntryPoint::createNewRoot() const {
return nullptr;
}
QList<ServiceRoot*> InoreaderEntryPoint::initializeSubtree() const {
return QList<ServiceRoot*>();
}
bool InoreaderEntryPoint::isSingleInstanceService() const {
return false;
}
QString InoreaderEntryPoint::name() const {
return QSL("Inoreader");
}
QString InoreaderEntryPoint::code() const {
return SERVICE_CODE_INOREADER;
}
QString InoreaderEntryPoint::description() const {
return QObject::tr("This is integration of Inoreader. This plugin implements API, version %1.").arg(INOREADER_API_VERSION);
}
QString InoreaderEntryPoint::version() const {
return APP_VERSION;
}
QString InoreaderEntryPoint::author() const {
return APP_AUTHOR;
}
QIcon InoreaderEntryPoint::icon() const {
return qApp->icons()->miscIcon(QSL("inoreader"));
}

29
src/services/owncloud/owncloudrecyclebin.h → src/services/inoreader/inoreaderentrypoint.h
View File

@ -16,23 +16,26 @@
// You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#ifndef OWNCLOUDRECYCLEBIN_H
#define OWNCLOUDRECYCLEBIN_H
#ifndef INOREADERENTRYPOINT_H
#define INOREADERENTRYPOINT_H
#include "services/abstract/recyclebin.h"
class OwnCloudServiceRoot;
class OwnCloudRecycleBin : public RecycleBin {
Q_OBJECT
#include "services/abstract/serviceentrypoint.h"
class InoreaderEntryPoint : public ServiceEntryPoint {
public:
explicit OwnCloudRecycleBin(RootItem* parent = nullptr);
virtual ~OwnCloudRecycleBin();
explicit InoreaderEntryPoint();
virtual ~InoreaderEntryPoint();
OwnCloudServiceRoot* serviceRoot();
ServiceRoot* createNewRoot() const;
bool markAsReadUnread(ReadStatus status);
QList<ServiceRoot*> initializeSubtree() const;
bool isSingleInstanceService() const;
QString name() const;
QString code() const;
QString description() const;
QString version() const;
QString author() const;
QIcon icon() const;
};
#endif // OWNCLOUDRECYCLEBIN_H
#endif // INOREADERENTRYPOINT_H

38
src/services/owncloud/owncloudrecyclebin.cpp
View File

@ -1,38 +0,0 @@
// This file is part of RSS Guard.
//
// Copyright (C) 2011-2017 by Martin Rotter <rotter.martinos@gmail.com>
//
// RSS Guard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// RSS Guard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "services/owncloud/owncloudrecyclebin.h"
#include "services/abstract/cacheforserviceroot.h"
#include "services/owncloud/network/owncloudnetworkfactory.h"
#include "services/owncloud/owncloudserviceroot.h"
#include <QNetworkReply>
OwnCloudRecycleBin::OwnCloudRecycleBin(RootItem* parent) : RecycleBin(parent) {}
OwnCloudRecycleBin::~OwnCloudRecycleBin() {}
OwnCloudServiceRoot* OwnCloudRecycleBin::serviceRoot() {
return qobject_cast<OwnCloudServiceRoot*>(getParentServiceRoot());
}
bool OwnCloudRecycleBin::markAsReadUnread(RootItem::ReadStatus status) {
serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
return RecycleBin::markAsReadUnread(status);
}

9
src/services/owncloud/owncloudserviceentrypoint.cpp
View File

@ -31,8 +31,9 @@ OwnCloudServiceEntryPoint::OwnCloudServiceEntryPoint() {}
OwnCloudServiceEntryPoint::~OwnCloudServiceEntryPoint() {}
ServiceRoot* OwnCloudServiceEntryPoint::createNewRoot() const {
QScopedPointer<FormEditOwnCloudAccount> form_acc(new FormEditOwnCloudAccount(qApp->mainFormWidget()));
return form_acc->execForCreate();
FormEditOwnCloudAccount form_acc(qApp->mainFormWidget());
return form_acc.execForCreate();
}
QList<ServiceRoot*> OwnCloudServiceEntryPoint::initializeSubtree() const {
@ -54,8 +55,8 @@ QString OwnCloudServiceEntryPoint::code() const {
}
QString OwnCloudServiceEntryPoint::description() const {
return QObject::tr("The News app is an RSS/Atom feed aggregator. It is part of Nextcloud suite. This plugin implements %1 API.").arg(
API_VERSION);
return QObject::tr("The News app is an RSS/Atom feed aggregator. It is part of Nextcloud suite. This plugin implements %1 API.")
.arg(API_VERSION);
}
QString OwnCloudServiceEntryPoint::version() const {

46
src/services/tt-rss/ttrssfeed.cpp
View File

@ -50,52 +50,6 @@ TtRssServiceRoot* TtRssFeed::serviceRoot() const {
return qobject_cast<TtRssServiceRoot*>(getParentServiceRoot());
}
QVariant TtRssFeed::data(int column, int role) const {
switch (role) {
case Qt::ToolTipRole:
if (column == FDS_MODEL_TITLE_INDEX) {
QString auto_update_string;
switch (autoUpdateType()) {
case DontAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("does not use auto-update");
break;
case DefaultAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("uses global settings");
break;
case SpecificAutoUpdate:
default:
//: Describes feed auto-update status.
auto_update_string = tr("uses specific settings "
"(%n minute(s) to next auto-update)",
0,
autoUpdateRemainingInterval());
break;
}
//: Tooltip for feed.
return tr("%1"
"%2\n\n"
"Auto-update status: %3").arg(title(),
description().isEmpty() ? QString() : QString('\n') + description(),
auto_update_string);
}
else {
return Feed::data(column, role);
}
default:
return Feed::data(column, role);
}
}
bool TtRssFeed::canBeEdited() const {
return true;
}

1
src/services/tt-rss/ttrssfeed.h
View File

@ -35,7 +35,6 @@ class TtRssFeed : public Feed {
TtRssServiceRoot* serviceRoot() const;
QVariant data(int column, int role) const;
bool canBeEdited() const;
bool editViaGui();
bool canBeDeleted() const;

36
src/services/tt-rss/ttrssrecyclebin.cpp
View File

@ -1,36 +0,0 @@
// This file is part of RSS Guard.
//
// Copyright (C) 2011-2017 by Martin Rotter <rotter.martinos@gmail.com>
//
// RSS Guard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// RSS Guard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "services/tt-rss/ttrssrecyclebin.h"
#include "services/tt-rss/definitions.h"
#include "services/tt-rss/network/ttrssnetworkfactory.h"
#include "services/tt-rss/ttrssserviceroot.h"
TtRssRecycleBin::TtRssRecycleBin(RootItem* parent) : RecycleBin(parent) {}
TtRssRecycleBin::~TtRssRecycleBin() {}
TtRssServiceRoot* TtRssRecycleBin::serviceRoot() {
return qobject_cast<TtRssServiceRoot*>(getParentServiceRoot());
}
bool TtRssRecycleBin::markAsReadUnread(RootItem::ReadStatus status) {
serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
return RecycleBin::markAsReadUnread(status);
}