summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHamilton Kibbe <hamilton.kibbe@gmail.com>2018-06-27 12:31:00 -0500
committerGitHub <noreply@github.com>2018-06-27 12:31:00 -0500
commit7c20bd369911780b43dcd894e9c089e7b2cb51cb (patch)
treec4a781ee07ff29e2ffbb68fb54ae4f19adbb6aa0
parent66a1a1ca69e2355ee0c1b146dafdd769353c9666 (diff)
parent8dd8a87fc0fddadd590c926afe6928958d78839a (diff)
downloadgerbonara-7c20bd369911780b43dcd894e9c089e7b2cb51cb.tar.gz
gerbonara-7c20bd369911780b43dcd894e9c089e7b2cb51cb.tar.bz2
gerbonara-7c20bd369911780b43dcd894e9c089e7b2cb51cb.zip
Merge pull request #87 from ju5t/full-filename-regex
Match full filename instead of the base name
-rw-r--r--gerber/layers.py6
-rw-r--r--gerber/tests/test_layers.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/gerber/layers.py b/gerber/layers.py
index c80baa4..5c26412 100644
--- 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
index 597c0d3..3a21a2c 100644
--- 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=[]
),
]