def fromFile(cls, strfile, fretfile, metadata): assert strfile or fretfile assert isinstance(strfile, str) assert isinstance(fretfile, (str,type(None))) metadata = nesteddict.from_dict(metadata) trap = TrapData.fromFile(strfile) fret = FretData.fromFile(fretfile) if fretfile else None trap.metadata.setdefault('date', today()) trap_datetime = trap.metadata['date'] metadata.setdefault('date', to_date(trap_datetime)) metadata.setdefault('datetime', trap_datetime) metadata['filename'] = fileIO.splitext(strfile)[0] newCls = cls(trap, fret, metadata) assert isinstance(newCls, cls) assert getattr(newCls, 'filename', None) is not None return newCls
def fromFile(cls, strfile, fretfile, metadata): assert strfile or fretfile assert isinstance(strfile, str) assert isinstance(fretfile, (str, type(None))) metadata = nesteddict.from_dict(metadata) trap = TrapData.fromFile(strfile) fret = FretData.fromFile(fretfile) if fretfile else None trap.metadata.setdefault('date', today()) trap_datetime = trap.metadata['date'] metadata.setdefault('date', to_date(trap_datetime)) metadata.setdefault('datetime', trap_datetime) metadata['filename'] = fileIO.splitext(strfile)[0] newCls = cls(trap, fret, metadata) assert isinstance(newCls, cls) assert getattr(newCls, 'filename', None) is not None return newCls