Issue #117: introduce config MONITOR_SEC_DELAY_SCAN

Author: mbruel

ngPost.conf

@@ -56,6 +56,10 @@ nzbPath  = /tmp
 ## for monitoring, ignore new incoming folders
 #MONITOR_IGNORE_DIR = true
 
+## for monitoring, delay to check the size of an incoming file/folder to make sure it is fully arrived before posting it
+## must be between 1sec and 120sec (otherwise default: 1sec)
+MONITOR_SEC_DELAY_SCAN = 1
+
 
 ## Default folder to open to select files from the HMI
 inputDir = /tmp

src/FoldersMonitorForNewFiles.cpp

@@ -23,6 +23,9 @@
 #include <QDir>
 #include <QDateTime>
 #include <QThread>
+
+ulong FoldersMonitorForNewFiles::sMSleep = 1000; //!< 1sec in case we move file from samba or unrar when the system is quite loaded
+
 FoldersMonitorForNewFiles::FoldersMonitorForNewFiles(const QString &folderPath, QObject *parent) :
     QObject(parent), _monitor(), _stopListening(0x0)
 {

src/FoldersMonitorForNewFiles.h

@@ -47,12 +47,14 @@ class FoldersMonitorForNewFiles : public QObject
 {
     Q_OBJECT
 
+    friend class NgPost;
+
 private:
     QFileSystemWatcher          _monitor;        //!< monitor
     QMap<QString, FolderScan*>  _folders; //!< track files processed (their date might be > _lastCheck)
     AtomicBool                  _stopListening;
 
-    static const ulong sMSleep = 1000; //!< 1sec in case we move file from samba or unrar when the system is quite loaded
+    static ulong sMSleep;
 
 
 public:

src/NgPost.cpp

@@ -109,6 +109,7 @@ const QMap<NgPost::Opt, QString> NgPost::sOptionNames =
     {Opt::MONITOR_FOLDERS,    "monitor_nzb_folders"},
     {Opt::MONITOR_EXT,        "monitor_extensions"},
     {Opt::MONITOR_IGNORE_DIR, "monitor_ignore_dir"},
+    {Opt::MONITOR_SEC_DELAY_SCAN, "monitor_sec_delay_scan"},
 
     {Opt::MSG_ID,       "msg_id"},
     {Opt::META,         "meta"},
@@ -279,7 +280,7 @@ NgPost::NgPost(int &argc, char *argv[]):
     _autoDirs(),
     _folderMonitor(nullptr), _monitorThread(nullptr),
     _delAuto(false),
-    _monitor_nzb_folders(false), _monitorExtensions(), _monitorIgnoreDir(false),
+    _monitor_nzb_folders(false), _monitorExtensions(), _monitorIgnoreDir(false), _monitorSecDelayScan(1),
     _keepRar(false), _packAuto(false), _packAutoKeywords(),
     _lang("en"), _translators(),
     _netMgr(), _urlNzbUpload(nullptr), _urlNzbUploadStr(),
@@ -360,7 +361,7 @@ NgPost::NgPost(int &argc, char *argv[]):
 
 void NgPost::_startMonitoring(const QString &folderPath)
 {
-    qDebug() << "Start Monitoring " << folderPath;
+    qDebug() << "Start Monitoring " << folderPath << " (delay scan: " << FoldersMonitorForNewFiles::sMSleep << "ms)";
     _monitorThread = new QThread();
     _monitorThread->setObjectName("Monitoring");
     _folderMonitor = new FoldersMonitorForNewFiles(folderPath);
@@ -1419,7 +1420,8 @@ bool NgPost::parseCommandLine(int argc, char *argv[])
             }
             else
             {
-                _cout << "[FolderMonitor] " << tr("start monitoring: ") << fi.absoluteFilePath() << "\n" << MB_FLUSH;
+                _cout << "[FolderMonitor] " << tr("start monitoring: ") << fi.absoluteFilePath()
+                      << " (delay: " << FoldersMonitorForNewFiles::sMSleep << "ms)\n" << MB_FLUSH;
                 isMonitoring = true;
                 if (_folderMonitor)
                     _folderMonitor->addFolder(fi.absoluteFilePath());
@@ -1964,6 +1966,14 @@ QString NgPost::_parseConfig(const QString &configPath)
                         if (val == "true" || val == "on" || val == "1")
                             _monitorIgnoreDir = true;
                     }
+                    else if (opt == sOptionNames[Opt::MONITOR_SEC_DELAY_SCAN])
+                    {
+                        int nb = val.toInt(&ok);
+                        if (ok && nb > 1 && nb <= 120) {
+                            _monitorSecDelayScan = static_cast<ushort>(nb);
+                            FoldersMonitorForNewFiles::sMSleep = _monitorSecDelayScan * 1000;
+                        }
+                    }
                     else if (opt == sOptionNames[Opt::NZB_RM_ACCENTS])
                     {
                         val = val.toLower();
@@ -2459,7 +2469,8 @@ void NgPost::_dumpParams() const
 
              << "\ninputDir: " << _inputDir << ", autoDelete: " << _delAuto
              << ", packAutoKeywords:" << _packAutoKeywords << ", autoClose: " << _autoCloseTabs
-
+             << "\n, monitor delay: " << _monitorSecDelayScan << " ignore dir: " << _monitorIgnoreDir
+             << " ext: " << _monitorExtensions
              << "\n\nfrom: " << _from.c_str() << ", genFrom: " << _genFrom << ", saveFrom: " << _saveFrom
              << ", groups: " << _grpList.join(",")
              << " policy: " << sGroupPolicies[_groupPolicy].toUpper()
@@ -2566,6 +2577,9 @@ void NgPost::saveConfig()
                << "\n"
                << tr("## for monitoring, ignore new incoming folders") << "\n"
                << (_monitorIgnoreDir  ? "" : "#") << "MONITOR_IGNORE_DIR = true\n"
+               << tr("## for monitoring, delay to check the size of an incoming file/folder to make sure it is fully arrived before posting it") << "\n"
+               << tr("## must be between 1sec and 120sec (otherwise default: 1sec)") << "\n"
+               << "MONITOR_SEC_DELAY_SCAN = "  << _monitorSecDelayScan << "\n"
                << "\n\n"
                << tr("## Default folder to open to select files from the HMI") << "\n"
                << "inputDir = " << _inputDir << "\n"

src/NgPost.h

@@ -81,7 +81,7 @@ class NgPost : public QObject, public CmdOrGuiApp
                     DISP_PROGRESS, DEBUG, DEBUG_FULL, POST_HISTORY, FIELD_SEPARATOR, NZB_RM_ACCENTS,
                     RESUME_WAIT, NO_RESUME_AUTO, SOCK_TIMEOUT, PREPARE_PACKING,
                     INPUT, OUTPUT, NZB_PATH, THREAD, NZB_UPLOAD_URL, NZB_POST_CMD,
-                    MONITOR_FOLDERS, MONITOR_EXT, MONITOR_IGNORE_DIR,
+                    MONITOR_FOLDERS, MONITOR_EXT, MONITOR_IGNORE_DIR, MONITOR_SEC_DELAY_SCAN,
                     MSG_ID, META, ARTICLE_SIZE, FROM, GROUPS, NB_RETRY, GEN_FROM,
                     OBFUSCATE, INPUT_DIR, AUTO_DIR, MONITOR_DIR, DEL_AUTO,
                     TMP_DIR, RAR_PATH, RAR_EXTRA, RAR_SIZE, RAR_MAX, KEEP_RAR,
@@ -198,6 +198,7 @@ class NgPost : public QObject, public CmdOrGuiApp
     bool          _monitor_nzb_folders;
     QStringList   _monitorExtensions;
     bool          _monitorIgnoreDir;
+    ushort        _monitorSecDelayScan;
 
     bool          _keepRar;
     bool          _packAuto;