store filesize in pipeFile map

Author: ludviggunne

cli/processexecutor.cpp

@@ -242,7 +242,7 @@ unsigned int ProcessExecutor::check()
 
     std::list<int> rpipes;
     std::map<pid_t, std::string> childFile;
-    std::map<int, std::string> pipeFile;
+    std::map<int, std::pair<std::string, std::size_t>> pipeFile;
     std::size_t processedsize = 0;
     std::list<FileWithDetails>::const_iterator iFile = mFiles.cbegin();
     std::list<FileSettings>::const_iterator iFileSettings = mFileSettings.cbegin();
@@ -301,11 +301,11 @@ unsigned int ProcessExecutor::check()
             rpipes.push_back(pipes[0]);
             if (iFileSettings != mFileSettings.end()) {
                 childFile[pid] = iFileSettings->filename() + ' ' + iFileSettings->cfg;
-                pipeFile[pipes[0]] = iFileSettings->filename() + ' ' + iFileSettings->cfg;
+                pipeFile[pipes[0]] = { iFileSettings->filename() + ' ' + iFileSettings->cfg, iFileSettings->filesize() };
                 ++iFileSettings;
             } else {
                 childFile[pid] = iFile->path();
-                pipeFile[pipes[0]] = iFile->path();
+                pipeFile[pipes[0]] = { iFile->path(), iFile->size() };
                 ++iFile;
             }
         }
@@ -324,28 +324,16 @@ unsigned int ProcessExecutor::check()
                 while (rp != rpipes.cend()) {
                     if (FD_ISSET(*rp, &rfds)) {
                         std::string name;
-                        const std::map<int, std::string>::const_iterator p = pipeFile.find(*rp);
+                        std::size_t size = 0;
+                        const std::map<int, std::pair<std::string, std::size_t>>::const_iterator p = pipeFile.find(*rp);
                         if (p != pipeFile.cend()) {
-                            name = p->second;
+                            name = p->second.first;
+                            size = p->second.second;
                         }
                         const bool readRes = handleRead(*rp, result, name);
                         if (!readRes) {
-                            std::size_t size = 0;
                             if (p != pipeFile.cend()) {
                                 pipeFile.erase(p);
-                                const auto fs = std::find_if(mFileSettings.cbegin(), mFileSettings.cend(), [&name](const FileSettings& entry) {
-                                    return name.find(entry.filename() + " ") == 0;
-                                });
-                                if (fs == mFileSettings.cend()) {
-                                    const auto fwd = std::find_if(mFiles.cbegin(), mFiles.cend(), [&name](const FileWithDetails &entry) {
-                                        return name.find(entry.path() + " ") == 0;
-                                    });
-                                    if (fwd != mFiles.cend()) {
-                                        size = fwd->size();
-                                    }
-                                } else {
-                                    size = fs->filesize();
-                                }
                             }
 
                             fileCount++;