From 45fcaa8b2fbe159d5577af24d48cb13407534c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Sun, 13 Dec 2015 21:46:37 +0100
Subject: [PATCH] fixed settings path for server config

---
 YACReaderLibrary/headless/console_ui_library_creator.cpp | 8 +++++++-
 YACReaderLibrary/headless/main.cpp                       | 4 +---
 YACReaderLibrary/main.cpp                                | 1 -
 YACReaderLibrary/server/startup.cpp                      | 3 +--
 YACReaderLibrary/yacreader_libraries.cpp                 | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/YACReaderLibrary/headless/console_ui_library_creator.cpp b/YACReaderLibrary/headless/console_ui_library_creator.cpp
index 3246fbdb..54775e07 100644
--- a/YACReaderLibrary/headless/console_ui_library_creator.cpp
+++ b/YACReaderLibrary/headless/console_ui_library_creator.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 
 #include "library_creator.h"
-
+#include "yacreader_libraries.h"
 
 
 ConsoleUILibraryCreator::ConsoleUILibraryCreator(QObject *parent) :
@@ -29,6 +29,12 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
 
     libraryCreator->start();
     eventLoop.exec();
+
+    //TODO, at some point some checking is needed for avoiding duplicated libraries
+    YACReaderLibraries yacreaderLibraries;
+    yacreaderLibraries.load();
+    yacreaderLibraries.addLibrary(name, path);
+    yacreaderLibraries.save();
 }
 
 void ConsoleUILibraryCreator::updateLibrary(const QString & path)
diff --git a/YACReaderLibrary/headless/main.cpp b/YACReaderLibrary/headless/main.cpp
index d9c3889e..46accaaf 100644
--- a/YACReaderLibrary/headless/main.cpp
+++ b/YACReaderLibrary/headless/main.cpp
@@ -226,12 +226,10 @@ int main( int argc, char ** argv )
     viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
 #endif
     app->installTranslator(&viewerTranslator);
-    app->setApplicationName("YACReaderLibrary");
 
     qRegisterMetaType<ComicDB>("ComicDB");
 
-
-    QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor
+    QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
     settings->beginGroup("libraryConfig");
 
     //server
diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp
index 2c6e5917..2d8e50f8 100644
--- a/YACReaderLibrary/main.cpp
+++ b/YACReaderLibrary/main.cpp
@@ -187,7 +187,6 @@ int main( int argc, char ** argv )
   viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
 #endif
   app.installTranslator(&viewerTranslator);
-  app.setApplicationName("YACReaderLibrary");
 
   qRegisterMetaType<ComicDB>("ComicDB");
 
diff --git a/YACReaderLibrary/server/startup.cpp b/YACReaderLibrary/server/startup.cpp
index a9927c6e..fd1e982f 100644
--- a/YACReaderLibrary/server/startup.cpp
+++ b/YACReaderLibrary/server/startup.cpp
@@ -27,8 +27,7 @@
 void Startup::start() {
 	// Initialize the core application
     QCoreApplication* app = QCoreApplication::instance();
-	app->setApplicationName(APPNAME);
-	app->setOrganizationName(ORGANISATION);
+
 	QString configFileName=YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini";
 
 	// Configure logging into files
diff --git a/YACReaderLibrary/yacreader_libraries.cpp b/YACReaderLibrary/yacreader_libraries.cpp
index 2e5e3cd2..53a8a6b0 100644
--- a/YACReaderLibrary/yacreader_libraries.cpp
+++ b/YACReaderLibrary/yacreader_libraries.cpp
@@ -102,7 +102,7 @@ void YACReaderLibraries::addLibrary(const QString &name, const QString &path)
 
 void YACReaderLibraries::load()
 {
-	QSettings settings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
+    QSettings settings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
 
 	if(settings.value(LIBRARIES).isValid())
 	{
@@ -136,7 +136,7 @@ void YACReaderLibraries::load()
 
 bool YACReaderLibraries::save()
 {
-	QSettings settings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
+    QSettings settings(YACReader::getSettingsPath()+"/"+QCoreApplication::applicationName()+".ini",QSettings::IniFormat);
 
 	QByteArray data;
 	QDataStream out(&data, QIODevice::WriteOnly);