diff --git a/Obok_calibre_plugin/obok_plugin.zip b/Obok_calibre_plugin/obok_plugin.zip index 1e47967..7c0c62a 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 dffa99f..d652af5 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 = (6, 5, 2) +PLUGIN_VERSION_TUPLE = (6, 5, 3) 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 e744c2b..149d09c 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.2.3 October 2016 +# Fix for windows network user and more xml fixes +# # Version 3.2.2 October 2016 # Change to the way the new database version is handled. # @@ -142,7 +145,7 @@ # """Manage all Kobo books, either encrypted or DRM-free.""" -__version__ = '3.2.2' +__version__ = '3.2.3' __about__ = u"Obok v{0}\nCopyright © 2012-2016 Physisticated et al.".format(__version__) import sys @@ -428,7 +431,8 @@ class KoboLibrary(object): macaddrs = [] if sys.platform.startswith('win'): c = re.compile('\s(' + '[0-9a-f]{2}-' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE) - for line in os.popen('ipconfig /all'): + (p_in, p_out, p_err) = os.popen3('ipconfig /all') + for line in p_out: m = c.search(line) if m: macaddrs.append(re.sub("-", ":", m.group(1)).upper()) @@ -587,6 +591,15 @@ class KoboFile(object): elif contents[:14]=="\xff\xfe<\x00?\x00x\x00m\x00l\x00": # utf-16LE return True + elif contents[:9]=="