mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format code using clang-format

Browse Source
This commit is contained in:
Luis Ángel San Martín
2019-05-30 19:46:37 +02:00
parent e0eb94e3ae
commit e3ec56aa43
356 changed files with 19824 additions and 21874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
YACReaderLibraryServer/console_ui_library_creator.cpp
View File

@ -5,36 +5,32 @@
#include "library_creator.h"
#include "yacreader_libraries.h"
ConsoleUILibraryCreator::ConsoleUILibraryCreator(QObject *parent) :
QObject(parent), numComicsProcessed(0)
ConsoleUILibraryCreator::ConsoleUILibraryCreator(QObject *parent)
: QObject(parent), numComicsProcessed(0)
{
}
void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString & path)
void ConsoleUILibraryCreator::createLibrary(const QString &name, const QString &path)
{
QEventLoop eventLoop;
LibraryCreator * libraryCreator = new LibraryCreator();
LibraryCreator *libraryCreator = new LibraryCreator();
QDir pathDir(path);
if (!pathDir.exists())
{
std::cout << "Directory not found." << std::endl;
return;
if (!pathDir.exists()) {
std::cout << "Directory not found." << std::endl;
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
if (yacreaderLibraries.contains(name))
{
if (yacreaderLibraries.contains(name)) {
std::cout << "A Library named \"" << name.toUtf8().constData() << "\" already exists in database." << std::endl;
return;
}
libraryCreator->createLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
libraryCreator->createLibrary(cleanPath, QDir::cleanPath(pathDir.absolutePath() + "/.yacreaderlibrary"));
connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done);
connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic);
@ -51,20 +47,19 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
yacreaderLibraries.save();
}
void ConsoleUILibraryCreator::updateLibrary(const QString & path)
void ConsoleUILibraryCreator::updateLibrary(const QString &path)
{
QEventLoop eventLoop;
LibraryCreator * libraryCreator = new LibraryCreator();
LibraryCreator *libraryCreator = new LibraryCreator();
QDir pathDir(path);
if (!pathDir.exists())
{
std::cout << "Directory not found." << std::endl;
return;
if (!pathDir.exists()) {
std::cout << "Directory not found." << std::endl;
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
libraryCreator->updateLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
libraryCreator->updateLibrary(cleanPath, QDir::cleanPath(pathDir.absolutePath() + "/.yacreaderlibrary"));
connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done);
connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic);
@ -78,26 +73,23 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
eventLoop.exec();
}
void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QString & path)
void ConsoleUILibraryCreator::addExistingLibrary(const QString &name, const QString &path)
{
QDir pathDir(path);
if (!pathDir.exists())
{
std::cout << "Directory not found." << std::endl;
return;
if (!pathDir.exists()) {
std::cout << "Directory not found." << std::endl;
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
if (!QDir(cleanPath + "/.yacreaderlibrary").exists())
{
std::cout << "No library database found in directory." << std::endl;
return;
if (!QDir(cleanPath + "/.yacreaderlibrary").exists()) {
std::cout << "No library database found in directory." << std::endl;
return;
}
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
if (yacreaderLibraries.contains(name))
{
if (yacreaderLibraries.contains(name)) {
std::cout << "A Library named \"" << name.toUtf8().constData() << "\" already exists in the database." << std::endl;
return;
}
@ -107,13 +99,12 @@ void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QSt
std::cout << "Library added : " << name.toUtf8().constData() << " at " << cleanPath.toUtf8().constData() << std::endl;
}
void ConsoleUILibraryCreator::removeLibrary(const QString & name)
void ConsoleUILibraryCreator::removeLibrary(const QString &name)
{
//TODO add error handling
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
if (!yacreaderLibraries.contains(name))
{
if (!yacreaderLibraries.contains(name)) {
std::cout << "No Library named \"" << name.toUtf8().constData() << "\" in database." << std::endl;
return;
}
@ -129,20 +120,22 @@ void ConsoleUILibraryCreator::newComic(const QString & /*relativeComicPath*/, co
std::cout << ".";
}
void ConsoleUILibraryCreator::manageCreatingError(const QString & error)
void ConsoleUILibraryCreator::manageCreatingError(const QString &error)
{
std::cout << std::endl << "Error creating library! " << error.toUtf8().constData() << std::endl;
std::cout << std::endl
<< "Error creating library! " << error.toUtf8().constData() << std::endl;
}
void ConsoleUILibraryCreator::manageUpdatingError(const QString & error)
void ConsoleUILibraryCreator::manageUpdatingError(const QString &error)
{
std::cout << std::endl << "Error updating library! " << error.toUtf8().constData() << std::endl;
std::cout << std::endl
<< "Error updating library! " << error.toUtf8().constData() << std::endl;
}
void ConsoleUILibraryCreator::done()
{
std::cout << "Done!" << std::endl;
if(numComicsProcessed > 0)
if (numComicsProcessed > 0)
std::cout << "Number of comics processed = " << numComicsProcessed << std::endl;
}

14
YACReaderLibraryServer/console_ui_library_creator.h
View File

@ -8,10 +8,10 @@ class ConsoleUILibraryCreator : public QObject
Q_OBJECT
public:
explicit ConsoleUILibraryCreator(QObject *parent = 0);
void createLibrary(const QString & name, const QString & path);
void updateLibrary(const QString & path);
void addExistingLibrary(const QString & name, const QString & path);
void removeLibrary(const QString & name);
void createLibrary(const QString &name, const QString &path);
void updateLibrary(const QString &path);
void addExistingLibrary(const QString &name, const QString &path);
void removeLibrary(const QString &name);
private:
uint numComicsProcessed;
@ -20,9 +20,9 @@ signals:
public slots:
protected slots:
void newComic(const QString & relativeComicPath, const QString & coverPath);
void manageCreatingError(const QString & error);
void manageUpdatingError(const QString & error);
void newComic(const QString &relativeComicPath, const QString &coverPath);
void manageCreatingError(const QString &error);
void manageUpdatingError(const QString &error);
void done();
};

16
YACReaderLibraryServer/libraries_updater.cpp
View File

@ -3,11 +3,8 @@
#include "yacreader_libraries.h"
#include "data_base_management.h"
LibrariesUpdater::LibrariesUpdater()
{
}
void LibrariesUpdater::updateIfNeeded()
@ -16,23 +13,20 @@ void LibrariesUpdater::updateIfNeeded()
libraries.load();
foreach(QString name, libraries.getNames()) {
foreach (QString name, libraries.getNames()) {
QString path = libraries.getPath(name) + "/.yacreaderlibrary";
QDir d;
QString dbVersion;
if(d.exists(path) && d.exists(path+"/library.ydb") && (dbVersion = DataBaseManagement::checkValidDB(path+"/library.ydb")) != "")
{
int comparation = DataBaseManagement::compareVersions(dbVersion,VERSION);
if (d.exists(path) && d.exists(path + "/library.ydb") && (dbVersion = DataBaseManagement::checkValidDB(path + "/library.ydb")) != "") {
int comparation = DataBaseManagement::compareVersions(dbVersion, VERSION);
if(comparation < 0)
{
if (comparation < 0) {
bool updated = DataBaseManagement::updateToCurrentVersion(path);
if(!updated) {
if (!updated) {
//TODO log error
}
}
}
}

1
YACReaderLibraryServer/libraries_updater.h
View File

@ -1,7 +1,6 @@
#ifndef LIBRARIES_UPDATER_H
#define LIBRARIES_UPDATER_H
class LibrariesUpdater
{
public:

174
YACReaderLibraryServer/main.cpp
View File

@ -23,7 +23,6 @@
using namespace QsLogging;
//Returns false in case of a parse error (unknown option or missing value); returns true otherwise.
void logSystemAndConfig()
{
QLOG_INFO() << "---------- System & configuration ----------";
@ -44,45 +43,39 @@ void logSystemAndConfig()
QLOG_INFO() << "--------------------------------------------";
}
void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
Q_UNUSED(context);
Q_UNUSED(context);
QByteArray localMsg = msg.toLocal8Bit();
switch (type)
{
case QtInfoMsg:
{
QLOG_INFO() << localMsg.constData();
break;
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtInfoMsg: {
QLOG_INFO() << localMsg.constData();
break;
}
case QtDebugMsg: {
QLOG_DEBUG() << localMsg.constData();
break;
}
case QtDebugMsg:
{
QLOG_DEBUG() << localMsg.constData();
break;
}
case QtWarningMsg:
{
QLOG_WARN() << localMsg.constData();
break;
}
case QtWarningMsg: {
QLOG_WARN() << localMsg.constData();
break;
}
case QtCriticalMsg:
{
QLOG_ERROR() << localMsg.constData();
break;
}
case QtCriticalMsg: {
QLOG_ERROR() << localMsg.constData();
break;
}
case QtFatalMsg:
{
QLOG_FATAL() << localMsg.constData();
break;
}
}
case QtFatalMsg: {
QLOG_FATAL() << localMsg.constData();
break;
}
}
}
int main( int argc, char ** argv )
int main(int argc, char **argv)
{
qInstallMessageHandler(messageHandler);
@ -98,89 +91,83 @@ int main( int argc, char ** argv )
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR)+"/yacreader/languages/yacreaderlibrary_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix);
#endif
app.installTranslator(&translator);
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR) + "/yacreader/languages/yacreaderlibrary_" + sufix);
#else
translator.load(QCoreApplication::applicationDirPath() + "/languages/yacreaderlibrary_" + sufix);
#endif
app.installTranslator(&translator);
QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::tr("\nYACReaderLibraryServer is the headless (no gui) version of YACReaderLibrary"));
parser.addHelpOption();
const QCommandLineOption versionOption = parser.addVersionOption();
parser.addPositionalArgument("command", "The command to execute. [start, create-library, update-library, add-library, remove-library, list-libraries]");
parser.addOption({"loglevel", "Set log level. Valid values: trace, info, debug, warn, error.", "loglevel", "info"});
parser.addOption({ "loglevel", "Set log level. Valid values: trace, info, debug, warn, error.", "loglevel", "info" });
parser.parse(app.arguments());
const QStringList args = parser.positionalArguments();
const QString command = args.isEmpty() ? QString() : args.first();
if(parser.isSet(versionOption))
{
qout << "YACReaderLibraryServer" << " " << VERSION << endl;
if (parser.isSet(versionOption)) {
qout << "YACReaderLibraryServer"
<< " " << VERSION << endl;
return 0;
}
if(command == "start")
{
if (command == "start") {
parser.clearPositionalArguments();
parser.addPositionalArgument("start", "Start YACReaderLibraryServer");
parser.process(app);
QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log";
QString destLog = YACReader::getSettingsPath() + "/yacreaderlibrary.log";
QDir().mkpath(YACReader::getSettingsPath());
Logger& logger = Logger::instance();
Logger &logger = Logger::instance();
if (parser.isSet("loglevel")) {
if (parser.value("loglevel") == "trace") {
logger.setLoggingLevel(QsLogging::TraceLevel);
}
else if (parser.value("loglevel") == "info") {
} else if (parser.value("loglevel") == "info") {
logger.setLoggingLevel(QsLogging::InfoLevel);
}
else if (parser.value("loglevel") == "debug") {
} else if (parser.value("loglevel") == "debug") {
logger.setLoggingLevel(QsLogging::DebugLevel);
}
else if (parser.value("loglevel") == "warn") {
logger.setLoggingLevel(QsLogging::WarnLevel);
}
else if (parser.value("loglevel") == "error") {
} else if (parser.value("loglevel") == "warn") {
logger.setLoggingLevel(QsLogging::WarnLevel);
} else if (parser.value("loglevel") == "error") {
logger.setLoggingLevel(QsLogging::ErrorLevel);
}
else {
} else {
parser.showHelp();
}
}
DestinationPtr fileDestination(DestinationFactory::MakeFileDestination(
destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2)));
destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2)));
DestinationPtr debugDestination(DestinationFactory::MakeDebugOutputDestination());
logger.addDestination(debugDestination);
logger.addDestination(fileDestination);
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR)+"/yacreader/languages/yacreaderlibrary_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix);
#endif
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR) + "/yacreader/languages/yacreaderlibrary_" + sufix);
#else
translator.load(QCoreApplication::applicationDirPath() + "/languages/yacreaderlibrary_" + sufix);
#endif
app.installTranslator(&translator);
QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif
#if defined Q_OS_UNIX && !defined Q_OS_MAC
viewerTranslator.load(QString(DATADIR) + "/yacreader/languages/yacreader_" + sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath() + "/languages/yacreader_" + sufix);
#endif
app.installTranslator(&viewerTranslator);
qRegisterMetaType<ComicDB>("ComicDB");
QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/" + QCoreApplication::applicationName() + ".ini", QSettings::IniFormat);
settings->beginGroup("libraryConfig");
//server
@ -191,7 +178,7 @@ int main( int argc, char ** argv )
logSystemAndConfig();
if(YACReaderLocalServer::isRunning()) //s�lo se permite una instancia de YACReaderLibrary
if (YACReaderLocalServer::isRunning()) //s�lo se permite una instancia de YACReaderLibrary
{
QLOG_WARN() << "another instance of YACReaderLibrary is running";
QsLogging::Logger::destroyInstance();
@ -203,7 +190,7 @@ int main( int argc, char ** argv )
LibrariesUpdater updater;
updater.updateIfNeeded();
YACReaderLocalServer * localServer = new YACReaderLocalServer();
YACReaderLocalServer *localServer = new YACReaderLocalServer();
int ret = app.exec();
@ -218,9 +205,7 @@ int main( int argc, char ** argv )
QsLogging::Logger::destroyInstance();
return ret;
}
else if(command == "create-library")
{
} else if (command == "create-library") {
parser.clearPositionalArguments();
parser.addPositionalArgument("create-library", "Creates a library named \"name\" in the specified destination <path>");
parser.addPositionalArgument("name", "Library name", "\"name\"");
@ -228,38 +213,32 @@ int main( int argc, char ** argv )
parser.process(app);
const QStringList args = parser.positionalArguments();
if(args.length() != 3)
{
if (args.length() != 3) {
parser.showHelp();
return 0;
}
ConsoleUILibraryCreator * libraryCreatorUI = new ConsoleUILibraryCreator;
ConsoleUILibraryCreator *libraryCreatorUI = new ConsoleUILibraryCreator;
libraryCreatorUI->createLibrary(args.at(1), args.at(2));
return 0;
}
else if(command == "update-library")
{
} else if (command == "update-library") {
parser.clearPositionalArguments();
parser.addPositionalArgument("update-library", "Updates an existing library at <path>");
parser.addPositionalArgument("path", "Path to the library to be updated", "<path>");
parser.process(app);
const QStringList args = parser.positionalArguments();
if(args.length() != 2)
{
if (args.length() != 2) {
parser.showHelp();
return 0;
}
ConsoleUILibraryCreator * libraryCreatorUI = new ConsoleUILibraryCreator;
ConsoleUILibraryCreator *libraryCreatorUI = new ConsoleUILibraryCreator;
libraryCreatorUI->updateLibrary(args.at(1));
return 0;
}
else if(command == "add-library")
{
} else if (command == "add-library") {
parser.clearPositionalArguments();
parser.addPositionalArgument("add-library", "Adds an exiting library named \"name\" at the specified origin <path>");
parser.addPositionalArgument("name", "Library name", "\"name\"");
@ -267,49 +246,42 @@ int main( int argc, char ** argv )
parser.process(app);
const QStringList args = parser.positionalArguments();
if(args.length() != 3)
{
if (args.length() != 3) {
parser.showHelp();
return 0;
}
ConsoleUILibraryCreator * libraryCreatorUI = new ConsoleUILibraryCreator;
ConsoleUILibraryCreator *libraryCreatorUI = new ConsoleUILibraryCreator;
libraryCreatorUI->addExistingLibrary(args.at(1), args.at(2));
return 0;
}
else if(command == "remove-library")
{
} else if (command == "remove-library") {
parser.clearPositionalArguments();
parser.addPositionalArgument("remove-library", "Removes a library named \"name\" from the list of libraries");
parser.addPositionalArgument("name", "Library name", "\"name\"");
parser.process(app);
const QStringList args = parser.positionalArguments();
if(args.length() != 2)
{
if (args.length() != 2) {
parser.showHelp();
return 0;
}
ConsoleUILibraryCreator * libraryCreatorUI = new ConsoleUILibraryCreator;
ConsoleUILibraryCreator *libraryCreatorUI = new ConsoleUILibraryCreator;
libraryCreatorUI->removeLibrary(args.at(1));
return 0;
}
else if(command == "list-libraries")
{
} else if (command == "list-libraries") {
parser.clearPositionalArguments();
parser.addPositionalArgument("list-libraries", "List all available libraries");
parser.process(app);
YACReaderLibraries libraries = DBHelper::getLibraries();
for(QString libraryName : libraries.getNames())
for (QString libraryName : libraries.getNames())
qout << libraryName << " : " << libraries.getPath(libraryName) << endl;
return 0;
}
else //error
} else //error
{
parser.process(app);
parser.showHelp();