From 6b08e77f0738148cc60ae01b75ead4434a2d3167 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Tue, 24 Oct 2017 17:29:25 +0300 Subject: [PATCH] [Sync] Image hashing updated --- utils/Sync/settings.py | 1 + utils/Sync/sync/models/Image.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/Sync/settings.py b/utils/Sync/settings.py index 8c3bd277..5461c325 100644 --- a/utils/Sync/settings.py +++ b/utils/Sync/settings.py @@ -116,6 +116,7 @@ hash_salt_pages = '1' hash_salt_articles = '4' hash_salt_albums = '0' hash_salt_documents = '0' +hash_salt_images = '0' provider_name = value('provider')['name'] # env('SYNC_PROVIDER', 'fs') provider_root = value('provider')['root'] # env('SYNC_PROVIDER', 'fs') diff --git a/utils/Sync/sync/models/Image.py b/utils/Sync/sync/models/Image.py index e2d292e0..3eb68372 100644 --- a/utils/Sync/sync/models/Image.py +++ b/utils/Sync/sync/models/Image.py @@ -9,7 +9,7 @@ import settings from db import collection from sync.data import request, list_images from sync.models import Model -from utils.hash import md5 +from utils.hash import md5, hash_str from utils.image import image_magick_resize from utils.text.transform import url_encode_text @@ -75,6 +75,8 @@ class Image(Model): ) def __init__(self, provider, file, data, url_factory): + self.__hash_salt = settings.hash_salt_images + self.origin = None self.data = data @@ -147,7 +149,8 @@ class Image(Model): return url_encode_text(filename) def __get_hash(self): - return self.provider.hash(self.file) + file_hash = self.provider.hash(self.file) + return hash_str(self.__hash_salt + file_hash) def __str__(self): return ''.format(self.hash, self.file)