Merge pull request #87 from ju5t/full-filename-regex

Match full filename instead of the base name
curtacircuitos · Jun 27, 2018 · 7c20bd3 · 7c20bd3
2 parents 66a1a1c + 8dd8a87
commit 7c20bd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gerber/layers.py b/gerber/layers.py
@@ -122,11 +122,11 @@ def guess_layer_class(filename):
         pass
 
     try:
-        directory, name = os.path.split(filename)
-        name, ext = os.path.splitext(name.lower())
+        directory, filename = os.path.split(filename)
+        name, ext = os.path.splitext(filename.lower())
         for hint in hints:
             if hint.regex:
-                if re.findall(hint.regex, name, re.IGNORECASE):
+                if re.findall(hint.regex, filename, re.IGNORECASE):
                     return hint.layer
 
             patterns = [r'^(\w*[.-])*{}([.-]\w*)?$'.format(x) for x in hint.name]

diff --git a/gerber/tests/test_layers.py b/gerber/tests/test_layers.py
@@ -61,7 +61,7 @@ def test_guess_layer_class_regex():
         Hint(layer='top',
                 ext=[],
                 name=[],
-                regex=r'(.*)(\scopper top|\stop copper)$',
+                regex=r'(.*)(\scopper top|\stop copper).gbr',
                 content=[]
             ),
     ]