Obok plugin cleanup

diff --git a/Obok_plugin/__init__.py b/Obok_plugin/__init__.py
index 60daad37d4fceb3bc3f58bce7d8fba04b6d38833..2ecc16a98a0371be909cbe4782ad02d063c56d9a 100644 (file)
--- a/Obok_plugin/__init__.py
+++ b/Obok_plugin/__init__.py
@@ -3,7 +3,7 @@ from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
 __license__   = 'GPL v3'
-__version__ = '7.2.1'
+__version__ = '10.0.0'
 __docformat__ = 'restructuredtext en'
 
 #####################################################################
@@ -20,7 +20,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 = (7, 2, 1)
+PLUGIN_VERSION_TUPLE = (10, 0, 0)
 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_plugin/config.py b/Obok_plugin/config.py
index 2830dad2deb48190da071cd66322a0e062374398..deb29f9b4f6998c4f921b7c3695a86ece4cfe5c1 100644 (file)
--- a/Obok_plugin/config.py
+++ b/Obok_plugin/config.py
@@ -204,7 +204,7 @@ class AddSerialDialog(QDialog):
 
     def accept(self):
         if len(self.key_name) == 0 or self.key_name.isspace():
-            errmsg = "Please enter an eInk Kindle Serial Number or click Cancel in the dialog."
+            errmsg = "Please enter an eInk Kobo Serial Number or click Cancel in the dialog."
             return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
         if len(self.key_name) != 13:
             errmsg = "EInk Kobo Serial Numbers must be 13 characters long. This is {0:d} characters long.".format(len(self.key_name))

diff --git a/Obok_plugin/obok/obok.py b/Obok_plugin/obok/obok.py
index 00f2207c482e1597876f7e4c0eaa1517562999f9..ae8ff899d4ec076559c65603d7c5bbee8df3c6a1 100644 (file)
--- a/Obok_plugin/obok/obok.py
+++ b/Obok_plugin/obok/obok.py
@@ -1,9 +1,13 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+# Version 10.0.0 November 2021
+# Merge https://github.com/apprenticeharper/DeDRM_tools/pull/1691 to fix
+# key fetch issues on some machines.
+#
 # Version 4.1.0 February 2021
 # Add detection for Kobo directory location on Linux
-
+#
 # Version 4.0.0 September 2020
 # Python 3.0
 #