From 65439b57cc50240023f2a0a3b9d6dfed3ddf52cd Mon Sep 17 00:00:00 2001
From: Stephane Leduc <stephane.leduc@b-com.com>
Date: Tue, 18 Jul 2023 09:03:42 +0200
Subject: [PATCH] fix: #6 - ignore remaken cache for conan dependencies and fix
 empty lines in .remaken-cache

---
 src/Cache.cpp                      | 4 +++-
 src/managers/DependencyManager.cpp | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Cache.cpp b/src/Cache.cpp
index 2a1147f..8cbb82d 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -62,7 +62,9 @@ void Cache::load() {
             while (!fis.eof()) {
                 string curStr;
                 getline(fis,curStr);
-                m_cachedUrls.push_back(curStr);
+                if (!curStr.empty()) {
+                    m_cachedUrls.push_back(curStr);
+                }
             }
             fis.close();
             m_loaded = true;
diff --git a/src/managers/DependencyManager.cpp b/src/managers/DependencyManager.cpp
index de05b93..0b1de3e 100755
--- a/src/managers/DependencyManager.cpp
+++ b/src/managers/DependencyManager.cpp
@@ -153,7 +153,7 @@ bool DependencyManager::installDep(Dependency &  dependency, const std::string &
         withHeaders = fs::exists(outputDirectory/Constants::PKGINFO_FOLDER/".headers");
     }
 
-    if (dependency.getType() != Dependency::Type::REMAKEN) {
+    if (dependency.getType() != Dependency::Type::REMAKEN && dependency.getType() != Dependency::Type::CONAN) {
         if (m_options.useCache()) {
             if (!m_cache.contains(source)) {
                 return true;
@@ -256,8 +256,10 @@ void DependencyManager::retrieveDependency(Dependency &  dependency, DependencyF
                 }
             }
             std::cout<<"===> "<<dependency.getName()<<" installed in "<<outputDirectory<<std::endl;
-            if (m_options.useCache()) {
-                m_cache.add(source);
+            if (dependency.getType() != Dependency::Type::CONAN) {
+                if (m_options.useCache()) {
+                    m_cache.add(source);
+                }
             }
         }
         catch (const std::runtime_error & e) {