X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=a46f0999a01d9175d7626f15305cb7937117ac43;hb=130fde74cee428ec2e3285db89c4348c3091b2aa;hp=d958e7a0c70b32cfb324d179dc5ff280a32939b3;hpb=189c2def1996c6a25a8182794f2d6efbbf712867;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index d958e7a0..a46f0999 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -22,39 +22,41 @@
 #include <QString>
 #include <QTimer>
 #include <QTranslator>
+#include <QFile>
 
 #include "global.h"
 #include "logger.h"
 #include "network.h"
 #include "settings.h"
+#include "cliparser.h"
 
 #if defined BUILD_CORE
-#include <QCoreApplication>
 #include <QDir>
 #include "core.h"
 #include "message.h"
 
 #elif defined BUILD_QTUI
-#include <QApplication>
 #include "client.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #elif defined BUILD_MONO
-#include <QApplication>
 #include "client.h"
 #include "core.h"
 #include "coresession.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+
 #include <signal.h>
 
 //! Signal handler for graceful shutdown.
 void handle_signal(int sig) {
-  qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii());
+  qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
   QCoreApplication::quit();
 }
 
@@ -63,12 +65,10 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
-  // Logger logger;
-
   Global::registerMetaTypes();
+  Global::setupVersion();
 
-#include "../../version.inc"
-
+/*
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
@@ -79,17 +79,70 @@ int main(int argc, char **argv) {
   Global::runMode = Global::Monolithic;
   QApplication app(argc, argv);
 #endif
+*/
+#if defined BUILD_CORE
+  Global::runMode = Global::CoreOnly;
+  QCoreApplication app(argc, argv);
+#elif defined BUILD_QTUI
+  Global::runMode = Global::ClientOnly;
+  QtUiApplication app(argc, argv);
+#else
+  Global::runMode = Global::Monolithic;
+  QtUiApplication app(argc, argv);
+#endif
+
 
-  qsrand(QDateTime::currentDateTime().toTime_t());
+
+  Global::parser = CliParser(QCoreApplication::arguments());
+
+#ifndef BUILD_QTUI
+// put core-only arguments here
+  Global::parser.addOption("port",'p',"The port quasselcore will listen at",QString("4242"));
+  Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state");
+  Global::parser.addOption("logfile",'l',"Path to logfile");
+  Global::parser.addOption("loglevel",'L',"Loglevel Debug|Info|Warning|Error","Info");
+  Global::parser.addOption("datadir", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
+#endif // BUILD_QTUI
+#ifndef BUILD_CORE
+// put client-only arguments here
+  Global::parser.addSwitch("debugbufferswitches",0,"Enables debugging for bufferswitches");
+  Global::parser.addSwitch("debugmodel",0,"Enables debugging for models");
+#endif // BUILD_QTCORE
+// put shared client&core arguments here
+  Global::parser.addSwitch("debug",'d',"Enable debug output");
+  Global::parser.addSwitch("help",'h', "Display this help and exit");
+
+  if(!Global::parser.parse() || Global::parser.isSet("help")) {
+    Global::parser.usage();
+    return 1;
+  }
+
+  /*
+   This is an initial check if logfile is writable since the warning would spam stdout if done
+   in current Logger implementation. Can be dropped whenever the logfile is only opened once.
+  */
+  if(Global::runMode != Global::ClientOnly) {
+    QFile logFile;
+    if(!Global::parser.value("logfile").isEmpty()) {
+      logFile.setFileName(Global::parser.value("logfile"));
+      if(!logFile.open(QIODevice::Append | QIODevice::Text))
+        qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
+      else logFile.close();
+    }
+  }
+
+  qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   // Set up i18n support
   QLocale locale = QLocale::system();
 
-  QTranslator qtTranslator;
+  QTranslator qtTranslator(&app);
+  qtTranslator.setObjectName("QtTr");
   qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name()));
   app.installTranslator(&qtTranslator);
 
-  QTranslator quasselTranslator;
+  QTranslator quasselTranslator(&app);
+  quasselTranslator.setObjectName("QuasselTr");
   quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
   app.installTranslator(&quasselTranslator);
 
@@ -101,17 +154,7 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");
 
-  // Check if a non-standard core port is requested
-  QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
-  Global::SPUTDEV = args.contains("--sputdev"); // This enables various debug features for Sput. Do not touch.
-
-  Global::defaultPort = 4242;
-  int idx;
-  if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) {
-    int port = args[idx+1].toInt();
-    if(port >= 1024 && port < 65536) Global::defaultPort = port;
-  }
-
+  
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -119,6 +162,7 @@ int main(int argc, char **argv) {
   //Settings::init();
 
 #ifndef BUILD_CORE
+  // session resume
   QtUi *gui = new QtUi();
   Client::init(gui);
   // init gui only after the event loop has started
@@ -127,11 +171,15 @@ int main(int argc, char **argv) {
 #endif
 
 #ifndef BUILD_QTUI
-  if(!args.contains("--norestore")) {
+  if(!Global::parser.isSet("norestore")) {
     Core::restoreState();
   }
 #endif
 
+#ifndef BUILD_CORE 
+  app.resumeSessionIfPossible();
+#endif
+  
   int exitCode = app.exec();
 
 #ifndef BUILD_QTUI