Skip to content

Resolves issue #29. Log errors only, for when videos are in an album and... #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srajabi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolves issue #29. Log errors only, for when videos are in an album and... #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions exportiphoto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down