Merge pull request #53 from JesseMckinzie/get_regex_fix

Fix error when importing get_regex

Author: sameeul

src/filepattern/cpp/bindings.cpp

@@ -33,6 +33,7 @@ PYBIND11_MODULE(backend, m){
         .def("setGroup", py::overload_cast<const std::vector<std::string>&>(&FilePattern::setGroup))
         .def("setGroupStr",   py::overload_cast<std::string&>(&FilePattern::setGroup))
         .def("length", &FilePattern::length)
+        .def_static("getRegex", &FilePattern::getRegex)
         .def_static("inferPattern", py::overload_cast<const std::string&, std::string&, const std::string&>(&FilePattern::inferPattern))
         .def_static("inferPattern", py::overload_cast<std::vector<std::string>&, std::string&>(&FilePattern::inferPattern))
         .def("__iter__", [](FilePattern &v){

src/filepattern/cpp/include/filepattern.h

@@ -99,6 +99,8 @@ class FILEPATTERN_EXPORT FilePattern {
 
         std::pair<std::vector<std::pair<std::string, Types>> , std::vector<Tuple>> getGroupedSliceByIdx(int idx);
 
+        static std::string getRegex(std::string filepattern, bool suppress_warnings);
+
         std::string getPattern();
         void setPattern(std::string& pattern);
         std::string getPath();

src/filepattern/cpp/interface/filepattern.cpp

@@ -185,3 +185,7 @@ const std::unique_ptr<PatternObject>& FilePattern::getPatternObject() const{
 std::pair<std::vector<std::pair<std::string, Types>> , std::vector<Tuple>> FilePattern::getGroupedSliceByIdx(int idx) {
     return fp_->get_grouped_file_by_idx(idx);
 }
+
+std::string FilePattern::getRegex(std::string filepattern, bool suppress_warnings) {
+    return std::get<0>(Pattern::getRegex(filepattern, suppress_warnings));
+}

src/filepattern/functions.py

@@ -3,7 +3,7 @@
 # Reference/Functions
 
 
-def get_regex(filepattern: str, suppress_warnings=False) -> tuple:
+def get_regex(filepattern: str, suppress_warnings=False) -> str:
     """Returns the regex equivalent of the filepattern.
 
     Args:
@@ -14,8 +14,8 @@ def get_regex(filepattern: str, suppress_warnings=False) -> tuple:
         String containing the regex equivalent of the filepattern
 
     """
-    result = backend.FilePattern.getRegex(filepattern, suppress_warnings)
-    return result[0:2]
+    return backend.FilePattern.getRegex(filepattern, suppress_warnings)
+    
 
 
 def infer_pattern(

tests/test_filepattern.py

@@ -5,6 +5,16 @@
 import test_generate_filepattern_data
 import test_filepattern_data as fp_data
 
+class TestFilePatternFunctions():
+    
+    def test_get_regex(self):
+        
+        pattern = 'img_{row:c}{col:dd}f{f:dd}d{channel:d}.tif'
+
+        regex_pattern = fp.get_regex(pattern)
+        
+        assert regex_pattern == 'img_([a-zA-Z])([0-9][0-9])f([0-9][0-9])d([0-9]).tif'
+        
 
 class TestFilePattern():