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

List:       kde-commits
Subject:    [messagelib] webengineviewer/src/checkphishingurl: Reload file when it was checked on disk
From:       Montel Laurent <montel () kde ! org>
Date:       2016-11-29 6:29:16
Message-ID: E1cBbum-0000Vk-Tg () code ! kde ! org
[Download RAW message or body]

Git commit 86aa039d199e4d18a427508dd5df4ffe60ccc657 by Montel Laurent.
Committed on 29/11/2016 at 06:28.
Pushed by mlaurent into branch 'master'.

Reload file when it was checked on disk

M  +8    -1    webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
M  +1    -0    webengineviewer/src/checkphishingurl/updatedatabaseinfo.cpp

https://commits.kde.org/messagelib/86aa039d199e4d18a427508dd5df4ffe60ccc657

diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp index \
                0adbf86..8cb4f0f 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
@@ -22,6 +22,7 @@
 #include "createphishingurldatabasejob.h"
 #include "createdatabasefilejob.h"
 #include "checkphishingurlutil.h"
+#include "localdatabasefile.h"
 
 #include <KConfigGroup>
 #include <KSharedConfig>
@@ -52,7 +53,8 @@ class WebEngineViewer::LocalDataBaseManagerPrivate
 {
 public:
     LocalDataBaseManagerPrivate()
-        : mDataBaseOk(false),
+        : mFile(databaseFullPath()),
+          mDataBaseOk(false),
           mDownloadProgress(false)
     {
         QDir().mkpath(localDataBasePath());
@@ -65,6 +67,7 @@ public:
 
     void readConfig();
     void saveConfig();
+    LocalDataBaseFile mFile;
     QString mNewClientState;
     bool mDataBaseOk;
     bool mDownloadProgress;
@@ -225,6 +228,10 @@ void LocalDataBaseManager::checkUrl(const QUrl &url)
         Q_EMIT checkUrlFinished(url, \
WebEngineViewer::LocalDataBaseManager::Unknown);  #endif
     } else {
+        qCWarning(WEBENGINEVIEWER_LOG) << "Database not ok";
         Q_EMIT checkUrlFinished(url, \
WebEngineViewer::LocalDataBaseManager::Unknown);  }
+    if (d->mFile.checkFileChanged()) {
+        d->mFile.reload();
+    }
 }
diff --git a/webengineviewer/src/checkphishingurl/updatedatabaseinfo.cpp \
b/webengineviewer/src/checkphishingurl/updatedatabaseinfo.cpp index fbde04d..7c2ab5b \
                100644
--- a/webengineviewer/src/checkphishingurl/updatedatabaseinfo.cpp
+++ b/webengineviewer/src/checkphishingurl/updatedatabaseinfo.cpp
@@ -116,6 +116,7 @@ bool Addition::isValid() const
         return false;
     }
     if ((hashString.size() % static_cast<int>(prefixSize)) != 0) {
+        qDebug()<< " hashString.size() "<< hashString.size() << "prefixSize \
                "<<prefixSize;
         qCWarning(WEBENGINEVIEWER_LOG) << "it's not a correct hash value";
         return false;
     }


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