Merge lp:~robru/nautilus-image-manipulator/gexiv2 into lp:nautilus-image-manipulator

[Robert Bruce Park]

This branch ports your application off of pyexiv2 and onto GExiv2. This offers you a number of advantages:

* GExiv2 has support for Unicode characters in the filenames, so this port allowed me to fix that bug where you couldn't copy EXIF data from/to files with Unicode characters in the name.

* GExiv2 has complete, effortless support for Python 3, which will make it easier to port your application to Python 3 should you choose to do so (pyexiv2 does not support Python 3 and is an obstacle to any Python 3 porting effort you might undertake). I highly recommend porting to Python 3 soon, because Python 2 is obsolete.

* GExiv2 and pyexiv2 are both wrappers around the exact same libexiv2 library, except that the pyexiv2 project is 5,000 lines of code, while GExiv2's python support is around 100 lines of code. This makes GExiv2 *much* simpler and easier to maintain.

[Emilien Klein (emilien-klein)]

Thanks Robert for the merge proposal, I do agree that this is the right move.
However, while testing it, I'm having issues importing GExiv2 from gi.repository. I've installed libexiv2-dev as indicated on [0], but that package does not provide GObject Introspection.

There is Gexiv2 packages with GObject Introspection support at [1] but that isn't part [yet?] of the official Debian repo (or Ubuntu).

Question: how can I get this working properly? My development box is running Ubuntu 12.04.

[0] http://redmine.yorba.org/projects/gexiv2/wiki
[1] http://debian.dev-zero.nl/blog/archives/280

review: Needs Information

[Robert Bruce Park (robru)]

The package you need is called 'gir1.2-gexiv2-0.4'. It is not included in Ubuntu 12.04 unfortunately, and it only just barely made it into 12.10 in time.

I would recommend updating to 12.10 for a development box, if not 13.04 (I am already using 13.04 with great success). If you must stick with 12.04, you can compile gexiv2 from source quite easily, instructions are here:

http://redmine.yorba.org/projects/gexiv2/wiki

[Emilien Klein (emilien-klein)]

Just to keep you informed on the progress:
My dev box is running Debian Sid. Sid hasn't got the GI package yet (due to freeze), but that package was uploaded to experimental, unfortunately it seems like there is a bug [0] with that pacakge that prevents me from running the code (the dev-zero package or the ubuntu package work fine).

I'll merge your patch once I can also upload it to Debian. Not sure if you would be able to quickly see what's wrong with the package in Debian experimental?

[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697204

[Emilien Klein (emilien-klein)]

Previously mentionned Debian bug was fixed, I've merged your code and will prepare a new release in the coming days.
Thanks Robert for your contribution.

=== modified file 'nautilus_image_manipulator/ImageManipulations.py'
--- nautilus_image_manipulator/ImageManipulations.py	2012-05-05 08:04:46 +0000
+++ nautilus_image_manipulator/ImageManipulations.py	2012-12-31 23:46:24 +0000
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010-2012 Emilien Klein <emilien _AT_ klein _DOT_ st>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -22,7 +22,7 @@
 import Image
 import logging
 try:
-    import pyexiv2
+    from gi.repository import GExiv2
 except ImportError:
     pass
 
@@ -91,7 +91,7 @@
 
     def resize_one_image(self, fileName):
         """Performs the resizing operation on one image.
-        
+
         The return value indicates if this resizing operation was successful.
         """
         logging.debug('resizing image: %s' % fileName)
@@ -161,26 +161,18 @@
         if not (skip or retry or cancel):
             try:
                 # Load EXIF data
-                exif = pyexiv2.ImageMetadata(fileName)
-                exif.read()
+                exif = GExiv2.Metadata(fileName)
                 # Change EXIF image size to the new size
-                exif["Exif.Photo.PixelXDimension"] = int(width)
-                exif["Exif.Photo.PixelYDimension"] = int(height)
+                exif["Exif.Photo.PixelXDimension"] = str(int(width))
+                exif["Exif.Photo.PixelYDimension"] = str(int(height))
                 # Copy the EXIF data to the new image
-                newExif = pyexiv2.ImageMetadata(newFileName)
-                newExif.read()
-                exif.copy(newExif)
-                newExif.write()
-            except UnicodeDecodeError as e:
-                # Can happen when the filename contains non-ASCII characters
-                str = "Could not update exif data due to UnicodeDecodeError: %s" % e
-                str += "\nHint: The filename/path probably contains non-ASCII characters"
-                str += "\n%s" % fileName
-                str += "\n%s" % newFileName
-                logging.error(str)
+                newExif = GExiv2.Metadata(newFileName)
+                for tag in exif.get_exif_tags():
+                    newExif[tag] = exif[tag]
+                newExif.save_file()
             except NameError:
-                logging.info("pyexiv2 is not available, EXIF data won't " \
-                             "be copied over")
+                logging.info(
+                    "GExiv2 is not available, EXIF data won't be copied over")
         return (skip, cancel, newFileName)
 
     def pack_images(self):