diff --git a/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg b/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg index 5a2a8f6..1167257 100644 Binary files a/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg and b/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg differ diff --git a/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.th.jpeg b/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.th.jpeg new file mode 100644 index 0000000..a5df9ab Binary files /dev/null and b/manifest/jpeg/015a11a57f73ec3887bdf77f8f8a02f9.th.jpeg differ diff --git a/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.jpeg b/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.jpeg index 86578f3..ddcd418 100644 Binary files a/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.jpeg and b/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.jpeg differ diff --git a/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.th.jpeg b/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.th.jpeg new file mode 100644 index 0000000..29cb0c5 Binary files /dev/null and b/manifest/jpeg/070a095cf72042b8eebe78124f8225bb.th.jpeg differ diff --git a/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg b/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg index 6305ffc..ac36de9 100644 Binary files a/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg and b/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg differ diff --git a/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.jpeg b/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.jpeg new file mode 100644 index 0000000..c0487a8 Binary files /dev/null and b/manifest/jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.jpeg differ diff --git a/manifest/jpeg/fbefd92059006090601cb6dafdce544c.jpeg b/manifest/jpeg/fbefd92059006090601cb6dafdce544c.jpeg index fe7699a..c733185 100644 Binary files a/manifest/jpeg/fbefd92059006090601cb6dafdce544c.jpeg and b/manifest/jpeg/fbefd92059006090601cb6dafdce544c.jpeg differ diff --git a/manifest/jpeg/fbefd92059006090601cb6dafdce544c.th.jpeg b/manifest/jpeg/fbefd92059006090601cb6dafdce544c.th.jpeg new file mode 100644 index 0000000..3c8548e Binary files /dev/null and b/manifest/jpeg/fbefd92059006090601cb6dafdce544c.th.jpeg differ diff --git a/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg b/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg index f599968..28a8943 100644 Binary files a/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg and b/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg differ diff --git a/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.th.jpeg b/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.th.jpeg new file mode 100644 index 0000000..9412500 Binary files /dev/null and b/manifest/jpeg/fcff045964e4ac6fffd84a8192a0a393.th.jpeg differ diff --git a/manifest/manifest.json b/manifest/manifest.json index 1b1d9cc..70db842 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1 +1 @@ -{"070a095cf72042b8eebe78124f8225bb": {"source": "AK-01.jpg", "jpeg": "jpeg/070a095cf72042b8eebe78124f8225bb.jpeg", "webp": "webp/070a095cf72042b8eebe78124f8225bb.webp"}, "015a11a57f73ec3887bdf77f8f8a02f9": {"source": "AK-02.jpg", "jpeg": "jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg", "webp": "webp/015a11a57f73ec3887bdf77f8f8a02f9.webp"}, "fb7ab0a3878d821fffa8c1f06ec5e8d2": {"source": "AK-03.jpg", "jpeg": "jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg", "webp": "webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp"}, "fbefd92059006090601cb6dafdce544c": {"source": "AK-04.jpg", "jpeg": "jpeg/fbefd92059006090601cb6dafdce544c.jpeg", "webp": "webp/fbefd92059006090601cb6dafdce544c.webp"}, "fcff045964e4ac6fffd84a8192a0a393": {"source": "AK-05.jpg", "jpeg": "jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg", "webp": "webp/fcff045964e4ac6fffd84a8192a0a393.webp"}} \ No newline at end of file +{"fbefd92059006090601cb6dafdce544c": {"source": "AK-04.jpg", "jpeg": ["jpeg/fbefd92059006090601cb6dafdce544c.jpeg", "jpeg/fbefd92059006090601cb6dafdce544c.th.jpeg"], "webp": ["webp/fbefd92059006090601cb6dafdce544c.webp", "webp/fbefd92059006090601cb6dafdce544c.th.webp"]}, "fcff045964e4ac6fffd84a8192a0a393": {"source": "AK-05.jpg", "jpeg": ["jpeg/fcff045964e4ac6fffd84a8192a0a393.jpeg", "jpeg/fcff045964e4ac6fffd84a8192a0a393.th.jpeg"], "webp": ["webp/fcff045964e4ac6fffd84a8192a0a393.webp", "webp/fcff045964e4ac6fffd84a8192a0a393.th.webp"]}, "015a11a57f73ec3887bdf77f8f8a02f9": {"source": "AK-02.jpg", "jpeg": ["jpeg/015a11a57f73ec3887bdf77f8f8a02f9.jpeg", "jpeg/015a11a57f73ec3887bdf77f8f8a02f9.th.jpeg"], "webp": ["webp/015a11a57f73ec3887bdf77f8f8a02f9.webp", "webp/015a11a57f73ec3887bdf77f8f8a02f9.th.webp"]}, "fb7ab0a3878d821fffa8c1f06ec5e8d2": {"source": "AK-03.jpg", "jpeg": ["jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.jpeg", "jpeg/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.jpeg"], "webp": ["webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp", "webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.webp"]}, "070a095cf72042b8eebe78124f8225bb": {"source": "AK-01.jpg", "jpeg": ["jpeg/070a095cf72042b8eebe78124f8225bb.jpeg", "jpeg/070a095cf72042b8eebe78124f8225bb.th.jpeg"], "webp": ["webp/070a095cf72042b8eebe78124f8225bb.webp", "webp/070a095cf72042b8eebe78124f8225bb.th.webp"]}} \ No newline at end of file diff --git a/manifest/manifest.py b/manifest/manifest.py index 5f11b30..135d61b 100644 --- a/manifest/manifest.py +++ b/manifest/manifest.py @@ -1,4 +1,4 @@ -#coding=utf-8 +# coding=utf-8 ''' Created on Apr 23, 2018 Desc: Webp convertor @@ -23,23 +23,32 @@ class Single(object): self.hash = hasher.hexdigest() self.jpeg = 'jpeg/' + self.hash + '.jpeg' self.webp = 'webp/' + self.hash + '.webp' + self.th_jpeg = 'jpeg/' + self.hash + '.th.jpeg' + self.th_webp = 'webp/' + self.hash + '.th.webp' def optimize(self): im = Image.open('gallary/' + self.file).convert('RGB') im.save(self.jpeg, 'JPEG') # todo: TinyPNG API im.save(self.webp, 'WEBP') + def thumbnail(self): + im = Image.open('gallary/' + self.file).convert('RGB') + im.thumbnail((450, 300)) + im.save(self.th_jpeg, 'JPEG') # todo: TinyPNG API + im.save(self.th_webp, 'WEBP') + def manifest(self): self.mani[self.hash] = { 'source': self.file, - 'jpeg': 'jpeg/' + self.hash + '.jpeg', - 'webp': 'webp/' + self.hash + '.webp' + 'jpeg': ['jpeg/' + self.hash + '.jpeg', 'jpeg/' + self.hash + '.th.jpeg'], + 'webp': ['webp/' + self.hash + '.webp', 'webp/' + self.hash + '.th.webp'] } def main(self): self.hash() # if os.path.exists(self.jpeg) and os.path.exists(self.webp): self.optimize() + self.thumbnail() self.manifest() return self.mani diff --git a/manifest/webp/015a11a57f73ec3887bdf77f8f8a02f9.th.webp b/manifest/webp/015a11a57f73ec3887bdf77f8f8a02f9.th.webp new file mode 100644 index 0000000..ac49579 Binary files /dev/null and b/manifest/webp/015a11a57f73ec3887bdf77f8f8a02f9.th.webp differ diff --git a/manifest/webp/070a095cf72042b8eebe78124f8225bb.th.webp b/manifest/webp/070a095cf72042b8eebe78124f8225bb.th.webp new file mode 100644 index 0000000..2911775 Binary files /dev/null and b/manifest/webp/070a095cf72042b8eebe78124f8225bb.th.webp differ diff --git a/manifest/webp/070a095cf72042b8eebe78124f8225bb.webp b/manifest/webp/070a095cf72042b8eebe78124f8225bb.webp index e89c14a..19dbdf9 100644 Binary files a/manifest/webp/070a095cf72042b8eebe78124f8225bb.webp and b/manifest/webp/070a095cf72042b8eebe78124f8225bb.webp differ diff --git a/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.webp b/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.webp new file mode 100644 index 0000000..255e1b1 Binary files /dev/null and b/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.th.webp differ diff --git a/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp b/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp index 9c8231c..e3657e3 100644 Binary files a/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp and b/manifest/webp/fb7ab0a3878d821fffa8c1f06ec5e8d2.webp differ diff --git a/manifest/webp/fbefd92059006090601cb6dafdce544c.th.webp b/manifest/webp/fbefd92059006090601cb6dafdce544c.th.webp new file mode 100644 index 0000000..ae3ea2c Binary files /dev/null and b/manifest/webp/fbefd92059006090601cb6dafdce544c.th.webp differ diff --git a/manifest/webp/fbefd92059006090601cb6dafdce544c.webp b/manifest/webp/fbefd92059006090601cb6dafdce544c.webp index 7a643f9..c46d59e 100644 Binary files a/manifest/webp/fbefd92059006090601cb6dafdce544c.webp and b/manifest/webp/fbefd92059006090601cb6dafdce544c.webp differ diff --git a/manifest/webp/fcff045964e4ac6fffd84a8192a0a393.th.webp b/manifest/webp/fcff045964e4ac6fffd84a8192a0a393.th.webp new file mode 100644 index 0000000..feb67e6 Binary files /dev/null and b/manifest/webp/fcff045964e4ac6fffd84a8192a0a393.th.webp differ