From 2db7ee8894a2145c6b9f29d994c63e139a83f532 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 18 Sep 2015 08:58:01 +0900 Subject: [PATCH 1/2] obok_plugin:action.py - get serial from device if possible --- Obok_calibre_plugin/obok_plugin/action.py | 31 ++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/Obok_calibre_plugin/obok_plugin/action.py b/Obok_calibre_plugin/obok_plugin/action.py index e82e29b..cfa164d 100644 --- a/Obok_calibre_plugin/obok_plugin/action.py +++ b/Obok_calibre_plugin/obok_plugin/action.py @@ -34,6 +34,15 @@ from calibre_plugins.obok_dedrm.utilities import ( from calibre_plugins.obok_dedrm.obok.obok import KoboLibrary from calibre_plugins.obok_dedrm.obok.legacy_obok import legacy_obok +can_parse_xml = True +try: + from xml.etree import ElementTree as ET + debug_print("using xml.etree for xml parsing") +except ImportError: + can_parse_xml = False + debug_print("Cannot find xml.etree, disabling extraction of serial numbers") + + PLUGIN_ICONS = ['images/obok.png'] try: @@ -80,21 +89,37 @@ class InterfacePluginAction(InterfaceAction): print ('Running {}'.format(PLUGIN_NAME + ' v' + PLUGIN_VERSION)) # # search for connected device in case serials are saved + tmpserials = cfg['kobo_serials'] device = self.parent().device_manager.connected_device device_path = None if (device): - device_path = self.parent().device_manager.connected_device._main_prefix + device_path = device._main_prefix debug_print("get_device_settings - device_path=", device_path) + # get serial from device_path/.adobe-digital-editions/device.xml + if can_parse_xml: + devicexml = os.path.join(device_path, '.adobe-digital-editions', 'device.xml') + debug_print("trying to load %s" % devicexml) + if (os.path.exists(devicexml)): + debug_print("trying to parse %s" % devicexml) + xmltree = ET.parse(devicexml) + for node in xmltree.iter(): + if "deviceSerial" in node.tag: + serial = node.text + debug_print ("found serial %s" % serial) + tmpserials.append(serial) + break + + else: debug_print("didn't find device") # Get the Kobo Library object (obok v3.01) - self.library = KoboLibrary(cfg['kobo_serials'], device_path) + self.library = KoboLibrary(tmpserials, device_path) debug_print ("got kobodir %s" % self.library.kobodir) if (self.library.kobodir == ''): # linux and no device connected, but could be extended # to the case where on Windows/Mac the prog is not installed - msg = _('

Could not find Kobo Library\n

Windows/Mac: do you have Kobo Desktop installed?\n

Windows/Mac/Linux: In case you have an Kobo eInk device, configure the serial number and connect the device.') + msg = _('

Could not find Kobo Library\n

Windows/Mac: do you have Kobo Desktop installed?\n

Windows/Mac/Linux: In case you have an Kobo eInk device, connect the device.') showErrorDlg(msg, None) return From fe6074949bda4e2d50ca69db4424a27b53b477be Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 18 Sep 2015 09:10:06 +0900 Subject: [PATCH 2/2] obok.py: first try device, and only if that fails fall back to Desktop progs --- Obok_calibre_plugin/obok_plugin/obok/obok.py | 48 ++++++++++---------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/Obok_calibre_plugin/obok_plugin/obok/obok.py b/Obok_calibre_plugin/obok_plugin/obok/obok.py index f845185..ca74284 100644 --- a/Obok_calibre_plugin/obok_plugin/obok/obok.py +++ b/Obok_calibre_plugin/obok_plugin/obok/obok.py @@ -248,29 +248,31 @@ class KoboLibrary(object): print u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__) self.kobodir = '' kobodb = '' - if sys.platform.startswith('win'): - if sys.getwindowsversion().major > 5: - self.kobodir = os.environ['LOCALAPPDATA'] - else: - self.kobodir = os.path.join(os.environ['USERPROFILE'], 'Local Settings', 'Application Data') - self.kobodir = os.path.join(self.kobodir, 'Kobo', 'Kobo Desktop Edition') - elif sys.platform.startswith('darwin'): - self.kobodir = os.path.join(os.environ['HOME'], 'Library', 'Application Support', 'Kobo', 'Kobo Desktop Edition') - # desktop versions use Kobo.sqlite - kobodb = os.path.join(self.kobodir, 'Kobo.sqlite') - if (self.kobodir == '' or not(os.path.exists(kobodb))): - # kobodb is either not set or not an existing file, that means that either: - # . windows or mac: desktop app is not installed - # . linux - # we check for a connected device and try to set up kobodir and kobodb from there - if (device_path): - self.kobodir = os.path.join(device_path, '.kobo') - # devices use KoboReader.sqlite - kobodb = os.path.join(self.kobodir, 'KoboReader.sqlite') - if (not(os.path.exists(kobodb))): - # give up here, we haven't found anything useful - self.kobodir = '' - kobodb = '' + + # - first check whether serials have been found or are provided + # and a device is connected. In this case, use the device + # - otherwise fall back to Kobo Desktop Application for Windows and Mac + if (device_path and (len(serials) > 0)): + self.kobodir = os.path.join(device_path, '.kobo') + # devices use KoboReader.sqlite + kobodb = os.path.join(self.kobodir, 'KoboReader.sqlite') + if (not(os.path.exists(kobodb))): + # give up here, we haven't found anything useful + self.kobodir = '' + kobodb = '' + + if (self.kobodir == ''): + # we haven't found a device with serials, so try desktop apps + if sys.platform.startswith('win'): + if sys.getwindowsversion().major > 5: + self.kobodir = os.environ['LOCALAPPDATA'] + else: + self.kobodir = os.path.join(os.environ['USERPROFILE'], 'Local Settings', 'Application Data') + self.kobodir = os.path.join(self.kobodir, 'Kobo', 'Kobo Desktop Edition') + elif sys.platform.startswith('darwin'): + self.kobodir = os.path.join(os.environ['HOME'], 'Library', 'Application Support', 'Kobo', 'Kobo Desktop Edition') + # desktop versions use Kobo.sqlite + kobodb = os.path.join(self.kobodir, 'Kobo.sqlite') if (self.kobodir != ''): self.bookdir = os.path.join(self.kobodir, 'kepub')