thumbor-libs-blackhand 0.2.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

thumbor_libs_blackhand/result_storages/hybrid_result_storage.py

@@ -47,7 +47,7 @@ class Storage(BaseStorage):
 
         db_name = self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
         col_name = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
-        
+
         try:
             uri = self.context.config.MONGO_RESULT_STORAGE_URI
         except AttributeError:
@@ -111,13 +111,13 @@ class Storage(BaseStorage):
         #max_age = self.get_max_age()
         #result_ttl = self.get_max_age()
         try:
-            CACHE_PATH = self.context.config.CACHE_PATH           
+            CACHE_PATH = self.context.config.CACHE_PATH
         except AttributeError:
             raise
-
-        mkpath = (CACHE_PATH + '/' + datetime.now().strftime('%Y') + '/' 
-                  + datetime.now().strftime('%m') + '/' + datetime.now().strftime('%d') 
+        imgpath = ( datetime.now().strftime('%Y') + '/'
+                  + datetime.now().strftime('%m') + '/' + datetime.now().strftime('%d')
                   + '/' + datetime.now().strftime('%H'))
+        mkpath = (CACHE_PATH + '/' + imgpath)
         self.ensure_dir(mkpath)
 
         #os.makedirs(mkpath)
@@ -144,7 +144,7 @@ class Storage(BaseStorage):
             'content_type': BaseEngine.get_mimetype(image_bytes),
             'ref_id': ref_img2,
             'content_length' : len(image_bytes),
-            'cache_path': mkpath,
+            'cache_path': imgpath,
             'cache_id' : cache_id
             }
         doc_cpm = dict(doc)
@@ -165,7 +165,10 @@ class Storage(BaseStorage):
 
         key = self.get_key_from_request()
         logger.debug("[RESULT_STORAGE] image not found at %s", key)
-
+        try:
+            CACHE_PATH = self.context.config.CACHE_PATH
+        except AttributeError:
+            raise
         age = datetime.utcnow() - timedelta(
             seconds=self.get_max_age()
         )
@@ -195,8 +198,8 @@ class Storage(BaseStorage):
         metadata['Cache-Control'] = "max-age=60,public"
         metadata['ContentLength'] = stored['content_length']
         metadata['ContentType'] = stored['content_type']
-        cachefile = stored['cache_path'] + "/" + stored['cache_id']
-      
+        cachefile = CACHE_PATH + '/' + stored['cache_path'] + "/" + stored['cache_id']
+
         fichier = open(cachefile, "rb")
         try:
             tosend = fichier.read()

thumbor_libs_blackhand/result_storages/{mongodb_result_storage.py → mongodb_result_storage_v3.py}

@@ -158,6 +158,29 @@ class Storage(BaseStorage):
 
         if not stored:
             return None
