From 19c8d41c2ec5445706aa2fdaa99c94d337efc94d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 13 Dec 2009 15:30:51 -0700 Subject: [PATCH] Fix #4195 (Android driver problem (HTC Hero)) --- src/calibre/devices/usbms/driver.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index 552badf860..71b61d83da 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -60,6 +60,16 @@ class USBMS(CLI, Device): self.EBOOK_DIR_CARD_B if oncard == 'cardb' else \ self.get_main_ebook_dir() + candidates = ebook_dir + if isinstance(candidates, basestring): + candidates = [candidates] + for x in candidates: + if os.path.exists(os.path.join(prefix, *(x.split('/')))): + ebook_dir = x + break + if not isinstance(ebook_dir, basestring): + ebook_dir = ebook_dir[0] + # Get all books in the ebook_dir directory if self.SUPPORTS_SUB_DIRS: for path, dirs, files in os.walk(os.path.join(prefix, ebook_dir)):