fdsdump: get rid of FileList component

Author: sedmicha

src/tools/fdsdump/src/aggregator/mode.cpp

@@ -42,7 +42,7 @@ mode_aggregate(const Options &opts)
         flows.set_filter(opts.get_input_filter());
     }
 
-    for (const auto &it : opts.get_input_files()) {
+    for (const auto &it : glob_files(opts.get_input_file_patterns())) {
         flows.add_file(it);
     }
 

src/tools/fdsdump/src/common/CMakeLists.txt

@@ -4,7 +4,6 @@ set(COMMON_SRC
     common.cpp
     field.cpp
     fieldView.cpp
-    filelist.cpp
     flowProvider.cpp
     ipaddr.cpp
     ieMgr.cpp

src/tools/fdsdump/src/common/filelist.cpp

@@ -8,6 +8,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <common/common.hpp>
 #include <lister/lister.hpp>
 #include <lister/printer.hpp>
 #include <lister/storageSorted.hpp>
@@ -75,7 +76,7 @@ mode_list(const Options &opts)
         flows.set_filter(opts.get_input_filter());
     }
 
-    for (const auto &it : opts.get_input_files()) {
+    for (const auto &it : glob_files(opts.get_input_file_patterns())) {
         flows.add_file(it);
     }
 

src/tools/fdsdump/src/common/filelist.hpp

@@ -15,7 +15,6 @@
 #include <libfds.h>
 
 #include <common/common.hpp>
-#include <common/filelist.hpp>
 #include <lister/lister.hpp>
 #include <aggregator/mode.hpp>
 #include <statistics/mode.hpp>

src/tools/fdsdump/src/lister/lister.cpp

@@ -53,7 +53,7 @@ void Options::reset()
     m_help_flag = false;
     m_mode = Mode::undefined;
 
-    m_input_files.clear();
+    m_input_file_patterns.clear();
     m_input_filter.clear();
 
     m_output_limit = 0;
@@ -103,9 +103,7 @@ void Options::parse(int argc, char *argv[])
 	}
 
 	if (args.has('r')) {
-		for (const auto &arg : args.get_all('r')) {
-			m_input_files.add_files(arg);
-		}
+        m_input_file_patterns = args.get_all('r');
 	}
 
 	if (args.has('c')) {

src/tools/fdsdump/src/main.cpp

@@ -12,10 +12,9 @@
 
 #include <cstddef>
 #include <string>
+#include <vector>
 #include <stdexcept>
 
-#include <common/filelist.hpp>
-
 namespace fdsdump {
 
 class OptionsException : public std::invalid_argument {
@@ -69,8 +68,8 @@ class Options {
 
     const Mode &get_mode() const { return m_mode; };
 
-    /** @brief Get list of files to process.             */
-    const FileList &get_input_files() const { return m_input_files; };
+    /** @brief Get list of provided file patterns to process.             */
+    const std::vector<std::string> &get_input_file_patterns() const { return m_input_file_patterns; };
     /** @brief Get input flow filter.                    */
     const std::string &get_input_filter() const { return m_input_filter; };
 
@@ -95,7 +94,7 @@ class Options {
 
     bool m_help_flag;
 
-    FileList    m_input_files;
+    std::vector<std::string> m_input_file_patterns;
     std::string m_input_filter;
 
     size_t      m_output_limit;

src/tools/fdsdump/src/options.cpp

@@ -9,6 +9,7 @@
 
 #include <iostream>
 
+#include <common/common.hpp>
 #include <common/flowProvider.hpp>
 
 #include <statistics/mode.hpp>
@@ -48,7 +49,7 @@ void
 mode_statistics(const Options &opts)
 {
     auto printer = printer_factory(opts.get_output_specifier());
-    const FileList &file_names = opts.get_input_files();
+	std::vector<std::string> file_names = glob_files(opts.get_input_file_patterns());
     unique_file file {nullptr, &fds_file_close};
     fds_file_stats stats {};