+        
+        try:
+            #self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
+            dedup = self.context.config.MONGO_RESULT_STORAGE_DEDUP
+        except:
+            dedup = False
+        
+        if not dedup:
+          logger.debug("Deduplication OFF")  
+        else:
+          filter={
+            'path': key
+          }
+          sort=list({
+            'created_at': -1
+          }.items())
+          skip=1
+          obj = self.storage.find(filter=filter, skip=skip)
+          async for doc in obj:
+            logger.info("Deduplication %s", key)
+            self.storage.delete_one({"_id": doc["_id"]})
+
+
         metadata = stored['metadata']
         metadata['LastModified'] = stored['created_at'].replace(
             tzinfo=pytz.utc

thumbor_libs_blackhand/result_storages/mongodb_result_storage_v4.py

@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+# Blackhand library for Thumbor
+# Licensed under the MIT license:
+# http://www.opensource.org/licenses/mit-license
+
+from  urllib import parse #, request; error
+#from motor.motor_tornado import MotorGridFSBucket
+#from pymongo.errors import PyMongoError
+from thumbor_libs_blackhand.mongodb.pool_result_storage import MongoConnector
+from datetime import datetime, timedelta
+from thumbor.result_storages import BaseStorage, ResultStorageResult
+from thumbor.engines import BaseEngine
+from thumbor.utils import logger
+from bson.binary import Binary
+import pytz
+import re
+
+
+class Storage(BaseStorage):
+
+    def __init__(self, context):
+        BaseStorage.__init__(self, context)
+        self.database, self.storage = self.__conn__()
+        super(Storage, self).__init__(context)
+
+
+
+    def __conn__(self):
+        '''Return the MongoDB params.
+        :returns: MongoDB DB and Collection
+        :rtype: pymongo.database.Database, pymongo.database.Collection
+        '''
+
+        password = parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_PASSWORD)
+        user = parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_USER)
+        if not self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET:
+          uric = ('mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOSTS
+                  + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB)
+        else:
+          uric = ('mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOSTS
+                  + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
+                  + "&replicaSet=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET
+                  + "&readPreference=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_READ_PREFERENCE)
+
+        db_name = self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
+        col_name = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
+        host = None
+        port = None
+
+        try:
+            uri = self.context.config.MONGO_RESULT_STORAGE_URI
+        except AttributeError:
+            uri=uric
+
+        try:
+            host = self.context.config.MONGO_RESULT_STORAGE_SERVER_HOST
+            port = self.context.config.MONGO_RESULT_STORAGE_SERVER_PORT
+        except AttributeError:
+            host=None
+            port=None
+
+        mongo_conn = MongoConnector(
+            db_name=db_name,
+            col_name=col_name,
+            uri=uri,
+            host=host,
+            port=port,
+        )
+
+        database = mongo_conn.db_conn
+        storage = mongo_conn.col_conn
+
+        return database, storage
+
+    @property
+    def is_auto_webp(self):
+        '''Return if webp.
+        :return: If the file is a webp
+        :rettype: boolean
+        '''
+
+        return self.context.config.AUTO_WEBP \
+            and self.context.request.accepts_webp
+
+    def get_key_from_request(self):
+        '''Return a path key for the current request url.
+        :return: The storage key for the current url
+        :rettype: string
+        '''
+
+        path = f"result:{self.context.request.url}"
+
+        if self.is_auto_webp:
+            return f'{path}/webp'
+
+        return path
+
+
+    def get_max_age(self):
+
+        return self.context.config.RESULT_STORAGE_EXPIRATION_SECONDS
+
+
+    async def put(self, image_bytes):
+        key = self.get_key_from_request()
+        #max_age = self.get_max_age()
+        #result_ttl = self.get_max_age()
+        ref_img = ''
+        ref_img = re.findall(r'/[a-zA-Z0-9]{24}(?:$|/)', key)
+        if ref_img:
+            ref_img2 = ref_img[0].replace('/','')
+        else:
+            ref_img2 = 'undef'
+
+
+        if self.context.config.get("MONGO_STORE_METADATA", False):
+            metadata = dict(self.context.headers)
+        else:
+            metadata = {}
+
+        try:
+            listeProduit = self.context.config.PRODUIT
+            produit=''
+            for s in listeProduit:
+                if key.find(s) >= 1:
+                    produit=s.replace('/', '')
+                    break
+                else:
+                    produit="info"
+        except AttributeError:
+            produit = 'undef'
+
+        doc = {
+            'path': key,
+            'created_at': datetime.utcnow(),
+            'data': Binary(image_bytes),
+            'metadata': metadata,
+            'content_type': BaseEngine.get_mimetype(image_bytes),
+            'ref_id': ref_img2,
+            'content_length' : len(image_bytes),
+            'produit': produit
+            }
+        doc_cpm = dict(doc)
+
+        await self.storage.insert_one(doc_cpm)
+        #return self.context.request.url
+        return key
+
+    async def get(self):
+        key = self.get_key_from_request()
+        logger.debug("[RESULT_STORAGE] image not found at %s", key)
+
+
+        age = datetime.utcnow() - timedelta(
+            seconds=self.get_max_age()
+        )
+        stored = await self.storage.find_one({
+            'path': key,
+            'created_at': {
+                '$gte': age
+            },
+        }, {
+            'ref_id': True,
+            'created_at': True,
+            'metadata': True,
+            'content_type': True,
+            'data' : True,
+            'content_length': True,
+        })
+
+
+        if not stored:
+            return None
+        
+        try:
+            #self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
+            dedup = self.context.config.MONGO_RESULT_STORAGE_DEDUP
+        except:
+            dedup = False
+        
+        if not dedup:
+          logger.debug("Deduplication OFF")  
+        else:
+          filter={
+            'path': key
+          }
+          sort=list({
+            'created_at': -1
+          }.items())
+          skip=1
+          obj = self.storage.find(filter=filter, skip=skip)
+          async for doc in obj:
+            logger.info("Deduplication %s", key)
+            self.storage.delete_one({"_id": doc["_id"]})
+
+
+        metadata = stored['metadata']
+        metadata['LastModified'] = stored['created_at'].replace(
+            tzinfo=pytz.utc
+        )
+        metadata['Cache-Control'] = "max-age=60,public"
+        metadata['ContentLength'] = stored['content_length']
+        metadata['ContentType'] = stored['content_type']
+
+        return ResultStorageResult(
+            buffer=stored['data'],
+            metadata=metadata,
+            successful=True
+        )

thumbor_libs_blackhand/result_storages/mongodb_result_storage_v5.py

@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+# Blackhand library for Thumbor
+# Licensed under the MIT license:
+# http://www.opensource.org/licenses/mit-license
+
+from  urllib import parse #, request; error
+from thumbor_libs_blackhand.mongodb.pool_result_storage import MongoConnector
+from datetime import datetime, timedelta
+from thumbor.result_storages import BaseStorage, ResultStorageResult
+from thumbor.engines import BaseEngine
+from thumbor.utils import logger
+from bson.binary import Binary
+import pytz
+import re
+
+
+class Storage(BaseStorage):
+
+    def __init__(self, context):
+        BaseStorage.__init__(self, context)
+        self.database, self.storage = self.__conn__()
+        super(Storage, self).__init__(context)
+
+    def __conn__(self):
+        try:
+            uri = self.context.config.MONGO_RESULT_STORAGE_SERVER_URI
+            db_name=self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
+            col_name=self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
+        except AttributeError:
+            logger.error("[RESULT_STORAGE] Parametres databases incomplet")
+
+        mongo_conn = MongoConnector(
+            db_name=db_name,
+            col_name=col_name,
+            uri=uri,
+        )
+
+        database = mongo_conn.db_conn
+        storage = mongo_conn.col_conn
+
+        return database, storage
+
+
+    @property
+    def is_auto_webp(self):
+        '''Return if webp.
+        :return: If the file is a webp
+        :rettype: boolean
+        '''
+
+        return self.context.config.AUTO_WEBP \
+            and self.context.request.accepts_webp
+
+    def get_key_from_request(self):
+        '''Return a path key for the current request url.
+        :return: The storage key for the current url
+        :rettype: string
+        '''
+
+        path = f"result:{self.context.request.url}"
+
+        if self.is_auto_webp:
+            return f'{path}/webp'
+
+        return path
+
+
+    def get_max_age(self):
+
+        return self.context.config.RESULT_STORAGE_EXPIRATION_SECONDS
+
+
+    async def put(self, image_bytes):
+        key = self.get_key_from_request()
+        #max_age = self.get_max_age()
+        #result_ttl = self.get_max_age()
+        ref_img = ''
+        ref_img = re.findall(r'/[a-zA-Z0-9]{24}(?:$|/)', key)
+        if ref_img:
+            ref_img2 = ref_img[0].replace('/','')
+        else:
+            ref_img2 = 'undef'
+
+
+        if self.context.config.get("MONGO_STORE_METADATA", False):
+            metadata = dict(self.context.headers)
+        else:
+            metadata = {}
+
+        try:
+            listeProduit = self.context.config.PRODUIT
+            produit=''
+            for s in listeProduit:
+                if key.find(s) >= 1:
+                    produit=s.replace('/', '')
+                    break
+                else:
+                    produit="info"
+        except AttributeError:
+            produit = 'undef'
+
+        doc = {
+            'path': key,
+            'created_at': datetime.utcnow(),
+            'data': Binary(image_bytes),
+            'metadata': metadata,
+            'content_type': BaseEngine.get_mimetype(image_bytes),
+            'ref_id': ref_img2,
+            'content_length' : len(image_bytes),
+            'produit': produit
+            }
+        doc_cpm = dict(doc)
+
+        await self.storage.insert_one(doc_cpm)
+        #return self.context.request.url
+        return key
+
+    async def get(self):
+        key = self.get_key_from_request()
+        logger.debug("[RESULT_STORAGE] image not found at %s", key)
+
+        print(key)
+        age = datetime.utcnow() - timedelta(
+            seconds=self.get_max_age()
+        )
+        stored = await self.storage.find_one({
+            'path': key,
+            'created_at': {
+                '$gte': age
+            },
+        }, {
+            'ref_id': True,
+            'created_at': True,
+            'metadata': True,
+            'content_type': True,
+            'data' : True,
+            'content_length': True,
+        })
+
+
+        if not stored:
+            return None
+
+        try:
+            #self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
+            dedup = self.context.config.MONGO_RESULT_STORAGE_DEDUP
+        except:
+            dedup = False
+
+        if not dedup:
+          logger.debug("Deduplication OFF")
+        else:
+          filter={
+            'path': key
+          }
+          sort=list({
+            'created_at': -1
+          }.items())
+          skip=1
+          obj = self.storage.find(filter=filter, skip=skip)
+          async for doc in obj:
+            logger.info("Deduplication %s", key)
+            self.storage.delete_one({"_id": doc["_id"]})
+
+
+        metadata = stored['metadata']
+        metadata['LastModified'] = stored['created_at'].replace(
+            tzinfo=pytz.utc
+        )
+        metadata['Cache-Control'] = "max-age=60,public"
+        metadata['ContentLength'] = stored['content_length']
+        metadata['ContentType'] = stored['content_type']
+
+        return ResultStorageResult(
+            buffer=stored['data'],
+            metadata=metadata,
+            successful=True
+        )

{thumbor_libs_blackhand-0.2.0.dist-info → thumbor_libs_blackhand-0.5.0.dist-info}/METADATA

@@ -1,22 +1,25 @@
 Metadata-Version: 2.1
 Name: thumbor-libs-blackhand
-Version: 0.2.0
+Version: 0.5.0
 Summary: libs thumbor
 Home-page: https://github.com/Bkhand/thumbor_libs_blackhand
 Author: Bertrand Thill
 Author-email: github@blackhand.org
 License: GNU
 Keywords: thumbor,fallback,images,nfs,mongodb
+Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: French
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Multimedia :: Graphics :: Presentation
 License-File: LICENSE
-Requires-Dist: thumbor (>=7.1.0)
+Requires-Dist: thumbor (>=7.7.0)
 Requires-Dist: pymongo (>=4.2.0)
 
 This module enable mongodb support and fallback for thumbor.
+
+

{thumbor_libs_blackhand-0.2.0.dist-info → thumbor_libs_blackhand-0.5.0.dist-info}/RECORD

@@ -5,16 +5,16 @@ thumbor_libs_blackhand/loaders/specb_file_fallback_file_loader.py,sha256=842cYNb
 thumbor_libs_blackhand/metrics/__init__.py,sha256=5izS_bmGrlIsSPAU1JYYvHuAaq2qHHanGXr_dPPtyuo,138
 thumbor_libs_blackhand/mongodb/pool_result_storage.py,sha256=ZHARWEFGacLXjtxqVxVmwFGOS94w0SkhkwC96VM00LE,1781
 thumbor_libs_blackhand/result_storages/__init__.py,sha256=5izS_bmGrlIsSPAU1JYYvHuAaq2qHHanGXr_dPPtyuo,138
-thumbor_libs_blackhand/result_storages/hybrid_result_storage.py,sha256=0KeJLIOV8yON-eB3LdC4Ba5VkurdV1rxuOpjr9iyRYM,6534
-thumbor_libs_blackhand/result_storages/mongodb_legacy_result_storage.py,sha256=7Lpj4GLC5fDNw-B15gmfCs9jOGXbzwiOcGRFVOC98_8,3893
-thumbor_libs_blackhand/result_storages/mongodb_result_storage.py,sha256=uEDpzbKzj20MFvxn4Ny6B6piJnZKLxEY1ZgXyBYwKhs,5442
-thumbor_libs_blackhand/result_storages/mongodb_webp_result_storage.py,sha256=auKnLB_tFwMcKd4nSKaJ8JP6FaYs6E-9dDzn0VrqGTw,3889
+thumbor_libs_blackhand/result_storages/hybrid_result_storage.py,sha256=wFUzMeZxPzU_BvFjNJWZPh7bCla0x-s7Iwj6TiFOgDE,6672
+thumbor_libs_blackhand/result_storages/mongodb_result_storage_v3.py,sha256=e1wIBcLx6lN_gDDPaJTelQdKyB3zyxPQPjCMLugx-uY,6075
+thumbor_libs_blackhand/result_storages/mongodb_result_storage_v4.py,sha256=rTGtpfVZamErPfCA-z3-3vgf5uP_HDH3f3Sq8WOg19w,6462
+thumbor_libs_blackhand/result_storages/mongodb_result_storage_v5.py,sha256=_wElwxgrF-QYLc5VyKMdUxsknc403QihGwP1AFaVQ4U,5068
 thumbor_libs_blackhand/storages/__init__.py,sha256=5izS_bmGrlIsSPAU1JYYvHuAaq2qHHanGXr_dPPtyuo,138
 thumbor_libs_blackhand/storages/mongodb_webp_storage.py,sha256=QSLAkoiqXRQXDq-2HUWGUTsz9hNyatKQg7_LB6ikN6o,4401
 thumbor_libs_blackhand/url_signers/__init__.py,sha256=5izS_bmGrlIsSPAU1JYYvHuAaq2qHHanGXr_dPPtyuo,138
 thumbor_libs_blackhand/url_signers/base64_hmac_sha1_trim.py,sha256=4TNCfNqBRRQgTo90N3Ej2SDo2jYzzDm31hOFrk0BsVc,583
-thumbor_libs_blackhand-0.2.0.dist-info/LICENSE,sha256=H3K2DdEDDUNhtBvyWkPh8SodWqMuiOefZWwdDxA98VE,1079
-thumbor_libs_blackhand-0.2.0.dist-info/METADATA,sha256=NcBITbvhIWy6vOUyZ0VRWYGnTmoTuSui7FITh7h7e4E,810
-thumbor_libs_blackhand-0.2.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-thumbor_libs_blackhand-0.2.0.dist-info/top_level.txt,sha256=qs2ZPZFH1pQYGF-qqZzRbRbPHdtBugtefP7mUslef90,23
-thumbor_libs_blackhand-0.2.0.dist-info/RECORD,,
+thumbor_libs_blackhand-0.5.0.dist-info/LICENSE,sha256=H3K2DdEDDUNhtBvyWkPh8SodWqMuiOefZWwdDxA98VE,1079
+thumbor_libs_blackhand-0.5.0.dist-info/METADATA,sha256=C7NPwUArCyGScWcXtJO_xI9VJMTvZmc4UrF35wliD0k,831
+thumbor_libs_blackhand-0.5.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+thumbor_libs_blackhand-0.5.0.dist-info/top_level.txt,sha256=qs2ZPZFH1pQYGF-qqZzRbRbPHdtBugtefP7mUslef90,23
+thumbor_libs_blackhand-0.5.0.dist-info/RECORD,,

{thumbor_libs_blackhand-0.2.0.dist-info → thumbor_libs_blackhand-0.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.37.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

thumbor_libs_blackhand/result_storages/mongodb_legacy_result_storage.py

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-# Blackhand library for Thumbor
-# Licensed under the MIT license:
-# http://www.opensource.org/licenses/mit-license
-import urllib.request, urllib.parse, urllib.error
-import re
-from datetime import datetime, timedelta
-#from io import StringIO
-from thumbor.result_storages import BaseStorage
-from thumbor.utils import logger
-from bson.binary import Binary
-from pymongo.mongo_client import MongoClient
-from sys import getsizeof
-
-
-class Storage(BaseStorage):
-    @property
-    def is_auto_webp(self):
-        return self.context.config.AUTO_WEBP and self.context.request.accepts_webp
-
-
-    def __conn__(self):
-        #server_api = ServerApi('1', strict=True)
-        #client = MongoClient(self.context.config.MONGO_RESULT_STORAGE_URI) #, server_api=server_api)
-        #db = client[self.context.config.MONGO_RESULT_STORAGE_SERVER_DB]
-        #storage = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
-        #return db, storage
-
-        password = urllib.parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_PASSWORD)
-        user = urllib.parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_USER)
-        if not self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET:
-          uri = 'mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOST + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
-        else:
-          uri = 'mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOST + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB + "&replicaSet=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET + "&readPreference=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_READ_PREFERENCE
-        client = MongoClient(uri)
-        db = client[self.context.config.MONGO_RESULT_STORAGE_SERVER_DB]
-        storage = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
-        return db, storage
-
-
-    def get_max_age(self):
-        default_ttl = self.context.config.RESULT_STORAGE_EXPIRATION_SECONDS
-        if self.context.request.max_age == 0:
-            return self.context.request.max_age
-        return default_ttl
-
-
-    def get_key_from_request(self):
-        path = "result:%s" % self.context.request.url
-        return path
-
-
-    async def put(self, image_bytes):
-        db, storage = self.__conn__()
-        key = self.get_key_from_request()
-        #max_age = self.get_max_age()
-        #result_ttl = self.get_max_age()
-        ref_img = ''
-        ref_img = re.findall(r'/[a-zA-Z0-9]{24}(?:$|/)', key)
-        if ref_img:
-            ref_img2 = ref_img[0].replace('/','')
-        else:
-            ref_img2 = 'undef'
-
-        if self.is_auto_webp:
-            content_t = 'webp'
-        else:
-            content_t = 'default'
-        doc = {
-            'path': key,
-            'created_at': datetime.utcnow(),
-            'data': Binary(image_bytes),
-            'content-type': content_t,
-            'ref_id': ref_img2
-            }
-        doc_cpm = dict(doc)
-
-        try:
-            #self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
-            maxs = self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
-        except:
-            maxs = 16000000
-
-        amd = getsizeof(bytes)
-        if  amd > maxs:
-            logger.warning(u"OVERSIZE %s: %s > %s pas de mise en cache possible", key, amd, maxs)
-            return None
-        else:
-            db[storage].insert_one(doc_cpm)
-            return key
-
-  
-
-
-    async def get(self):
-        db, storage = self.__conn__()
-        key = self.get_key_from_request()
-        logger.debug("[RESULT_STORAGE] image not found at %s", key)
-
-        result = db[storage].find_one({'path': key }) #, 'content-type': "default"})
-
-        if not result:
-            return None
-        tosend = result['data']
-        return tosend

