From ac1c9d52cb8ef0b034837ece1edcdbcd4574e0a9 Mon Sep 17 00:00:00 2001 From: GRiker Date: Sat, 9 Oct 2010 06:04:48 -0700 Subject: [PATCH 1/2] GwR patch adding get_all_user_metadata() --- src/calibre/ebooks/metadata/opf2.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 5c2477c3dc..dadca610ae 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -529,6 +529,14 @@ class OPF(object): # {{{ self.find_toc() self.read_user_metadata() + def get_all_user_metadata(self, make_copy): + ''' + return a dict containing all the custom field metadata associated with + the book. + ''' + self.read_user_metadata() + return self._user_metadata_ + def read_user_metadata(self): self._user_metadata_ = {} temp = Metadata('x', ['x']) From bd9d9ecceb05fad77566d8662b1b09ffc60e77ff Mon Sep 17 00:00:00 2001 From: GRiker Date: Mon, 11 Oct 2010 08:50:37 -0700 Subject: [PATCH 2/2] GwR add custom BACKLOADING_ERROR_MESSAGE --- src/calibre/devices/apple/driver.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 6864570d52..9ad3cf3e08 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -97,6 +97,9 @@ class ITUNES(DriverBase): OPEN_FEEDBACK_MESSAGE = _( 'Apple device detected, launching iTunes, please wait ...') + BACKLOADING_ERROR_MESSAGE = _( + "Cannot copy books directly from iDevice. " + "Drag from iTunes Library to desktop, then add to calibre's Library window.") # Product IDs: # 0x1291 iPod Touch