summaryrefslogtreecommitdiff
path: root/lib/Pb/__init__.py
diff options
context:
space:
mode:
authorPepper <pepper@scannerjammer.com>2015-09-23 02:40:24 -0400
committerPepper <pepper@scannerjammer.com>2015-09-23 02:40:24 -0400
commit2755b029d873f93d91086b3d69a4c57d05c40fb5 (patch)
tree9a5c92fb1713811022a4f06141e4ec811a2edd1f /lib/Pb/__init__.py
parent1034f26cacb9e5f9cce732cc9e3c7877c8fa2d38 (diff)
minor corrections
Diffstat (limited to 'lib/Pb/__init__.py')
-rw-r--r--lib/Pb/__init__.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/Pb/__init__.py b/lib/Pb/__init__.py
index bfb9d36..c717cc4 100644
--- a/lib/Pb/__init__.py
+++ b/lib/Pb/__init__.py
@@ -178,18 +178,17 @@ class Pb(object):
s3cli.s3move(self.filepath, "im/{}/{}".format(self._hashdir, self.filename))
self._file_clean_local();
- def file_json(self):
- return json.dumps({
+ def file_dict(self):
+ return {
'url' : "%s/im/%s/%s" % (BASE_URL, self._hashdir, self.filename),
'size' : self.file_size,
'width' : "%spx" % self.file_width,
'height' : "%spx" % self.file_height,
- })
+ }
def create(self):
- #base methods
- if self.__class__.__name__ == 'Pb':
- return
+ #base methods FIXME move into File class
+
self._file_dimensions()
self._file_size_get()
self._cleanup();