thumbor_libs_blackhand/result_storages/mongodb_webp_result_storage.py

@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-# Blackhand library for Thumbor
-# Licensed under the MIT license:
-# http://www.opensource.org/licenses/mit-license
-import urllib.request, urllib.parse, urllib.error
-import re
-from datetime import datetime, timedelta
-#from io import StringIO
-from thumbor.result_storages import BaseStorage
-from thumbor.utils import logger
-from bson.binary import Binary
-from pymongo.mongo_client import MongoClient
-from sys import getsizeof
-
-
-class Storage(BaseStorage):
-    @property
-    def is_auto_webp(self):
-        return self.context.config.AUTO_WEBP and self.context.request.accepts_webp
-
-
-    def __conn__(self):
-        #server_api = ServerApi('1', strict=True)
-        #client = MongoClient(self.context.config.MONGO_RESULT_STORAGE_URI) #, server_api=server_api)
-        #db = client[self.context.config.MONGO_RESULT_STORAGE_SERVER_DB]
-        #storage = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
-        #return db, storage
-
-        password = urllib.parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_PASSWORD)
-        user = urllib.parse.quote_plus(self.context.config.MONGO_RESULT_STORAGE_SERVER_USER)
-        if not self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET:
-          uri = 'mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOST + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB
-        else:
-          uri = 'mongodb://'+ user +':' + password + '@' + self.context.config.MONGO_RESULT_STORAGE_SERVER_HOST + '/?authSource=' + self.context.config.MONGO_RESULT_STORAGE_SERVER_DB + "&replicaSet=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_REPLICASET + "&readPreference=" + self.context.config.MONGO_RESULT_STORAGE_SERVER_READ_PREFERENCE
-        client = MongoClient(uri)
-        db = client[self.context.config.MONGO_RESULT_STORAGE_SERVER_DB]
-        storage = self.context.config.MONGO_RESULT_STORAGE_SERVER_COLLECTION
-        return db, storage
-
-
-    def get_max_age(self):
-        default_ttl = self.context.config.RESULT_STORAGE_EXPIRATION_SECONDS
-        if self.context.request.max_age == 0:
-            return self.context.request.max_age
-        return default_ttl
-
-
-    def get_key_from_request(self):
-        path = "result:%s" % self.context.request.url
-        return path
-
-
-    async def put(self, image_bytes):
-        db, storage = self.__conn__()
-        key = self.get_key_from_request()
-        #max_age = self.get_max_age()
-        #result_ttl = self.get_max_age()
-        ref_img = ''
-        ref_img = re.findall(r'/[a-zA-Z0-9]{24}(?:$|/)', key)
-        if ref_img:
-            ref_img2 = ref_img[0].replace('/','')
-        else:
-            ref_img2 = 'undef'
-
-        if self.is_auto_webp:
-            content_t = 'webp'
-        else:
-            content_t = 'default'
-        doc = {
-            'path': key,
-            'created_at': datetime.utcnow(),
-            'data': Binary(image_bytes),
-            'content-type': content_t,
-            'ref_id': ref_img2
-            }
-        doc_cpm = dict(doc)
-
-        try:
-            #self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
-            maxs = self.context.config.MONGO_RESULT_STORAGE_MAXCACHESIZE
-        except:
-            maxs = 16000000
-
-        amd = getsizeof(bytes)
-        if  amd > maxs:
-            logger.warning(u"OVERSIZE %s: %s > %s pas de mise en cache possible", key, amd, maxs)
-            return None
-        else:
-            db[storage].insert_one(doc_cpm)
-            return key
-
-
-    async def get(self):
-        db, storage = self.__conn__()
-        key = self.get_key_from_request()
-        logger.debug("[RESULT_STORAGE] image not found at %s", key)
-
-        result = db[storage].find_one({'path': key }) #, 'content-type': "default"})
-
-        if not result:
-            return None
-        tosend = result['data']
-        return tosend