diff --git a/Obok_calibre_plugin/obok_plugin.zip b/Obok_calibre_plugin/obok_plugin.zip index ffa230e..8c22732 100644 Binary files a/Obok_calibre_plugin/obok_plugin.zip and b/Obok_calibre_plugin/obok_plugin.zip differ diff --git a/Obok_calibre_plugin/obok_plugin/__init__.py b/Obok_calibre_plugin/obok_plugin/__init__.py index f627a42..0b4e7d3 100644 --- a/Obok_calibre_plugin/obok_plugin/__init__.py +++ b/Obok_calibre_plugin/obok_plugin/__init__.py @@ -19,7 +19,7 @@ except NameError: PLUGIN_NAME = 'Obok DeDRM' PLUGIN_SAFE_NAME = PLUGIN_NAME.strip().lower().replace(' ', '_') PLUGIN_DESCRIPTION = _('Removes DRM from Kobo kepubs and adds them to the library.') -PLUGIN_VERSION_TUPLE = (3, 1, 4) +PLUGIN_VERSION_TUPLE = (3, 1, 5) PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE]) HELPFILE_NAME = PLUGIN_SAFE_NAME + '_Help.htm' PLUGIN_AUTHORS = 'Anon' diff --git a/Obok_calibre_plugin/obok_plugin/obok/obok.py b/Obok_calibre_plugin/obok_plugin/obok/obok.py index 0545152..1e93c0e 100644 --- a/Obok_calibre_plugin/obok_plugin/obok/obok.py +++ b/Obok_calibre_plugin/obok_plugin/obok/obok.py @@ -1,6 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Version 3.1.5 September 2015 +# Removed requirement that a purchase has been made. +# # Version 3.1.4 September 2015 # Updated for version 3.17 of the Windows Desktop app. # @@ -115,7 +118,7 @@ # """Manage all Kobo books, either encrypted or DRM-free.""" -__version__ = '3.1.3' +__version__ = '3.1.5' import sys import os @@ -301,7 +304,7 @@ class KoboLibrary(object): def __getuserids (self): userids = [] - cursor = self.__cursor.execute('SELECT UserID FROM user WHERE HasMadePurchase = "true"') + cursor = self.__cursor.execute('SELECT UserID FROM user') row = cursor.fetchone() while row is not None: try: diff --git a/Other_Tools/Kobo/obok.py b/Other_Tools/Kobo/obok.py index 0545152..1e93c0e 100644 --- a/Other_Tools/Kobo/obok.py +++ b/Other_Tools/Kobo/obok.py @@ -1,6 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Version 3.1.5 September 2015 +# Removed requirement that a purchase has been made. +# # Version 3.1.4 September 2015 # Updated for version 3.17 of the Windows Desktop app. # @@ -115,7 +118,7 @@ # """Manage all Kobo books, either encrypted or DRM-free.""" -__version__ = '3.1.3' +__version__ = '3.1.5' import sys import os @@ -301,7 +304,7 @@ class KoboLibrary(object): def __getuserids (self): userids = [] - cursor = self.__cursor.execute('SELECT UserID FROM user WHERE HasMadePurchase = "true"') + cursor = self.__cursor.execute('SELECT UserID FROM user') row = cursor.fetchone() while row is not None: try: