diff options
| -rw-r--r-- | photoblaster/modules/base.py | 10 | ||||
| -rw-r--r-- | run_module_examples.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/photoblaster/modules/base.py b/photoblaster/modules/base.py index 86cc8dc..71c1bec 100644 --- a/photoblaster/modules/base.py +++ b/photoblaster/modules/base.py @@ -43,7 +43,6 @@ class Pb(object): raise PbProcessError def _cleanup(self): - print self._files_created if not self._files_created: return map(lambda n: n.delete(), self._files_created) @@ -63,7 +62,8 @@ class Pb(object): b = cls(**example_params) b.create() if verbose: - sys.stderr.write("generated %s\n" % b.output_file.get_filepath()) + sys.stderr.write( + "generated %s\n" % b.get_output_file().get_filepath()) sys.stderr.write("files created %s\n" % b._files_created) sys.stderr.write("commands:\n %s\n" % ";\n ".join(b.commands)) return b @@ -75,13 +75,13 @@ class Pb(object): ): try: _insert_data = { - 'date': self.output_file.get_creation_time(), + 'date': self.get_output_file().get_creation_time(), 'remote_addr': remote_addr, 'name': str(self.params.username), 'url': self._db_url_param, - 'dir': self.output_file.get_hashdir(), + 'dir': self.get_output_file().get_hashdir(), 'oldfile': None, - 'newfile': self.output_file.get_filename(), + 'newfile': self.get_output_file().get_filename(), 'dataobj': json.dumps(dict(self._input_kwargs)), 'cmd': "; ".join(self.commands), 'tag': self.tag, diff --git a/run_module_examples.py b/run_module_examples.py index 4f99e9a..882de78 100644 --- a/run_module_examples.py +++ b/run_module_examples.py @@ -5,6 +5,6 @@ for cls in Pb.__subclasses__(): print cls.__name__ if cls.__name__ == "PbBreaker": instance = cls.example_run() - print instance.output_file.as_dict() - instance.output_file.s3move() + print instance.get_output_file().as_dict() + instance.get_output_file().s3move() instance.db_send() |