From 6c93c1e3c946ba6e85cb52155de391e1ae133d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 12 Dec 2015 13:36:49 +0100 Subject: [PATCH] cleaning headless main file --- YACReaderLibrary/headless/main.cpp | 171 +++++++++++++---------------- 1 file changed, 75 insertions(+), 96 deletions(-) diff --git a/YACReaderLibrary/headless/main.cpp b/YACReaderLibrary/headless/main.cpp index 6a94be76..cde45909 100644 --- a/YACReaderLibrary/headless/main.cpp +++ b/YACReaderLibrary/headless/main.cpp @@ -1,13 +1,4 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "yacreader_global.h" #include "startup.h" @@ -19,9 +10,6 @@ #include "QsLog.h" #include "QsLogDest.h" -//interfaz al servidor -Startup * s; - using namespace QsLogging; void logSystemAndConfig() @@ -97,7 +85,7 @@ void logSystemAndConfig() else QLOG_ERROR() << "7z : not found"; - /* + /* TODO: qrencode could be helpfull for showing a qr code in the web client for client devices #if defined Q_OS_UNIX && !defined Q_OS_MAC if(QFileInfo(QString(BINDIR)+"/qrencode").exists()) #else @@ -122,111 +110,102 @@ QCoreApplication* createApplication(int &argc, char *argv[]) int main( int argc, char ** argv ) { -//fix for misplaced text in Qt4.8 and Mavericks -#ifdef Q_OS_MAC - #if QT_VERSION < 0x050000 - if(QSysInfo::MacintoshVersion > QSysInfo::MV_10_8) - QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande"); - #endif + QScopedPointer app(createApplication(argc, argv)); -#endif - - QScopedPointer app(createApplication(argc, argv)); - //QApplication app( argc, argv ); - - app->setApplicationName("YACReaderLibraryServer"); - app->setOrganizationName("YACReader"); -//simple command line parser -//will be replaced by QCommandLineParser in the future -//TODO: --headless, --server=[on|off], support for file and directory arguments - if (argc > 1) - { - QTextStream parser(stdout); - QStringList optlist = QCoreApplication::arguments().filter(QRegExp ("^-{1,2}")); + app->setApplicationName("YACReaderLibraryServer"); + app->setOrganizationName("YACReader"); + //simple command line parser + //will be replaced by QCommandLineParser in the future + //TODO: support for file and directory arguments + if (argc > 1) + { + QTextStream parser(stdout); + QStringList optlist = QCoreApplication::arguments().filter(QRegExp ("^-{1,2}")); if (optlist.contains("--version") || optlist.contains("-v")) - { - parser << app->applicationName() << " " << QString(VERSION) << endl << "Copyright 2014 by Luis Angel San Martin Rodriguez" << endl; - return 0; - } + { + parser << app->applicationName() << " " << QString(VERSION) << endl << "Copyright 2014 by Luis Angel San Martin Rodriguez" << endl; + return 0; + } if (optlist.contains("--help") || optlist.contains("-h")) - { - parser << endl << "Usage:" << "\tYACReaderLibrary [Option]" << endl << endl; - parser << "Options:" << endl; - parser << " none\t\t\tStart YACReaderLibrary" << endl; - parser << " -h, --help\t\tDisplay help text and exit." << endl; - parser << " -v, --version\t\tDisplay version information and exit." << endl; - return 0; - } - if (optlist.contains("--no-gui")) - { - parser << "You're running YACReaderLibrary in non-gui mode. Press Ctrl+C to exit." << endl; - } - } + { + parser << endl << "Usage:" << "\tYACReaderLibrary [Option]" << endl << endl; + parser << "Options:" << endl; + parser << " none\t\t\tStart YACReaderLibrary" << endl; + parser << " -h, --help\t\tDisplay help text and exit." << endl; + parser << " -v, --version\t\tDisplay version information and exit." << endl; + return 0; + } + if (optlist.contains("--no-gui")) + { + parser << "You're running YACReaderLibrary in non-gui mode. Press Ctrl+C to exit." << endl; + } + } - QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log"; - QDir().mkpath(YACReader::getSettingsPath()); + QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log"; + QDir().mkpath(YACReader::getSettingsPath()); - Logger& logger = Logger::instance(); - logger.setLoggingLevel(QsLogging::TraceLevel); + Logger& logger = Logger::instance(); + logger.setLoggingLevel(QsLogging::TraceLevel); - DestinationPtr fileDestination(DestinationFactory::MakeFileDestination( - destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2))); - DestinationPtr debugDestination(DestinationFactory::MakeDebugOutputDestination()); - logger.addDestination(debugDestination); - logger.addDestination(fileDestination); + DestinationPtr fileDestination(DestinationFactory::MakeFileDestination( + destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2))); + DestinationPtr debugDestination(DestinationFactory::MakeDebugOutputDestination()); + logger.addDestination(debugDestination); + logger.addDestination(fileDestination); - QTranslator translator; - QString sufix = QLocale::system().name(); + QTranslator translator; + QString sufix = QLocale::system().name(); #if defined Q_OS_UNIX && !defined Q_OS_MAC - translator.load(QString(DATADIR)+"/yacreader/languages/yacreaderlibrary_"+sufix); + translator.load(QString(DATADIR)+"/yacreader/languages/yacreaderlibrary_"+sufix); #else - translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix); + translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix); #endif - app->installTranslator(&translator); - - QTranslator viewerTranslator; + app->installTranslator(&translator); + + QTranslator viewerTranslator; #if defined Q_OS_UNIX && !defined Q_OS_MAC - viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix); + viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix); #else - viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); + viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); #endif - app->installTranslator(&viewerTranslator); - app->setApplicationName("YACReaderLibrary"); + app->installTranslator(&viewerTranslator); + app->setApplicationName("YACReaderLibrary"); - qRegisterMetaType("ComicDB"); + qRegisterMetaType("ComicDB"); - QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor - settings->beginGroup("libraryConfig"); - - s = new Startup(); - s->start(); + QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor + settings->beginGroup("libraryConfig"); - QLOG_INFO() << "YACReaderLibraryServer attempting to start"; + //server + Startup *s = new Startup(); + s->start(); - logSystemAndConfig(); + QLOG_INFO() << "YACReaderLibraryServer attempting to start"; - if(YACReaderLocalServer::isRunning()) //s�lo se permite una instancia de YACReaderLibrary - { - QLOG_WARN() << "another instance of YACReaderLibrary is running"; - QsLogging::Logger::destroyInstance(); - return 0; - } - QLOG_INFO() << "YACReaderLibrary starting"; + logSystemAndConfig(); - YACReaderLocalServer * localServer = new YACReaderLocalServer(); + if(YACReaderLocalServer::isRunning()) //s�lo se permite una instancia de YACReaderLibrary + { + QLOG_WARN() << "another instance of YACReaderLibrary is running"; + QsLogging::Logger::destroyInstance(); + return 0; + } + QLOG_INFO() << "YACReaderLibrary starting"; - int ret = app->exec(); + YACReaderLocalServer * localServer = new YACReaderLocalServer(); - QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret; + int ret = app->exec(); - //shutdown - s->stop(); - delete s; - localServer->close(); - delete localServer; + QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret; - QsLogging::Logger::destroyInstance(); + //shutdown + s->stop(); + delete s; + localServer->close(); + delete localServer; - return ret; + QsLogging::Logger::destroyInstance(); + + return ret; }