initialize profiles in sorted order and log protocol names

d99kris · Apr 21, 2024 · 47b40e9 · 47b40e9
1 parent dc6f18f
commit 47b40e9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "4.70"
+#define NCHAT_VERSION "4.71"
diff --git a/lib/duchat/src/duchat.cpp b/lib/duchat/src/duchat.cpp
@@ -64,6 +64,7 @@ bool DuChat::SetupProfile(const std::string& p_ProfilesDir, std::string& p_Profi
 
 bool DuChat::LoadProfile(const std::string& p_ProfilesDir, const std::string& p_ProfileId)
 {
+  LOG_INFO("load dummy profile");
   (void)p_ProfilesDir;
   m_ProfileId = p_ProfileId;
   return true;

diff --git a/lib/tgchat/src/tgchat.cpp b/lib/tgchat/src/tgchat.cpp
@@ -329,6 +329,8 @@ bool TgChat::Impl::SetupProfile(const std::string& p_ProfilesDir, std::string& p
 
 bool TgChat::Impl::LoadProfile(const std::string& p_ProfilesDir, const std::string& p_ProfileId)
 {
+  LOG_INFO("load telegram profile");
+
   m_ProfileDir = p_ProfilesDir + "/" + p_ProfileId;
   m_ProfileId = p_ProfileId;
   MessageCache::AddProfile(m_ProfileId, true, s_CacheDirVersion, false);

diff --git a/lib/wmchat/src/wmchat.cpp b/lib/wmchat/src/wmchat.cpp
@@ -115,6 +115,8 @@ bool WmChat::SetupProfile(const std::string& p_ProfilesDir, std::string& p_Profi
 
 bool WmChat::LoadProfile(const std::string& p_ProfilesDir, const std::string& p_ProfileId)
 {
+  LOG_INFO("load whatsapp profile");
+
   if (!p_ProfilesDir.empty() && !p_ProfileId.empty())
   {
     m_ProfileDir = p_ProfilesDir + "/" + p_ProfileId;

diff --git a/src/main.cpp b/src/main.cpp
@@ -365,11 +365,14 @@ int main(int argc, char* argv[])
   bool hasProtocols = !protocols.empty();
   if (hasProtocols && exportDir.empty())
   {
+    // Sort protocols
+    std::map<std::string, std::shared_ptr<Protocol>> protocolsSorted(protocols.begin(), protocols.end());
+
     // Login
     Status::Set(Status::FlagConnecting);
     std::thread loginThread([&]
     {
-      for (auto& protocol : protocols)
+      for (auto& protocol : protocolsSorted)
       {
         protocol.second->SetMessageHandler(messageHandler);
         protocol.second->Login();
@@ -386,7 +389,7 @@ int main(int argc, char* argv[])
     }
 
     // Logout
-    for (auto& protocol : protocols)
+    for (auto& protocol : protocolsSorted)
     {
       protocol.second->Logout();
       protocol.second->CloseProfile();

diff --git a/src/nchat.1 b/src/nchat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "April 2024" "nchat v4.70" "User Commands"
+.TH NCHAT "1" "April 2024" "nchat v4.71" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS