Merge lp:~camptocamp/product-extra-addons/extra-trunk-fix-1017960 into lp:product-extra-addons

[Alexandre Fayolle - camptocamp]

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Alex.
I don't know if the best solution will be to not copy the image. Indeed when you duplicate a product, I am not sure that the customer want to keep the same image, so maybe it's simplier to not copy the image_ids and set it to false.

What do you think?

Thank you

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

My current customer uses the duplicate product to handle the Sales period, and he wants the images to be copied... I can always overload the code for him but I'd rather have the images copied out of the box.

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Ok I finally agree.
I merge it in rev 61.

Thank you

=== modified file 'product_images_olbs/product.py'
--- product_images_olbs/product.py	2012-05-17 12:00:14 +0000
+++ product_images_olbs/product.py	2012-06-27 10:40:24 +0000
@@ -16,22 +16,36 @@
 #You should have received a copy of the GNU General Public License      #
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
-from osv import osv,fields
-from tools.translate import _
 import os
+import shutil
+import logging
 import unicodedata
 import base64, urllib
 
+from osv import osv,fields
+from tools.translate import _
+
 class product_product(osv.osv):
     _inherit = "product.product"
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
+        original = self.read(cr, uid, id, fields=['default_code', 'image_ids'], context=context)
         default.update({
-            'default_code': False,
             'images_ids': False,
         })
+        local_media_repository = self.pool.get('res.company').get_local_media_repository(cr, uid, context=context)
+        if local_media_repository:
+            if original['image_ids']:
+                old_path = os.path.join(local_media_repository, original['default_code'])
+                if os.path.isdir(old_path):
+                    try:
+                        shutil.copytree(old_path, old_path + '-copy')
+                    except:
+                        logger = logging.getLogger('product_images_olbs')
+                        logger.exception('error while trying to copy images from %s to %s', old_path, old_path+'.copy')
+
         return super(product_product, self).copy(cr, uid, id, default, context=context)
 
     def get_main_image(self, cr, uid, id, context=None):
@@ -41,7 +55,7 @@
         if images_ids:
             return images_ids[0]
         return False
-    
+
     def _get_main_image(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         img_obj = self.pool.get('product.images')
@@ -61,12 +75,12 @@
                 'Product Images'
         ),
         'product_image': fields.function(_get_main_image, type="binary", method=True),
-    }    
+    }
 
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        # here we expect that the write on default_code is alwayse on 1 product because there is an unique constraint on the default code
+        # here we expect that the write on default_code is always on 1 product because there is an unique constraint on the default code
         if vals.get('default_code', False) and ids:
             local_media_repository = self.pool.get('res.company').get_local_media_repository(cr, uid, context=context)
             if local_media_repository:
@@ -95,5 +109,5 @@
         new_image_id = self.pool.get('product.images').create(cr, uid, data, context=context)
         return True
 
-    
+
 product_product()

=== modified file 'product_images_olbs/product_images.py'
--- product_images_olbs/product_images.py	2012-04-28 16:16:47 +0000
+++ product_images_olbs/product_images.py	2012-06-27 10:40:24 +0000
@@ -20,7 +20,9 @@
 import base64, urllib
 from tools.translate import _
 import os
-import netsvc
+
+import logging
+_logger = logging.getLogger(__name__)
 
 #TODO find a good solution in order to roll back changed done on file system
 #TODO add the posibility to move from a store system to an other (example : moving existing image on database to file system)
@@ -30,7 +32,7 @@
     _name = "product.images"
     _description = __doc__
     _table = "product_images"
-    
+
     def unlink(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -95,19 +97,25 @@
             with open(filename , 'rb') as f:
                 img = base64.b64encode(f.read())
         else:
-            full_path = self._image_path(cr, uid, image, context=context)
+            try:
+                if isinstance(image.product_id.default_code, bool):
+                    _logger.debug('product not completely setup, no image available')
+                    full_path = False
+                else:
+                    full_path = self._image_path(cr, uid, image, context=context)
+            except Exception, e:
+                _logger.error("Can not find the path for image %s: %s", id, e, exc_info=True)
+                return False
             if full_path:
                 if os.path.exists(full_path):
                     try:
                         with open(full_path, 'rb') as f:
                             img = base64.b64encode(f.read())
                     except Exception, e:
-                        logger = netsvc.Logger()
-                        logger.notifyChannel('product_images', netsvc.LOG_ERROR, "Can not open the image %s, error : %s" %(full_path, e))
+                        _logger.error("Can not open the image %s, error : %s", full_path, e, exc_info=True)
                         return False
                 else:
-                    logger = netsvc.Logger()
-                    logger.notifyChannel('product_images', netsvc.LOG_ERROR, "The image %s doesn't exist " %full_path)
+                    _logger.error("The image %s doesn't exist ", full_path)
                     return False
             else:
                 img = image.file_db_store