Merge pull request #33 from einarf/mat-name-spaces

Make dir available as instance attribute + tests

Author: Kurt Yoder

README.md

@@ -78,6 +78,7 @@ Contributors
 
 * Daniel Coelho
 * dav92lee
+* Einar Forselv
 * Jerek Shoemaker
 * Kurt Yoder
 * Marxlp

pywavefront/__init__.py

@@ -31,14 +31,17 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # ----------------------------------------------------------------------------
+import os
 
 import pywavefront.material
 import pywavefront.mesh
 import pywavefront.parser
 
+
 class PywavefrontException(Exception):
     pass
 
+
 class Wavefront(object):
     """Import a wavefront .obj file."""
     def __init__(self, file_name):
@@ -58,18 +61,20 @@ def add_mesh(self, the_mesh):
         self.mesh_list.append(the_mesh)
         self.meshes[the_mesh.name] = the_mesh
 
+
 class ObjParser(parser.Parser):
     """This parser parses lines from .obj files."""
+
     def __init__(self, wavefront, file_name):
-        # unfortunately we can't escape from external effects on the
-        # wavefront object
+        super(ObjParser, self).__init__(file_name)
         self.wavefront = wavefront
+
         self.mesh = None
         self.material = None
         self.vertices = [[0., 0., 0.]]
         self.normals = [[0., 0., 0.]]
         self.tex_coords = [[0., 0.]]
-        self.read_file(file_name)
+        self.read_file()
 
     # methods for parsing types of wavefront lines
     def parse_v(self, args):
@@ -82,7 +87,7 @@ def parse_vt(self, args):
         self.tex_coords.append(list(map(float, args[0:2])))
 
     def parse_mtllib(self, args):
-        [mtllib] = args
+        mtllib = os.path.join(self.dir, " ".join(args))
         materials = material.MaterialParser(mtllib).materials
         for material_name, material_object in materials.items():
             self.wavefront.materials[material_name] = material_object
@@ -121,7 +126,6 @@ def parse_f(self, args):
         # For fan triangulation, remember first and latest vertices
         v1 = None
         vlast = None
-        points = []
         for i, v in enumerate(args[0:]):
             if type(v) is bytes:
                 v = v.decode()

pywavefront/material.py

@@ -31,6 +31,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # ----------------------------------------------------------------------------
+import os
 
 import pywavefront.parser as parser
 import pywavefront.texture as texture
@@ -97,9 +98,10 @@ class MaterialParser(parser.Parser):
     """Object to parse lines of a materials definition file."""
 
     def __init__(self, file_path):
+        super(MaterialParser, self).__init__(file_path)
         self.materials = {}
         self.this_material = None
-        self.read_file(file_path)
+        self.read_file()
 
     def parse_newmtl(self, args):
         [newmtl] = args
@@ -127,7 +129,7 @@ def parse_d(self, args):
         self.this_material.set_alpha(d)
 
     def parse_map_Kd(self, args):
-        [Kd] = args
+        Kd = os.path.join(self.dir, " ".join(args))
         self.this_material.set_texture(Kd)
 
     def parse_Ni(self, args):

pywavefront/parser.py

@@ -31,21 +31,25 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # ----------------------------------------------------------------------------
-
 import os
 import logging
 
+
 class Parser(object):
     """This defines a generalized parse dispatcher; all parse functions
     reside in subclasses."""
     strict = False
 
-    def read_file(self, file_name):
-        with open(file_name, 'r') as file:
+    def __init__(self, file_name):
+        self.file_name = file_name
+        self.dir = os.path.dirname(file_name)
+
+    def read_file(self):
+        with open(self.file_name, 'r') as file:
             for line in file:
-                self.parse(line, dir=os.path.dirname(file_name))
+                self.parse(line)
 
-    def parse(self, line, dir):
+    def parse(self, line):
         """Determine what type of line we are and dispatch
         appropriately."""
         if line.startswith('#'):
@@ -57,14 +61,6 @@ def parse(self, line, dir):
 
         line_type = values[0]
         args = values[1:]
-        i = 0
-        for arg in args:
-            if dir != '' and ('mtllib' in line or 'map_Kd' in line):
-                args[i] = dir + '/' + arg
-            else:
-                args[i] = arg
-            i += 1
-
         attrib = 'parse_%s' % line_type
 
         if Parser.strict:

test/test_parser.py

@@ -3,9 +3,11 @@
 
 import pywavefront.parser
 
+
 def prepend_dir(file):
     return os.path.join(os.path.dirname(__file__), file)
 
+
 class TestParsers(unittest.TestCase):
     def setUp(self):
         # Append current path to locate files
@@ -36,6 +38,7 @@ def testObjMaterials(self):
         self.assertEqual(material1.name, 'Material.simple')
         self.assertEqual(material2.name, 'Material2.simple')
 
+
 class TestMtlParser(unittest.TestCase):
     def setUp(self):
         # Append current path to locate files
@@ -73,13 +76,20 @@ def testMtlTextureName(self):
         self.assertEqual(self.material1.texture.image_name,
                          prepend_dir('4x4.png'))
 
+
 class TestParserFailure(unittest.TestCase):
 
     def testMissingParseFunction(self):
         "Attempting to parse with a missing parse function should raise an exception."
-        # since no parse functions have been defined, this will always fail
-        self.assertRaises(Exception, pywavefront.parser.Parser, prepend_dir('uv_sphere.obj'))
+        # since no parse functions have been defined, this will always fail in strict mode
+        file_name = 'simple.obj'
+        parser = pywavefront.parser.Parser(prepend_dir(file_name))
+        pywavefront.parser.Parser.strict = True
+        self.assertRaises(AttributeError, parser.read_file, prepend_dir(file_name))
+        pywavefront.parser.Parser.strict = False
 
     def testMissingParsedFile(self):
         "Referencing a missing parsed file should raise an exception."
-        self.assertRaises(Exception, pywavefront.parser.Parser, 'missing.file.do.not.create')
+        file_name = 'doesnotexist.obj'
+        parser = pywavefront.parser.Parser(prepend_dir(file_name))
+        self.assertRaises(FileNotFoundError, parser.read_file, prepend_dir(file_name))