diff --git a/Obok_calibre_plugin/obok_plugin/__init__.py b/Obok_calibre_plugin/obok_plugin/__init__.py index 7b67e7a..101b8fa 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, 1) +PLUGIN_VERSION_TUPLE = (3, 1, 2) 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 7288080..42620d2 100644 --- a/Obok_calibre_plugin/obok_plugin/obok/obok.py +++ b/Obok_calibre_plugin/obok_plugin/obok/obok.py @@ -1,10 +1,14 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# Version 3.1.2 January 2015 +# Add coding, version number and version announcement +# # Version 3.05 October 2014 # Identifies DRM-free books in the dialog # # Version 3.04 September 2014 -# Handles DRM-free books as well (sometimes Kobo Library doesn't +# Handles DRM-free books as well (sometimes Kobo Library doesn't # show download link for DRM-free books) # # Version 3.03 August 2014 @@ -104,6 +108,9 @@ # after all. # """Manage all Kobo books, either encrypted or DRM-free.""" + +__version__ = '3.1.1' + import sys import os import subprocess @@ -210,6 +217,7 @@ class KoboLibrary(object): of books, their titles, and the user's encryption key(s).""" def __init__ (self): + print u"Obok v{0}\nCopyright © 2012-2014 Physisticated et al.".format(__version__) if sys.platform.startswith('win'): if sys.getwindowsversion().major > 5: self.kobodir = os.environ['LOCALAPPDATA'] @@ -446,7 +454,7 @@ if __name__ == '__main__': zin = zipfile.ZipFile(book.filename, "r") # make filename out of Unicode alphanumeric and whitespace equivalents from title outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE)) - + if (book.type == 'drm-free'): print "DRM-free book, conversion is not needed" shutil.copyfile(book.filename, outname) diff --git a/Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm b/Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm index d3cc27c..c631a82 100644 --- a/Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm +++ b/Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm @@ -8,12 +8,7 @@

Obok DeDRM Plugin

-

(version 3.1.0)

-

Headlines and links.

- -

Stuff.

- -

And more stuff.

+

(version 3.1.2)

Installation:

@@ -29,8 +24,7 @@

If you find that it’s not working for you , you can save a lot of time by using the plugin with Calibre in debug mode. This will print out a lot of helpful info that can be copied into any online help requests.

-

Open a command prompt (terminal window) and type "calibre-debug -g" (without the quotes). Calibre will launch, and you can use the plugin the usual way. The debug info will be output to the original command prompt (terminal window). Copy the resulting output and paste it into the comment you make at my blog.

-

Note: The Mac version of Calibre doesn’t install the command line tools by default. If you go to the ‘Preferences’ page and click on the miscellaneous button, you’ll find the option to install the command line tools.

+

Open a command prompt (terminal window) and type "calibre-debug -g" (without the quotes). Calibre will launch, and you can use the plugin the usual way. The debug info will be output to the original command prompt (terminal window). Copy the resulting output and paste it into the comment you make at Apprentice Alf's blog.