From 64fd29fa3ef6b30b1df6e10f42c0f2404442d1af Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 5 Mar 2011 14:54:19 -0700
Subject: [PATCH] Apple driver: Ignore invalid EPUBs when sending to iTunes

---
 src/calibre/devices/apple/driver.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 5ead675aab..76ecce3a8e 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -2512,7 +2512,12 @@ class ITUNES(DriverBase):
         # Refresh epub metadata
         with open(fpath,'r+b') as zfo:
             # Touch the OPF timestamp
-            zf_opf = ZipFile(fpath,'r')
+            try:
+                zf_opf = ZipFile(fpath,'r')
+            except:
+                raise UserFeedback("'%s' is not a valid EPUB" % metadata.title,
+                                   None,
+                                   level=UserFeedback.WARN)
             fnames = zf_opf.namelist()
             opf = [x for x in fnames if '.opf' in x][0]
             if opf: