Update to use second constructor for list of strings

Author: JesseMckinzie

src/filepattern/cpp/bindings.cpp

@@ -23,8 +23,11 @@ PYBIND11_MODULE(backend, m){
                       const std::string&, 
                       const std::string&,  
                       bool, 
+                      bool>())
+        .def(py::init<const std::vector<std::string>&,
+                      const std::string&, 
                       bool, 
-                      const std::vector<std::string>&>())
+                      bool>())
         .def("getMatching", &FilePattern::getMatching)
         .def("getOccurrences", &FilePattern::getOccurrences)
         .def("getUniqueValues", &FilePattern::getUniqueValues)

src/filepattern/cpp/interface/filepattern.cpp

@@ -4,11 +4,11 @@
 
 #include <tuple>
 
-FilePattern::FilePattern(const std::string& path, const std::string& filePattern, const std::string& block_size, bool recursive, bool suppressWarnings, const std::vector<std::string>& file_array) {
+FilePattern::FilePattern(const std::string& path, const std::string& filePattern, const std::string& block_size, bool recursive, bool suppressWarnings) {
 
     FilePatternFactory fpf = FilePatternFactory();
 
-    this->fp_ = std::unique_ptr<PatternObject>(fpf.getObject(path, filePattern, block_size, recursive, suppressWarnings, file_array));
+    this->fp_ = std::unique_ptr<PatternObject>(fpf.getObject(path, filePattern, block_size, recursive, suppressWarnings, std::vector<std::string>{}));
 
     if (block_size != "") {
         this->fp_->external = true;

src/filepattern/filepattern.py

@@ -409,10 +409,10 @@ def __init__(
         """
 
         if (isinstance(input, list)):
-            self._file_pattern = backend.FilePattern("", pattern, block_size, recursive, suppress_warnings, input)
+            self._file_pattern = backend.FilePattern(input, pattern, recursive, suppress_warnings)
         elif (isinstance(input, str) or isinstance(input, Path)):
             input = str(input)  # change path type to string to support pathlib paths
-            self._file_pattern = backend.FilePattern(input, pattern, block_size, recursive, suppress_warnings, [])
+            self._file_pattern = backend.FilePattern(input, pattern, block_size, recursive, suppress_warnings)
         else:
             raise TypeError("Error: input type must either be a string/path to a file or directory or a list of strings")
 

src/filepattern/java/FilePattern.java

@@ -35,7 +35,7 @@
  */
 public class FilePattern implements Iterable{
 
-    private FilePatternBindings.FilePatternJava fp;
+    private FilePatternBindings.FilePattern fp;
     private FilePatternBuilder builder;
     private boolean external;
     private ArrayList<String> groups = new ArrayList<>();
@@ -90,7 +90,7 @@ public FilePattern build() throws IOException {
     private FilePattern(FilePatternBuilder builder) throws IOException {
 
         this.builder = builder;
-        this.fp = new FilePatternBindings.FilePatternJava(builder.path, builder.filePattern, builder.blockSize, builder.recursive, builder.suppressWarnings); // need to add builder to FPOjbect
+        this.fp = new FilePatternBindings.FilePattern(builder.path, builder.filePattern, builder.blockSize, builder.recursive, builder.suppressWarnings); // need to add builder to FPOjbect
 
     }
 

src/filepattern/java/FilePatternBindings.java

@@ -52,7 +52,7 @@
                 "../cpp/external/external_stringpattern.hpp",
                 "../cpp/external/external_vectorpattern.cpp",
                 "../cpp/external/external_vectorpattern.hpp",
-                "filepattern.h",
+                "../cpp/include/filepattern.h",
                 "../cpp/interface/filepattern.cpp",
                 "../cpp/pattern_object.hpp",
                 "../cpp/util/util.hpp",
@@ -827,11 +827,11 @@ public static class VariantVector extends Pointer {
         public native @Cast("bool") boolean empty();
     }
 
-    public static class FilePatternJava extends Pointer{
+    public static class FilePattern extends Pointer{
 
         static { Loader.load(); }
 
-        public FilePatternJava(String path, String filePattern, String blockSize, boolean recursive, boolean suppress_warnings) {
+        public FilePattern(String path, String filePattern, String blockSize, boolean recursive, boolean suppress_warnings) {
             allocate(path, filePattern, blockSize, recursive, suppress_warnings);
         }