diff options
| author | pepperpepperpepper <pepper@scannerjammer.com> | 2015-10-05 18:51:03 -0700 |
|---|---|---|
| committer | pepperpepperpepper <pepper@scannerjammer.com> | 2015-10-05 18:51:03 -0700 |
| commit | 94e22c38100bd68cecaf770241a607d065192b29 (patch) | |
| tree | e3c28c3e4f1fd7b10d4dea4b163d7f9584e75d69 | |
| parent | 13173d03e5e56a034d82672589ccf1089a32fbfe (diff) | |
| parent | 0240c4237013a3a80e575e8478fdaa73a68067a0 (diff) | |
Merge branch 'master' of ghghgh.us:photoblaster/photoblaster
| -rwxr-xr-x | lib/pb/generate.py | 6 | ||||
| -rw-r--r-- | lib/pb/pb.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pb/generate.py b/lib/pb/generate.py index ba7b03a..31530d2 100755 --- a/lib/pb/generate.py +++ b/lib/pb/generate.py @@ -106,11 +106,11 @@ class PbGenerate(Pb): """Used for the database tag column. Allows for tracking of the type of overlay method used.""" - self._tag = _DEFAULT_TAG + self.tag = _DEFAULT_TAG if self.params.transparent: - self._tag = str(self.params.transparent) + self.tag = str(self.params.transparent) if self.params.background: - self._tag = str(self.params.compose) + self.tag = str(self.params.compose) self.filename, self.filepath = self._filename_filepath_create( url=self.params.url['url'], extension=self.params.format diff --git a/lib/pb/pb.py b/lib/pb/pb.py index 109bfb0..239d9fc 100644 --- a/lib/pb/pb.py +++ b/lib/pb/pb.py @@ -29,7 +29,7 @@ class Pb(object): self._files_created = [] self.commands = [] self._working_dir = WORKING_DIR - self._tag = self.__class__.__name__ + self.tag = self.__class__.__name__ self._hashdir = None self._db_url_param = None @@ -175,7 +175,7 @@ class Pb(object): 'newfile' : self.filename, 'dataobj' : json.dumps(dict(self._input_kwargs)), 'cmd' : "; ".join(self.commands), - 'tag' : self._tag, + 'tag' : self.tag, } db.insert_cmd(**_insert_data) except Exception as e: |
