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

List:       kde-commits
Subject:    [messagelib] webengineviewer/src/checkphishingurl: Continue to improve localdatabasefile
From:       Montel Laurent <montel () kde ! org>
Date:       2016-11-22 21:32:37
Message-ID: E1c9Ig9-0007pT-1N () code ! kde ! org
[Download RAW message or body]

Git commit dc1e12fa644f4b26dae4ee2e6babfd9665d9a36d by Montel Laurent.
Committed on 22/11/2016 at 21:32.
Pushed by mlaurent into branch 'master'.

Continue to improve localdatabasefile

M  +1    -0    webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
 M  +30   -3    webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
M  +18   -0    webengineviewer/src/checkphishingurl/createdatabasefilejob.h
M  +10   -1    webengineviewer/src/checkphishingurl/localdatabasefile.cpp
M  +2    -0    webengineviewer/src/checkphishingurl/localdatabasefile.h

http://commits.kde.org/messagelib/dc1e12fa644f4b26dae4ee2e6babfd9665d9a36d

diff --git a/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp \
b/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp index \
                a8b10c8..fe1efc4 100644
--- a/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
@@ -36,6 +36,7 @@ void LocalDataBaseFileTest::shouldBeInvalidWithUnExistingFile()
 {
     WebEngineViewer::LocalDataBaseFile f(QStringLiteral("foo"));
     QVERIFY(!f.isValid());
+    QVERIFY(!f.fileExists());
 }
 
 QTEST_MAIN(LocalDataBaseFileTest)
diff --git a/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp \
b/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp index \
                d4b6b18..07aeee1 100644
--- a/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
+++ b/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
@@ -21,8 +21,10 @@
 
 using namespace WebEngineViewer;
 
+
 CreateDatabaseFileJob::CreateDatabaseFileJob(QObject *parent)
-    : QObject(parent)
+    : QObject(parent),
+      mActionType(Unknown)
 {
 
 }
@@ -34,15 +36,40 @@ CreateDatabaseFileJob::~CreateDatabaseFileJob()
 
 bool CreateDatabaseFileJob::canStart() const
 {
-    return !mFileName.isEmpty();
+    return !mFileName.isEmpty() && (mActionType != Unknown);
 }
 
 void CreateDatabaseFileJob::start()
 {
-    //TODO
+    if (!canStart()) {
+        Q_EMIT finished();
+        deleteLater();
+    } else {
+        if (mFile.open(QIODevice::WriteOnly)) {
+        } else {
+            Q_EMIT finished();
+            deleteLater();
+
+        }
+    }
 }
 
 void CreateDatabaseFileJob::setFileName(const QString &filename)
 {
     mFileName = filename;
 }
+
+void CreateDatabaseFileJob::createFile()
+{
+
+}
+
+void CreateDatabaseFileJob::updateFile()
+{
+
+}
+
+void CreateDatabaseFileJob::setActionType(const ActionType &actionType)
+{
+    mActionType = actionType;
+}
diff --git a/webengineviewer/src/checkphishingurl/createdatabasefilejob.h \
b/webengineviewer/src/checkphishingurl/createdatabasefilejob.h index 1b37d99..22fb3ea \
                100644
--- a/webengineviewer/src/checkphishingurl/createdatabasefilejob.h
+++ b/webengineviewer/src/checkphishingurl/createdatabasefilejob.h
@@ -22,6 +22,7 @@
 
 #include <QObject>
 #include "webengineviewer_export.h"
+#include <QFile>
 
 namespace WebEngineViewer
 {
@@ -29,13 +30,30 @@ class WEBENGINEVIEWER_EXPORT CreateDatabaseFileJob : public \
QObject  {
     Q_OBJECT
 public:
+    enum ActionType {
+        CreateFile = 0,
+        UpdateFile = 1,
+        Unknown = 2
+    };
+
     explicit CreateDatabaseFileJob(QObject *parent = Q_NULLPTR);
     ~CreateDatabaseFileJob();
     void start();
     void setFileName(const QString &filename);
     bool canStart() const;
+
+    void createFile();
+    void updateFile();
+
+    void setActionType(const ActionType &actionType);
+
+Q_SIGNALS:
+    void finished();
+
 private:
+    ActionType mActionType;
     QString mFileName;
+    QFile mFile;
 };
 }
 
diff --git a/webengineviewer/src/checkphishingurl/localdatabasefile.cpp \
b/webengineviewer/src/checkphishingurl/localdatabasefile.cpp index bf3d80d..67bfe3e \
                100644
--- a/webengineviewer/src/checkphishingurl/localdatabasefile.cpp
+++ b/webengineviewer/src/checkphishingurl/localdatabasefile.cpp
@@ -25,6 +25,9 @@
 
 using namespace WebEngineViewer;
 
+WEBENGINEVIEWER_EXPORT int webengineview_LocalDataBaseFile = 1000 * 60 * 60;
+
+
 class WebEngineViewer::LocalDataBaseFilePrivate
 {
 public:
@@ -137,7 +140,7 @@ QString LocalDataBaseFile::searchHash(int posListOffset, const \
QByteArray &hashT  bool LocalDataBaseFile::shouldCheck()
 {
     // 1 hours
-    if (d->mLastCheck.isValid() && d->mLastCheck.elapsed() < 1000 * 60 * 60)
+    if (d->mLastCheck.isValid() && d->mLastCheck.elapsed() < \
webengineview_LocalDataBaseFile)  return false;
     d->mLastCheck.start();
     return true;
@@ -157,3 +160,9 @@ bool LocalDataBaseFile::checkFileChanged()
     }
     return somethingChanged;
 }
+
+bool LocalDataBaseFile::fileExists() const
+{
+    QFileInfo fileInfo(d->mFile);
+    return fileInfo.exists();
+}
diff --git a/webengineviewer/src/checkphishingurl/localdatabasefile.h \
b/webengineviewer/src/checkphishingurl/localdatabasefile.h index 254dfd3..b5d9222 \
                100644
--- a/webengineviewer/src/checkphishingurl/localdatabasefile.h
+++ b/webengineviewer/src/checkphishingurl/localdatabasefile.h
@@ -34,6 +34,8 @@ public:
     LocalDataBaseFile(const QString &filename);
     ~LocalDataBaseFile();
 
+    bool fileExists() const;
+
     bool reload();
 
     bool isValid() const;


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