Validator part 2

nixio/__init__.py

@@ -20,6 +20,7 @@
 from .feature import Feature
 from .data_frame import DataFrame
 from .dimensions import SampledDimension, RangeDimension, SetDimension
+from . import validator
 
 # enums
 from .file import FileMode
@@ -36,6 +37,6 @@
            "MultiTag", "Source", "Section", "S", "Feature", "Property",
            "OdmlType", "SampledDimension", "RangeDimension", "SetDimension",
            "FileMode", "DataSliceMode", "DataType", "DimensionType",
-           "LinkType", "Compression")
+           "LinkType", "Compression", "validator")
 __author__ = ('Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, '
               'Balint Morvai, Achilleas Koutsou')

nixio/file.py

@@ -24,9 +24,8 @@
 from . import util
 from .exceptions import InvalidFile, DuplicateName
 from .util import find as finders
-from .validate import Validate
+from . import validator
 from .compression import Compression
-from .dimensions import RangeDimension, SetDimension, SampledDimension
 
 
 FILE_FORMAT = "nix"
@@ -283,51 +282,7 @@ def is_open(self):
             return False
 
     def validate(self):
-        """
-        Checks if the file is a valid nix file.
-
-        :returns: A dict which contains all objects in file and related errors
-        :rtype: Dictionary
-        """
-        validator = Validate(self)
-        validator.check_file()
-        validator.form_dict()
-        errors = validator.errors
-        for bi, blk in enumerate(self.blocks):
-            validator.check_blocks(blk, bi)
-            for gi, grp in enumerate(blk.groups):
-                validator.check_groups(grp, gi, bi)
-            for di, da in enumerate(blk.data_arrays):
-                validator.check_data_arrays(da, di, bi)
-                for dimi, dim in enumerate(da.dimensions):
-                    if isinstance(dim, RangeDimension):
-                        validator.check_range_dim(dim, dimi, di, bi)
-                    if isinstance(dim, SetDimension):
-                        validator.check_set_dim(dim, dimi, di, bi)
-                    if isinstance(dim, SampledDimension):
-                        validator.check_sampled_dim(dim, dimi, di, bi)
-            for mti, mt in enumerate(blk.multi_tags):
-                validator.check_multi_tag(mt, mti, bi)
-                for fi, fea in enumerate(mt.features):
-                    validator.check_features(fea, 'multi_tags', bi, mti, fi)
-            for ti, tag in enumerate(blk.tags):
-                validator.check_tag(tag, ti, bi)
-                for fi, fea in enumerate(tag.features):
-                    validator.check_features(fea, 'tags', bi, ti, fi)
-            for src in blk.find_sources():
-                validator.check_sources(src, bi)
-
-        for si, sec in enumerate(self.find_sections()):
-            validator.check_section(sec, si)
-            for pi, prop in enumerate(sec.props):
-                validator.check_property(prop, pi, si)
-
-        if validator.error_count:
-            print("{} errors found".format(validator.error_count))
-            return errors
-        else:
-            print("No errors found: The file is a valid NIX file")
-            return errors
+        return validator.check_file(self)
 
     def pprint(self, indent=2, max_length=120, extra=True, max_depth=3):
         """