[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/akonadi/server
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-10-11 8:02:49
Message-ID: 20101011080249.E1202AC7E4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1184652 by tokoe:

Allow to use the place holder '$USER' inside the custom directory


 M  +1 -0      CMakeLists.txt  
 M  +3 -9      src/akonadi.cpp  
 M  +0 -18     src/storage/dbconfig.cpp  
 M  +0 -6      src/storage/dbconfig.h  
 M  +3 -2      src/storage/dbconfigmysql.cpp  
 M  +3 -2      src/storage/dbconfigpostgresql.cpp  
 A             src/utils.cpp   [License: LGPL (v2+)]
 M  +6 -0      src/utils.h  


--- trunk/kdesupport/akonadi/server/CMakeLists.txt #1184651:1184652
@@ -118,6 +118,7 @@
   src/storage/transaction.cpp
   src/storage/parthelper.cpp
   src/tracer.cpp
+  src/utils.cpp
   src/dbustracer.cpp
   src/filetracer.cpp
   src/notificationmanager.cpp
--- trunk/kdesupport/akonadi/server/src/akonadi.cpp #1184651:1184652
@@ -29,6 +29,7 @@
 #include "notificationmanager.h"
 #include "resourcemanager.h"
 #include "tracer.h"
+#include "utils.h"
 #include "debuginterface.h"
 #include "storage/itemretrievalthread.h"
 #include "preprocessormanager.h"
@@ -95,13 +96,7 @@
     connectionSettings.setValue( QLatin1String( "Data/Method" ), QLatin1String( \
                "NamedPipe" ) );
     connectionSettings.setValue( QLatin1String( "Data/NamedPipe" ), namedPipe );
 #else
-    const QString defaultSocketDir = XdgBaseDirs::saveDir( "data", QLatin1String( \
                "akonadi" ) );
-    QString socketDir = settings.value( QLatin1String( "Connection/SocketDirectory" \
                ), defaultSocketDir ).toString();
-    if ( socketDir[0] != QLatin1Char( '/' ) ) {
-      QDir::home().mkdir( socketDir );
-      socketDir = QDir::homePath() + QLatin1Char( '/' ) + socketDir;
-    }
-
+    const QString socketDir = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( \
                "data", QLatin1String( "akonadi" ) ) );
     const QString socketFile = socketDir + QLatin1String( "/akonadiserver.socket" );
     unlink( socketFile.toUtf8().constData() );
     if ( !listen( socketFile ) )
@@ -216,8 +211,7 @@
 
 #ifndef Q_OS_WIN
     QSettings connectionSettings( connectionSettingsFile, QSettings::IniFormat );
-    const QString defaultSocketDir = XdgBaseDirs::saveDir( "data", QLatin1String( \
                "akonadi" ) );
-    const QString socketDir = settings.value( QLatin1String( \
"Connection/SocketDirectory" ), defaultSocketDir ).toString(); +    const QString \
socketDir = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", \
QLatin1String( "akonadi" ) ) );  
     if ( !QDir::home().remove( socketDir + QLatin1String( "/akonadiserver.socket" ) \
) )  akError() << "Failed to remove Unix socket";
--- trunk/kdesupport/akonadi/server/src/storage/dbconfig.cpp #1184651:1184652
@@ -115,21 +115,3 @@
 {
   return mUseExternalPayloadFile;
 }
-
-QString DbConfig::preferredSocketDirectory( const QString &defaultDirectory ) const
-{
-  const QString serverConfigFile = XdgBaseDirs::akonadiServerConfigFile( \
                XdgBaseDirs::ReadWrite );
-  QSettings serverSettings( serverConfigFile, QSettings::IniFormat );
-
-  QString socketDir = serverSettings.value( QLatin1String( \
                "Connection/SocketDirectory" ), defaultDirectory ).toString();
-  if ( socketDir[0] != QLatin1Char( '/' ) ) {
-    QDir::home().mkdir( socketDir );
-    socketDir = QDir::homePath() + QLatin1Char( '/' ) + socketDir;
-  }
-
-  QFileInfo dirInfo( socketDir );
-  if ( !dirInfo.exists() )
-    QDir::home().mkpath( dirInfo.absoluteFilePath() );
-
-  return socketDir;
-}
--- trunk/kdesupport/akonadi/server/src/storage/dbconfig.h #1184651:1184652
@@ -92,12 +92,6 @@
      */
     virtual bool useExternalPayloadFile() const;
 
