diff --git a/Convert-EUProcessingFactorsDB/mcra.py b/Convert-EUProcessingFactorsDB/mcra.py index 6021bd067fe5e458864957df22096a482cb79f51..2a73b6df9e75c69502fbf243b4eb7886d817e973 100644 --- a/Convert-EUProcessingFactorsDB/mcra.py +++ b/Convert-EUProcessingFactorsDB/mcra.py @@ -152,14 +152,39 @@ class DataSheet: self.type = None self.checksum = checksum self.properties = '' + self.report = '' # What kind of file we're dealing with. 'Input' or else. # 'Input' files should be processed at the beginning. self.direction = direction self.autoload = autoload + def add_reportline(self, line, newline=True): + self.report = self.report+line + if newline: + self.report = self.report+'\n' + + def make_report(self): + temp = self.report + self.report = '' + self.add_reportline( + '* {dir} file: {file}'.format( + dir=self.direction, + file=os.path.split(self.file.path)[1])) + self.add_reportline( + ' * [{path}]({path})'.format(path=self.file.path)) + self.add_reportline( + ' * {props}'.format(props=self.properties)) + self.add_reportline( + ' * Modified: {mod}'.format(mod=self.file.modified)) + self.add_reportline( + ' * File size: {size_str} ({size} B)'.format( + size_str=self.file.size_string,size=self.file.size)) + self.add_reportline( + ' * Hash: {hash})'.format(hash=self.file.hash)) + self.report = self.report+temp def update_properties(self): - # Return some statistics about the dataframe and file as a string + # Set some statistics about the dataframe and file as a string if self.type == 'pandas': if self.sheet is not None: shape = '[{rows} rows x {columns} columns]'.format( @@ -201,6 +226,7 @@ class DataSheet: # Error here print(' COULD NOT READ {file}'.format(file=self.file.path)) self.update_properties() + self.make_report() def save(self, **kwargs): # Saves sheet into file @@ -279,6 +305,7 @@ class DataSheet: self.file.zippath = None self.file.update() self.update_properties() + self.make_report() def add_file(self, path, to=None): # Adds file to zip dir.