Set exif/iptc tags with exiv2. Add comment in readme file.

Author: Skyr

README.md

@@ -15,15 +15,32 @@ document which will go public) and you want to give proper credits to images
 licensed in the Creative Commons.
 
 
+Requirements
+============
+
 Compilation
-===========
+-----------
 
 For compilation, you need a working gradle environment (get more information here: http://gradle.org/).
 In order to create the standalone jar file, run
 
     gradle dist
 
 
+External programs
+-----------------
+
+flickrdl is able to embed the images' metadata in the EXIF/IPTC section of the image.
+This is done by calling one of the following external tools:
+
+ * exiftool http://www.sno.phy.queensu.ca/~phil/exiftool/
+ * exiv2 http://www.exiv2.org/
+
+If one of these two programs is found in the current PATH, it will be used automatically.
+If none of them is installed, the only possibility to store the metadata is the creation
+of a sidecar file.
+
+
 Usage
 =====
 

src/main/groovy/de/ploing/flickrdl/FlickrDL.groovy

@@ -92,14 +92,25 @@ class FlickrDL {
         photo.getTags().each { t ->
             cmd += [ "-Keywords+=${t.getValue()}" ]
         }
-        cmd += [ imageFilename ]
+        cmd += [ '-overwrite_original_in_place', imageFilename ]
         def proc = cmd.execute()
         proc.waitFor()
     }
 
     static addMetadataWithExiv2(photo, imageFilename, path) {
-        println "Adding metadata to ${imageFilename} with exiv2 ${path}"
-
+        def cmd = [ path,
+                "-Mset Exif.Image.Artist String ${photo.getOwner().getRealName()?:photo.getOwner().getUsername()}",
+                "-Mset Exif.Photo.UserComment String License: ${licenses.get(photo.getLicense())} Source: ${photo.getUrl()}",
+                "-Mset Iptc.Application2.Byline String ${photo.getOwner().getRealName()?:photo.getOwner().getUsername()}",
+                "-Mset Iptc.Application2.Contact String ${photo.getUrl()}",
+                "-Mset Iptc.Application2.Copyright String ${licenses.get(photo.getLicense())}"
+        ]
+        photo.getTags().each { t ->
+            cmd += [ "-Madd Iptc.Application2.Keywords String ${t.getValue()}" ]
+        }
+        cmd += [ imageFilename ]
+        def proc = cmd.execute()
+        proc.waitFor()
     }
 
     static main(args) {