updated version number and script copy for obok changes

This commit is contained in:
apprenticeharper 2015-10-13 08:05:34 +01:00
parent fc156852a4
commit 9434751a72
3 changed files with 15 additions and 3 deletions

Binary file not shown.

View File

@ -1,6 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Version 3.1.7 October 2015
# Handle the case of no device or database more gracefully.
#
# Version 3.1.6 September 2015 # Version 3.1.6 September 2015
# Enable support for Kobo devices # Enable support for Kobo devices
# More character encoding fixes (unicode strings) # More character encoding fixes (unicode strings)
@ -123,7 +126,7 @@
# #
"""Manage all Kobo books, either encrypted or DRM-free.""" """Manage all Kobo books, either encrypted or DRM-free."""
__version__ = '3.1.6' __version__ = '3.1.7'
import sys import sys
import os import os

View File

@ -1,6 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Version 3.1.7 October 2015
# Handle the case of no device or database more gracefully.
#
# Version 3.1.6 September 2015 # Version 3.1.6 September 2015
# Enable support for Kobo devices # Enable support for Kobo devices
# More character encoding fixes (unicode strings) # More character encoding fixes (unicode strings)
@ -123,7 +126,7 @@
# #
"""Manage all Kobo books, either encrypted or DRM-free.""" """Manage all Kobo books, either encrypted or DRM-free."""
__version__ = '3.1.6' __version__ = '3.1.7'
import sys import sys
import os import os
@ -260,7 +263,7 @@ class KoboLibrary(object):
self.kobodir = os.path.join(device_path, u".kobo") self.kobodir = os.path.join(device_path, u".kobo")
# devices use KoboReader.sqlite # devices use KoboReader.sqlite
kobodb = os.path.join(self.kobodir, u"KoboReader.sqlite") kobodb = os.path.join(self.kobodir, u"KoboReader.sqlite")
if (not(os.path.exists(kobodb))): if (not(os.path.isfile(kobodb))):
# give up here, we haven't found anything useful # give up here, we haven't found anything useful
self.kobodir = u"" self.kobodir = u""
kobodb = u"" kobodb = u""
@ -282,6 +285,12 @@ class KoboLibrary(object):
self.kobodir = os.path.join(os.environ['HOME'], u"Library", u"Application Support", u"Kobo", u"Kobo Desktop Edition") self.kobodir = os.path.join(os.environ['HOME'], u"Library", u"Application Support", u"Kobo", u"Kobo Desktop Edition")
# desktop versions use Kobo.sqlite # desktop versions use Kobo.sqlite
kobodb = os.path.join(self.kobodir, u"Kobo.sqlite") kobodb = os.path.join(self.kobodir, u"Kobo.sqlite")
# check for existence of file
if (not(os.path.isfile(kobodb))):
# give up here, we haven't found anything useful
self.kobodir = u""
kobodb = u""
if (self.kobodir != u""): if (self.kobodir != u""):
self.bookdir = os.path.join(self.kobodir, u"kepub") self.bookdir = os.path.join(self.kobodir, u"kepub")