From f7e78ae943c74b6a8c068f3bbdaf53fbed56733b Mon Sep 17 00:00:00 2001
From: Sohail Rajabi <sohail@scopear.com>
Date: Thu, 16 Apr 2015 18:23:41 -0600
Subject: [PATCH] Resolves issue #29. Log errors only, for when videos are in
 an album and the script complains. Videos can be exported separately via a
 smart album.

---
 exportiphoto.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/exportiphoto.py b/exportiphoto.py
index 647774b..cbdfe27 100644
--- a/exportiphoto.py
+++ b/exportiphoto.py
@@ -49,7 +49,7 @@ class iPhotoLibrary(object):
     def __init__(self, albumDir, destDir, use_album=False, use_date=False,
                  use_faces=False, use_metadata=False, deconflict=False, quiet=False,
                  year_dir=False, import_missing=False, import_from_date=None, test=False,
-                 date_delimiter="-", ignore_time_delta=False, originals=False):
+                 date_delimiter="-", ignore_time_delta=False, originals=False, log_errors_only=False):
         self.use_album = use_album
         self.use_date =  use_date
         self.use_faces = use_faces
@@ -69,6 +69,7 @@ def __init__(self, albumDir, destDir, use_album=False, use_date=False,
         self.ignore_time_delta = ignore_time_delta
         self.date_delimiter = date_delimiter
         self.originals=originals
+        self.log_errors_only=log_errors_only
         self.import_albums = []
 
         if import_from_date:
@@ -301,7 +302,13 @@ def walk(self, funcs):
             ))
             for imageId in images:
                 for func in funcs:
-                    func(imageId, targetFileDir, folderDate)
+                    try:
+                        func(imageId, targetFileDir, folderDate)
+                    except iPhotoLibraryError, why:
+                        if self.log_errors_only:
+                            self.status("\n%s\n" % why[0])
+                        else:
+                            raise
             self.status("\n")
 
         if self.import_missing: 
@@ -586,6 +593,11 @@ def error(msg):
                              action="store", type="string", dest="import_from_date",
                              help="only import missing folers if folder date occurs after (YYYY-MM-DD). Uses date in folder name."
     )
+    
+    option_parser.add_option("-l", "--log_errors_only",
+                            action="store_true", dest="log_errors_only",
+                            help="log errors and continue export."
+    )
 
     if pyexiv2:
         option_parser.add_option("-m", "--metadata",
@@ -623,7 +635,8 @@ def error(msg):
                                 test=options.test,
                                 date_delimiter=options.date_delimiter,
                                 ignore_time_delta=options.ignore_time_delta,
-                                originals=options.originals
+                                originals=options.originals,
+                                log_errors_only=options.log_errors_only
                                 )
         def copyImage(imageId, folderName, folderDate):
             library.copyImage(imageId, folderName, folderDate)