sync update: caching, refactoring, other
This commit is contained in:
1 parent
e68cfd7b2c
commit
fe409c04a4
23 files changed
+758
-1588
No files matched your search
+21
-10
@@ -3,12 +3,19 @@ import os
|
||||
from functools import reduce
|
||||
from glob import glob
|
||||
|
||||
from bson import json_util
|
||||
import bson.json_util
|
||||
|
||||
|
||||
def combine(items):
|
||||
return reduce(
|
||||
lambda total, i: total + i,
|
||||
items
|
||||
)
|
||||
|
||||
|
||||
def to_json(i):
|
||||
return json.dumps(i, sort_keys=True, ensure_ascii=False, default=bson.json_util.default)
|
||||
|
||||
combine = lambda i: reduce(
|
||||
lambda s, i: s + i,
|
||||
i
|
||||
)
|
||||
|
||||
iterate_over_fns = lambda fns: lambda i: reduce(
|
||||
lambda out, fn: fn(out),
|
||||
@@ -20,12 +27,16 @@ iterate_iter_over_fns = lambda fns: lambda i: lmap(
|
||||
i
|
||||
)
|
||||
|
||||
lmap = lambda fn, ls: list(map(fn, ls))
|
||||
|
||||
def lmap(fn, ls):
|
||||
return list(map(fn, ls))
|
||||
|
||||
def lmapfn(ls):
|
||||
return lambda fn: list(map(fn, ls))
|
||||
|
||||
|
||||
lprint = lambda i: lmap(print, i)
|
||||
lprint_json = lambda s: lprint(lmap(
|
||||
lambda i: json.dumps(i, ensure_ascii=False, indent=4, default=json_util.default),
|
||||
s
|
||||
))
|
||||
lprint_json = lambda i: lprint(lmap(to_json, i))
|
||||
|
||||
first = lambda i: i[0] if len(i) > 0 else None
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import hashlib
|
||||
import json
|
||||
|
||||
from utils.fn import map_cases
|
||||
from utils.fn import map_cases, to_json
|
||||
|
||||
|
||||
def hash_file(file):
|
||||
@@ -16,7 +16,6 @@ def hash_data(data):
|
||||
|
||||
|
||||
def hash_str(data):
|
||||
to_json = lambda i: json.dumps(i, sort_keys=True)
|
||||
data = map_cases(data, [
|
||||
(lambda i: isinstance(i, dict), to_json),
|
||||
(lambda i: isinstance(i, tuple), to_json),
|
||||
@@ -25,6 +24,6 @@ def hash_str(data):
|
||||
(lambda i: isinstance(i, float), float),
|
||||
])
|
||||
if isinstance(data, dict):
|
||||
data = json.dumps(data, sort_keys=True)
|
||||
data = to_json(data)
|
||||
|
||||
return hash_data(str(data).encode())
|
||||
@@ -2,7 +2,7 @@ import os
|
||||
|
||||
from PIL import Image
|
||||
|
||||
from utils.hash import file_hash
|
||||
from utils.hash import hash_file
|
||||
from utils.image import resize
|
||||
from utils.image.resize import optimize, thumbnail, orient
|
||||
|
||||
@@ -54,7 +54,7 @@ def create_image(file, sizes, url_fn, output_dir, skip_processing=False):
|
||||
|
||||
return {
|
||||
'file': os.path.basename(file),
|
||||
'hash': file_hash(file),
|
||||
'hash': hash_file(file),
|
||||
'data': result
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,9 @@ import os
|
||||
|
||||
from subprocess import call
|
||||
|
||||
import smartcrop
|
||||
from PIL import Image
|
||||
from smartcrop import SmartCrop
|
||||
|
||||
import utils.image
|
||||
|
||||
@@ -30,6 +32,29 @@ def override_extension(dest, ext=None):
|
||||
return dest
|
||||
|
||||
|
||||
def crop(src, dest, size):
|
||||
width, height = size
|
||||
image = utils.image.read_image(src)
|
||||
crop_options = smartcrop.DEFAULTS
|
||||
crop_options['width'] = width
|
||||
crop_options['height'] = height
|
||||
|
||||
crop = SmartCrop()
|
||||
result = crop.crop(image.copy(), crop_options)
|
||||
|
||||
box = (result['topCrop']['x'],
|
||||
result['topCrop']['y'],
|
||||
result['topCrop']['x'] + result['topCrop']['width'],
|
||||
result['topCrop']['y'] + result['topCrop']['height'])
|
||||
|
||||
i = utils.image\
|
||||
.read_image(src)\
|
||||
.crop(box)
|
||||
i.thumbnail(size, Image.ANTIALIAS)
|
||||
i.save(dest)
|
||||
|
||||
|
||||
|
||||
def orient(image):
|
||||
orientation = 0x0112
|
||||
rotations = {
|
||||
@@ -52,6 +77,22 @@ def image_magick_resize(input_file, output_file, size, quality=85):
|
||||
call(['convert', input_file, '-strip', '-auto-orient', '-resize', s, '-quality', str(quality), output_file])
|
||||
|
||||
|
||||
# def image_magick_resize(input_file, output_file, size, quality=85):
|
||||
# from wand.image import Image
|
||||
#
|
||||
# w, h = size
|
||||
# s = '{w}x{h}>'.format(w=w, h=h)
|
||||
#
|
||||
# with Image(filename=input_file) as img:
|
||||
# # print(img.size)
|
||||
# # print(list(img.metadata.items()))
|
||||
# with img.clone() as i:
|
||||
# i.transform(resize=s)
|
||||
# i.auto_orient()
|
||||
# i.strip()
|
||||
# i.save(filename=output_file)
|
||||
|
||||
|
||||
def image_magick_pdf_to_img(input_file, output_file):
|
||||
i = "{image}[0]".format(image=input_file)
|
||||
call(['convert', i, output_file])
|
||||
Reference in new issue
Block a user