[Sync] refactoring, removed old code, cleanup

This commit is contained in:
Roman Timashev committed 2017-09-17 13:40:09 +03:00
1 parent 32843f4d09
commit 84745ead6d
17 files changed
+61 -248

No files matched your search

+9 -61
View File
@@ -1,9 +1,5 @@
import json
import os
from functools import reduce
from glob import glob
import bson.json_util
def constant(value):
@@ -20,32 +16,13 @@ def combine(items):
)
def to_json(i):
return json.dumps(i, sort_keys=True, ensure_ascii=False, default=bson.json_util.default)
def compose(*fns):
return lambda i: reduce(
lambda out, fn: fn(out),
fns, i
)
iterate_over_fns = lambda fns: lambda i: reduce(
lambda out, fn: fn(out),
fns, i
)
iterate_iter_over_fns = lambda fns: lambda i: lmap(
iterate_over_fns(fns),
i
)
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 i: lprint(lmap(to_json, i))
first = lambda i: i[0] if len(i) > 0 else None
@@ -53,32 +30,11 @@ def swap_ext(extension: str):
return lambda i: os.path.splitext(i)[0] + extension
def map_item_key(item, key, map_fn):
"""
:param item:
:param key:
:param map_fn:
:return:
"""
if key in item:
item[key] = map_fn(item[key])
return item
def kmap(key):
return lambda i: i[key] if key in i else None
def key_mapper(key, fn):
return lambda i: map_item_key(i, key, fn)
def map_cases(param, cases, default_fn=None):
for c, fn in cases:
if c(param):
def map_cases(param, cases):
for predicate, fn in cases:
if predicate(param):
return fn(param)
return param if not default_fn else default_fn(param)
return param
def until(condition_fn, iter_fn, items, default_value=None):
@@ -89,14 +45,6 @@ def until(condition_fn, iter_fn, items, default_value=None):
return default_value
# glob_in = dir_globber(['*.jpg', '*.JPG', '*.png', '*.PNG'])
# glob_in('./images')
dir_globber = lambda mask_list: lambda dir: combine(map(
lambda mask: glob(os.path.join(dir, mask)),
mask_list
))
def last_good(ls):
better = None
for i in ls:
+6 -1
View File
@@ -1,6 +1,9 @@
import hashlib
import json
from utils.fn import map_cases, to_json
import bson.json_util
from utils.fn import map_cases
def hash_file(file):
@@ -15,6 +18,8 @@ def hash_data(data):
def hash_str(data):
to_json = lambda i: json.dumps(i, sort_keys=True, ensure_ascii=False, default=bson.json_util.default)
data = map_cases(data, [
(lambda i: isinstance(i, dict), to_json),
(lambda i: isinstance(i, tuple), to_json),
+1 -6
View File
@@ -6,9 +6,7 @@ from typing import Optional
from PIL import Image
import settings
from utils.hash import hash_file
# from utils.image import resize
from utils.image.resize import optimize, thumbnail, orient
from utils.image.resize import optimize, thumbnail
logger = logging.getLogger(settings.name)
@@ -50,9 +48,6 @@ def create_image(file: str, sizes: [()], url_fn, output_dir: str) -> Optional[di
continue
width, height = image.size
# upload_url = upload(local_image_path, '/images/{}'.format(image_filename))
# if not upload_url:
# print('Image {} not uploaded'.format(file))
result[size_name] = {
'url': image_url,
+14 -79
View File
@@ -1,94 +1,30 @@
import os
from subprocess import call
import smartcrop
from PIL import Image
from smartcrop import SmartCrop
import utils.image
def thumbnail(src, dest, size, ext=None):
def thumbnail(src, dest, size):
image_magick_resize(src, dest, size, quality=85)
return utils.image.read_image(dest)
# image = utils.image.read_image(src)
# image.thumbnail(size)
# image.save(override_extension(dest, ext))
# return image
def optimize(src, dest, quality=85, ext=None):
def optimize(src, dest, quality=85):
image = utils.image.read_image(src)
if image:
image.save(override_extension(dest, ext), quality=quality)
image.save(dest, quality=quality)
return image
def override_extension(dest, ext=None):
if ext is not None:
dest = os.path.splitext(dest)[0] + ext
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_instance = SmartCrop()
result = crop_instance.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 = {
3: Image.ROTATE_180,
6: Image.ROTATE_270,
8: Image.ROTATE_90
}
if hasattr(image, '_getexif'):
exif = image._getexif()
if exif is not None:
o = exif[orientation]
if o in rotations:
return image.transpose(rotations[o])
return image
def image_magick_resize(ifile, ofile, size, quality=85):
def image_magick_resize(input_file, output_file, size, quality=85):
s = '%dx%d' % size
call(['/usr/local/bin/convert', ifile, '-strip', '-auto-orient', '-resize', s, '-quality', str(quality), ofile])
# 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)
call([
'/usr/local/bin/convert', input_file,
'-strip',
'-auto-orient',
'-resize', s,
'-quality', str(quality),
output_file,
])
def image_magick_pdf_to_img(input_file, output_file):
@@ -97,7 +33,6 @@ def image_magick_pdf_to_img(input_file, output_file):
'-q',
'-sDEVICE=jpeg',
'-dLastPage=1',
'-o',
output_file,
input_file
'-o', output_file,
input_file,
])
+7 -7
View File
@@ -2,7 +2,7 @@ import re
from unidecode import unidecode
from utils.fn import iterate_over_fns
from utils.fn import compose
remove_pattr = re.compile('[«»<>#,!&"\']')
reduce_dash_patterns = [
@@ -71,17 +71,17 @@ def text_lower(i):
return i.lower()
url_encode_file = iterate_over_fns([
url_encode_file = compose(
translit,
space_to_dash,
short_dash,
remove_underscores,
remove_punctuation,
reduce_dashes,
text_lower
])
text_lower,
)
url_encode_text = iterate_over_fns([
url_encode_text = compose(
translit,
space_to_dash,
dot_to_dash,
@@ -90,5 +90,5 @@ url_encode_text = iterate_over_fns([
remove_underscores,
remove_punctuation,
reduce_dashes,
text_lower
])
text_lower,
)