This commit is contained in:
Kovid Goyal 2017-05-09 17:18:03 +05:30
parent 70622c0774
commit 21f04f1a5c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -1447,19 +1447,18 @@ class KOBOTOUCH(KOBO):
self.set_device_name() self.set_device_name()
return super(KOBOTOUCH, self).get_device_information(end_session) return super(KOBOTOUCH, self).get_device_information(end_session)
def open_linux(self): def open_linux(self):
super(KOBOTOUCH, self).open_linux() super(KOBOTOUCH, self).open_linux()
# Check the drives have been mounted as expected and swap if needed. # Check the drives have been mounted as expected and swap if needed.
if self._card_a_prefix is None: if self._card_a_prefix is None:
return return
if not self.is_main_drive(self._main_prefix): if not self.is_main_drive(self._main_prefix):
temp_prefix = self._main_prefix temp_prefix = self._main_prefix
self._main_prefix = self._card_a_prefix self._main_prefix = self._card_a_prefix
self._card_a_prefix = temp_prefix self._card_a_prefix = temp_prefix
def osx_sort_names(self, names): def osx_sort_names(self, names):
return self.sort_drives(names) return self.sort_drives(names)
@ -1481,7 +1480,6 @@ class KOBOTOUCH(KOBO):
debug_print('KoboTouch::is_main_drive - main_drive=%s, path=%s' % (drive, os.path.join(drive, '.kobo'))) debug_print('KoboTouch::is_main_drive - main_drive=%s, path=%s' % (drive, os.path.join(drive, '.kobo')))
return os.path.exists(self.normalize_path(os.path.join(drive, '.kobo'))) return os.path.exists(self.normalize_path(os.path.join(drive, '.kobo')))
def books(self, oncard=None, end_session=True): def books(self, oncard=None, end_session=True):
debug_print("KoboTouch:books - oncard='%s'"%oncard) debug_print("KoboTouch:books - oncard='%s'"%oncard)
from calibre.ebooks.metadata.meta import path_to_ext from calibre.ebooks.metadata.meta import path_to_ext