-    /**
-     * Returns the socket @p directory that is passed to this method or the one
-     * the user has overwritten via the config file.
-     */
-    QString preferredSocketDirectory( const QString &directory ) const;
-
   protected:
     DbConfig();
 
--- trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.cpp #1184651:1184652
@@ -21,6 +21,7 @@
 
 #include "../../libs/xdgbasedirs_p.h"
 #include "akdebug.h"
+#include "utils.h"
 
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
@@ -55,7 +56,7 @@
   QString defaultServerPath;
   QString defaultCleanShutdownCommand;
 
-  const QString socketDirectory = preferredSocketDirectory( XdgBaseDirs::saveDir( \
"data", QLatin1String( "akonadi/db_misc" ) ) ); +  const QString socketDirectory = \
Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( \
"akonadi/db_misc" ) ) );  
   defaultDbName = QLatin1String( "akonadi" );
   const bool defaultInternalServer = true;
@@ -164,7 +165,7 @@
 
   const QString akDir   = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/" ) \
);  const QString dataDir = XdgBaseDirs::saveDir( "data", QLatin1String( \
                "akonadi/db_data" ) );
-  const QString socketDirectory = preferredSocketDirectory( XdgBaseDirs::saveDir( \
"data", QLatin1String( "akonadi/db_misc" ) ) ); +  const QString socketDirectory = \
Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( \
"akonadi/db_misc" ) ) );  
   // generate config file
   const QString globalConfig = XdgBaseDirs::findResourceFile( "config", \
                QLatin1String( "akonadi/mysql-global.conf" ) );
--- trunk/kdesupport/akonadi/server/src/storage/dbconfigpostgresql.cpp \
#1184651:1184652 @@ -21,6 +21,7 @@
 
 #include "../../libs/xdgbasedirs_p.h"
 #include "akdebug.h"
+#include "utils.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
@@ -71,7 +72,7 @@
 
     defaultServerPath = XdgBaseDirs::findExecutableFile( QLatin1String( "pg_ctl" ), \
                postgresSearchPath );
     defaultInitDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "initdb" ), \
                postgresSearchPath );
-    defaultHostName = preferredSocketDirectory( XdgBaseDirs::saveDir( "data", \
QLatin1String( "akonadi/db_misc" ) ) ); +    defaultHostName = \
Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( \
"akonadi/db_misc" ) ) );  defaultCleanShutdownCommand = QString::fromLatin1( "%1 stop \
                -D%2" )
                                       .arg( defaultServerPath )
                                       .arg( XdgBaseDirs::saveDir( "data", \
QLatin1String( "akonadi/db_data" ) ) ); @@ -130,7 +131,7 @@
 void DbConfigPostgresql::startInternalServer()
 {
   const QString dataDir = XdgBaseDirs::saveDir( "data", QLatin1String( \
                "akonadi/db_data" ) );
-  const QString socketDir = preferredSocketDirectory( XdgBaseDirs::saveDir( "data", \
QLatin1String( "akonadi/db_misc" ) ) ); +  const QString socketDir = \
Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( \
"akonadi/db_misc" ) ) );  
   if ( !QFile::exists( QString::fromLatin1( "%1/PG_VERSION" ).arg( dataDir ) ) ) {
     // postgres data directory not initialized yet, so call initdb on it
--- trunk/kdesupport/akonadi/server/src/utils.h #1184651:1184652
@@ -57,6 +57,12 @@
   }
 }
 
+/**
+ * Returns the socket @p directory that is passed to this method or the one
+ * the user has overwritten via the config file.
+ */
+QString preferredSocketDirectory( const QString &directory );
+
 }
 
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]