From e0cfa6cbd8c79a89e72376ab24ba7ace2cd6165b Mon Sep 17 00:00:00 2001
From: Phie <phie@phie.ovh>
Date: Thu, 15 Aug 2019 17:47:39 +0200
Subject: faster merge: ignore old db

---
 lib/Controller/NoteController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php
index c3e8429..99d0248 100755
--- a/lib/Controller/NoteController.php
+++ b/lib/Controller/NoteController.php
@@ -281,8 +281,9 @@
   public function mergeKeywordsDB() {
       $myDb = $this->getKeywordsDBFile();
       $hasChanged = false;
+      $lastmod = $myDb->getMTime(); 
       foreach($this->CarnetFolder->get("quickdoc/keywords/")->getDirectoryListing() as $inDB){
-          if($inDB->getName() === $myDb->getName()){
+          if($inDB->getName() === $myDb->getName()||$inDB->getMTime()<$lastmod){
               continue;
           }
           $myDbContent = json_decode($myDb->getContent());
@@ -331,9 +332,10 @@
       */
      public function mergeRecentDB() {
          $myDb = $this->getRecentFile();
+         $lastmod = $myDb->getMTime(); 
          $hasChanged = false;
          foreach($this->CarnetFolder->get("quickdoc/recentdb/")->getDirectoryListing() as $inDB){
-             if($inDB->getName() === $myDb->getName()){
+             if($inDB->getName() === $myDb->getName()||$inDB->getMTime()<$lastmod){
                  continue;
              }
              $myDbContent = json_decode($myDb->getContent());
-- 
cgit v1.2.3