obok.py: first try device, and only if that fails fall back to Desktop progs

This commit is contained in:
Norbert Preining 2015-09-18 09:10:06 +09:00
parent 2db7ee8894
commit fe6074949b

View file

@ -248,6 +248,21 @@ class KoboLibrary(object):
print u"Obok v{0}\nCopyright © 2012-2015 Physisticated et al.".format(__version__)
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']
@ -258,19 +273,6 @@ class KoboLibrary(object):
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 = ''
if (self.kobodir != ''):
self.bookdir = os.path.join(self.kobodir, 'kepub')