[Sync] Image hashing updated

This commit is contained in:
Roman Timashev committed 2017-10-24 17:29:25 +03:00
1 parent 11ac59e3b0
commit 6b08e77f07
2 files changed
+6 -2

No files matched your search

+1
View File
@@ -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')
+5 -2
View File
@@ -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 '<Image hash={} file={}>'.format(self.hash, self.file)