Merge pull request #146 from fxdeniz/issue_145

Issue 145
fxdeniz · Sep 7, 2023 · 7d93897 · 7d93897
2 parents b9e9dcb + 54e0fe5
commit 7d93897
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 9 deletions.
diff --git a/Backend/FileMonitorSubSystem/FileSystemEventDb.cpp b/Backend/FileMonitorSubSystem/FileSystemEventDb.cpp
@@ -569,7 +569,7 @@ QStringList FileSystemEventDb::getMonitoredFolderPathList() const
     return result;
 }
 
-QStringList FileSystemEventDb::getActiveRootFolderList() const
+QStringList FileSystemEventDb::getMonitoredRootFolderList() const
 {
     QStringList result;
     QString columnName = "result_column";
@@ -599,6 +599,39 @@ QStringList FileSystemEventDb::getActiveRootFolderList() const
     return result;
 }
 
+QStringList FileSystemEventDb::getMissingRootFolderList() const
+{
+    QStringList result;
+    QString columnName = "result_column";
+
+    QString queryTemplate = " SELECT f1.folder_path AS %1"
+                            " FROM Folder f1 "
+                            " WHERE f1.parent_folder_path IN ("
+                            "                                   SELECT f2.folder_path "
+                            "                                   FROM Folder f2 "
+                            "                                   WHERE f2.efsw_id IS NULL AND f2.status = :1"
+                            "                                 )"
+                            " AND f1.efsw_id IS NULL"
+                            " AND f1.status = :2 ;" ;
+
+    queryTemplate = queryTemplate.arg(columnName);
+
+    QSqlQuery query(database);
+    query.prepare(queryTemplate);
+    query.bindValue(":1", FileSystemEventDb::ItemStatus::Monitored);
+    query.bindValue(":2", FileSystemEventDb::ItemStatus::Missing);
+    query.exec();
+
+    while(query.next())
+    {
+        QSqlRecord record = query.record();
+        QString item = record.value(columnName).toString();
+        result.append(item);
+    }
+
+    return result;
+}
+
 QStringList FileSystemEventDb::getDirectChildFolderListOfFolder(const QString pathToFolder) const
 {
     QStringList result;

diff --git a/Backend/FileMonitorSubSystem/FileSystemEventDb.h b/Backend/FileMonitorSubSystem/FileSystemEventDb.h
@@ -42,7 +42,8 @@ class FileSystemEventDb
     QString getOldNameOfFolder(const QString &pathToFolder) const;
     QString getOldNameOfFile(const QString &pathToFile) const;
     QStringList getMonitoredFolderPathList() const;
-    QStringList getActiveRootFolderList() const;
+    QStringList getMonitoredRootFolderList() const;
+    QStringList getMissingRootFolderList() const;
     QStringList getDirectChildFolderListOfFolder(const QString pathToFolder) const;
     QStringList getDirectChildFileListOfFolder(const QString &pathToFolder) const;
     QStringList getEventfulFileListOfFolder(const QString &pathToFolder) const;

diff --git a/Gui/DataModels/TabFileMonitor/TreeModelFileMonitor.cpp b/Gui/DataModels/TabFileMonitor/TreeModelFileMonitor.cpp
@@ -249,7 +249,8 @@ int Model::rowCount(const QModelIndex &parent) const
 
 void Model::setupModelData()
 {
-    QStringList rootFolders = fsEventDb->getActiveRootFolderList();
+    QStringList rootFolders = fsEventDb->getMonitoredRootFolderList();
+    rootFolders.append(fsEventDb->getMissingRootFolderList());
 
     for(const QString &currentRootFolderPath : rootFolders)
     {

diff --git a/Gui/MainWindow.cpp b/Gui/MainWindow.cpp
@@ -278,7 +278,7 @@ void MainWindow::on_menuAction_DebugFileMonitor_triggered()
 void MainWindow::on_menuAction_AboutApp_triggered()
 {
     QString title = tr("About NeSync");
-    QString message = tr("<center><h1>NeSync 1.8.0 [Pre-Alpha]</h1><center/>"
+    QString message = tr("<center><h1>NeSync 1.8.1 [Pre-Alpha]</h1><center/>"
                          "<hr>"
                          "Thanks for using NeSync.<br>"
                          "This is a <b>pre-alpha version</b>, <b>DO NOT USE</b> for critical things.<br>"

diff --git a/Installer/nsis_script.nsi b/Installer/nsis_script.nsi
@@ -11,7 +11,7 @@ Unicode True
 !define APP_NAME "NeSync"
 !define COMP_NAME "Deniz Yilmazok (github.com/fxdeniz)"
 !define WEB_SITE "github.com/fxdeniz/NeSync"
-!define VERSION "1.8.0.0"
+!define VERSION "1.8.1.0"
 !define COPYRIGHT "2023 - Deniz Yilmazok, GPLv3"
 !define DESCRIPTION "NeSync Installer"
 !define INSTALLER_NAME "${BIN_SOURCE_DIR}\nesync_${VERSION}_win64_setup.exe"

diff --git a/Resources/res_win.rc b/Resources/res_win.rc
@@ -3,8 +3,8 @@
 IDI_ICON1               ICON    "app_icon.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,0
- PRODUCTVERSION 1,8,0,0
+ FILEVERSION 1,8,1,0
+ PRODUCTVERSION 1,8,1,0
  FILEFLAGS 0x0L
  FILEFLAGSMASK 0x3fL
  FILEOS 0x00040004L
@@ -17,12 +17,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Deniz Yilmazok (github.com/fxdeniz)"
             VALUE "FileDescription", "NeSync - Local file sync & backups"
-            VALUE "FileVersion", "1.8.0.0"
+            VALUE "FileVersion", "1.8.1.0"
             VALUE "LegalCopyright", "2023 - Deniz Yilmazok, GPLv3"
             VALUE "InternalName", "NeSync"
             VALUE "OriginalFilename", "NeSync.exe"
             VALUE "ProductName", "NeSync"
-            VALUE "ProductVersion", "1.8.0.0"
+            VALUE "ProductVersion", "1.8.1.0"
         END
     END
     BLOCK "VarFileInfo"