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

move parsers to folder

Browse source
This commit is contained in:
Martin Rotter 2022-02-05 09:29:32 +01:00
parent b55792a57a
commit 3052b45726
14 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -30,7 +30,8 @@
# - supports Windows, Linux, *BSD, macOS, OS/2, Android,
# - Qt 5.9.0 or newer is required,
# - cmake 3.9.0 or newer is required,
# - if you wish to make packages for Windows, then you must initialize all submodules within repository before compilation,
# - if you wish to make packages for Windows, then you must initialize all submodules
# within repository before compilation,
# - C++ 11/17 is required.
#
# Building on OS/2:

20
src/librssguard/CMakeLists.txt
View file

@ -331,11 +331,7 @@ set(SOURCES
services/reddit/redditserviceroot.h
services/reddit/redditsubscription.cpp
services/reddit/redditsubscription.h
services/standard/atomparser.cpp
services/standard/atomparser.h
services/standard/definitions.h
services/standard/feedparser.cpp
services/standard/feedparser.h
services/standard/gui/formeditstandardaccount.cpp
services/standard/gui/formeditstandardaccount.h
services/standard/gui/formstandardfeeddetails.cpp
@ -344,12 +340,16 @@ set(SOURCES
services/standard/gui/formstandardimportexport.h
services/standard/gui/standardfeeddetails.cpp
services/standard/gui/standardfeeddetails.h
services/standard/jsonparser.cpp
services/standard/jsonparser.h
services/standard/rdfparser.cpp
services/standard/rdfparser.h
services/standard/rssparser.cpp
services/standard/rssparser.h
services/standard/parsers/feedparser.cpp
services/standard/parsers/feedparser.h
services/standard/parsers/atomparser.cpp
services/standard/parsers/atomparser.h
services/standard/parsers/jsonparser.cpp
services/standard/parsers/jsonparser.h
services/standard/parsers/rdfparser.cpp
services/standard/parsers/rdfparser.h
services/standard/parsers/rssparser.cpp
services/standard/parsers/rssparser.h
services/standard/standardcategory.cpp
services/standard/standardcategory.h
services/standard/standardfeed.cpp

2
src/librssguard/services/standard/atomparser.cpp → src/librssguard/services/standard/parsers/atomparser.cpp
View file

@ -1,6 +1,6 @@
// For license of this file, see <project-root-folder>/LICENSE.md.
#include "services/standard/atomparser.h"
#include "services/standard/parsers/atomparser.h"
#include "miscellaneous/application.h"
#include "miscellaneous/textfactory.h"

2
src/librssguard/services/standard/atomparser.h → src/librssguard/services/standard/parsers/atomparser.h
View file

@ -3,7 +3,7 @@
#ifndef ATOMPARSER_H
#define ATOMPARSER_H
#include "services/standard/feedparser.h"
#include "services/standard/parsers/feedparser.h"
#include "core/message.h"

2
src/librssguard/services/standard/feedparser.cpp → src/librssguard/services/standard/parsers/feedparser.cpp
View file

@ -1,6 +1,6 @@
// For license of this file, see <project-root-folder>/LICENSE.md.
#include "services/standard/feedparser.h"
#include "services/standard/parsers/feedparser.h"
#include "exceptions/applicationexception.h"
#include "miscellaneous/application.h"

0
src/librssguard/services/standard/feedparser.h → src/librssguard/services/standard/parsers/feedparser.h
View file

2
src/librssguard/services/standard/jsonparser.cpp → src/librssguard/services/standard/parsers/jsonparser.cpp
View file

@ -1,6 +1,6 @@
// For license of this file, see <project-root-folder>/LICENSE.md.
#include "services/standard/jsonparser.h"
#include "services/standard/parsers/jsonparser.h"
#include "exceptions/feedfetchexception.h"
#include "miscellaneous/textfactory.h"

0
src/librssguard/services/standard/jsonparser.h → src/librssguard/services/standard/parsers/jsonparser.h
View file

2
src/librssguard/services/standard/rdfparser.cpp → src/librssguard/services/standard/parsers/rdfparser.cpp
View file

@ -1,6 +1,6 @@
// For license of this file, see <project-root-folder>/LICENSE.md.
#include "services/standard/rdfparser.h"
#include "services/standard/parsers/rdfparser.h"
#include "exceptions/applicationexception.h"
#include "miscellaneous/application.h"

2
src/librssguard/services/standard/rdfparser.h → src/librssguard/services/standard/parsers/rdfparser.h
View file

@ -3,7 +3,7 @@
#ifndef RDFPARSER_H
#define RDFPARSER_H
#include "services/standard/feedparser.h"
#include "services/standard/parsers/feedparser.h"
#include "core/message.h"

2
src/librssguard/services/standard/rssparser.cpp → src/librssguard/services/standard/parsers/rssparser.cpp
View file

@ -1,6 +1,6 @@
// For license of this file, see <project-root-folder>/LICENSE.md.
#include "services/standard/rssparser.h"
#include "services/standard/parsers/rssparser.h"
#include "exceptions/applicationexception.h"
#include "miscellaneous/application.h"

2
src/librssguard/services/standard/rssparser.h → src/librssguard/services/standard/parsers/rssparser.h
View file

@ -3,7 +3,7 @@
#ifndef RSSPARSER_H
#define RSSPARSER_H
#include "services/standard/feedparser.h"
#include "services/standard/parsers/feedparser.h"
#include "core/message.h"

8
src/librssguard/services/standard/standardfeed.cpp
View file

@ -17,12 +17,12 @@
#include "miscellaneous/textfactory.h"
#include "network-web/networkfactory.h"
#include "services/abstract/recyclebin.h"
#include "services/standard/atomparser.h"
#include "services/standard/definitions.h"
#include "services/standard/gui/formstandardfeeddetails.h"
#include "services/standard/jsonparser.h"
#include "services/standard/rdfparser.h"
#include "services/standard/rssparser.h"
#include "services/standard/parsers/atomparser.h"
#include "services/standard/parsers/jsonparser.h"
#include "services/standard/parsers/rdfparser.h"
#include "services/standard/parsers/rssparser.h"
#include "services/standard/standardserviceroot.h"
#include <QCommandLineParser>

10
src/librssguard/services/standard/standardserviceroot.cpp
View file

@ -19,14 +19,14 @@
#include "services/abstract/importantnode.h"
#include "services/abstract/labelsnode.h"
#include "services/abstract/recyclebin.h"
#include "services/standard/atomparser.h"
#include "services/standard/definitions.h"
#include "services/standard/gui/formeditstandardaccount.h"
#include "services/standard/gui/formstandardfeeddetails.h"
#include "services/standard/gui/formstandardimportexport.h"
#include "services/standard/jsonparser.h"
#include "services/standard/rdfparser.h"
#include "services/standard/rssparser.h"
#include "services/standard/parsers/atomparser.h"
#include "services/standard/parsers/jsonparser.h"
#include "services/standard/parsers/rdfparser.h"
#include "services/standard/parsers/rssparser.h"
#include "services/standard/standardcategory.h"
#include "services/standard/standardfeed.h"
#include "services/standard/standardfeedsimportexportmodel.h"
@ -360,7 +360,7 @@ bool StandardServiceRoot::mergeImportExportModel(FeedsImportExportModel* model,
auto* source_feed = qobject_cast<StandardFeed*>(source_item);
const auto* feed_with_same_url = target_root_node->getItemFromSubTree([source_feed](const RootItem* it) {
return it->kind() == RootItem::Kind::Feed &&
it->toFeed()->source().toLower() == source_feed->source().toLower();
it->toFeed()->source().toLower() == source_feed->source().toLower();
});
if (feed_with_same_url != nullptr) {