Honor environment variable KRAFT_DATA_DIR

If this is set Kraft looks for Kraft2.ini in that to find the current
dir. Should make synced environments easier to handle.

Fixes #267

Author: dragotin

src/addressproviderakonadi.cpp

@@ -52,7 +52,7 @@ bool AddressProviderAkonadi::init()
         // See https://invent.kde.org/pim/akonadi/-/merge_requests/189
         qDebug() << "Akonadi broken: " << Akonadi::ServerManager::brokenReason();
     } else if (Akonadi::ServerManager::state() == Akonadi::ServerManager::Running) {
-        qDebug() << "** Akonadi is already running";
+        // qDebug() << "** Akonadi is already running";
         mSession = Session::defaultSession();
         _akonadiUp = true;
     } else if (Akonadi::Control::start()) {

src/defaultprovider.cpp

@@ -70,17 +70,37 @@ bool writeSyncedSettingsCurrDir(const QString basePath, const QString& currKraft
 // link is pointing to a valid directory
 QString polishedBaseDir()
 {
-
     QString re;
-    const QString base = KraftSettings::self()->kraftV2BaseDir();
+    QString base; // the base directory
+
+    auto checkBase = [](const QString& b) {
+        QFileInfo fi(b);
+        return (fi.exists() && fi.isDir() && fi.isWritable());
+    };
+
+    // the environment variable KRAFT_DATA_DIR has precedence.
+    const QString envBase = qgetenv("KRAFT_DATA_DIR");
+    if (!envBase.isEmpty()) {
+        if (checkBase(envBase)) {
+            base = envBase;
+            qDebug() << "Kraft data dir from Environment:" << base;
+        }
+    }
+
     if (base.isEmpty()) {
-        qDebug() << "No v2 base dir in config file";
+        const auto settingsBase = KraftSettings::self()->kraftV2BaseDir();
+        if (checkBase(settingsBase)) {
+            base = settingsBase;
+        }
+    }
+
+    if (base.isEmpty()) {
+        qDebug() << "No v2 base dir in config file or via KRAFT_DATA_DIR env var";
         return QString();
     }
 
     QFileInfo fiLink(base, "current");
-
-    if (fiLink.isSymLink()) {  // Migrate oder pre-Kraft 2.0 installations
+    if (fiLink.isSymLink()) {  // Migrate pre-Kraft 2.0 installations which used a current-link
         QFileInfo fiTarget(fiLink.symLinkTarget()); // full path
 
         // write the settings file

src/myidentity.cpp

@@ -112,7 +112,6 @@ void MyIdentity::load()
     } else {
         // check if the vcard can be read
 
-        _source = Source::Manual;
         const QString file = identityFile();
         qDebug() << "looking up my identity in vcard file"<< file;
         QFile f(file);
@@ -126,9 +125,11 @@ void MyIdentity::load()
                     contact = list.at(0);
                     contact.insertCustom(CUSTOM_ADDRESS_MARKER, "manual");
                 }
+                _source = Source::Manual;
             }
         } else {
             qDebug() << "VCard file does not exist!";
+            _source = Source::Unknown;
         }
         slotAddresseeFound(myUid, contact);
     }

src/portal.cpp

@@ -136,7 +136,6 @@ void Portal::show()
     slotStartupChecks();
 
     if ( mCmdLineArgs ) {
-        slotStatusMsg( i18n( "Check commandline actions" ) );
         const QString uuid = mCmdLineArgs->value("d");
         if ( ! uuid.isEmpty() ) {
             slotPrintPDF(uuid);
@@ -500,14 +499,13 @@ void Portal::slotReceivedMyAddress( const QString& uid, const KContacts::Address
             const QString err = _myIdentity.errorMsg(uid);
             qDebug () << "My-Contact could not be found:" << err;
         }
-        return;
     }
 
     QString name = contact.formattedName();
     if( !name.isEmpty() ) {
         name = i18n("Welcome to Kraft, %1", name);
-        statusBar()->showMessage(name, 30*1000);
     }
+    slotStatusMsg(name);
 }
 
 bool Portal::queryClose()