From b9bad26d4b6efa43efdafd8b060f33ea1d945f36 Mon Sep 17 00:00:00 2001 From: NoDRM Date: Wed, 2 Aug 2023 07:39:35 +0200 Subject: [PATCH] Prepare release candidate v10.0.9 --- .github/ISSUE_TEMPLATE/QUESTION.yml | 8 ++++---- CHANGELOG.md | 10 +++++++++- DeDRM_plugin/DeDRM_Help.htm | 6 ++++-- DeDRM_plugin/__init__.py | 3 ++- DeDRM_plugin/__version.py | 2 +- Obok_plugin/__init__.py | 4 ++-- Obok_plugin/obok/obok.py | 4 ++-- Obok_plugin/obok_dedrm_Help.htm | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index d738b2c3..08477d1d 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -10,16 +10,16 @@ body: id: calibre-version attributes: label: Which version of Calibre are you running? - description: "Example: 5.32" - placeholder: "5.32" + description: "Example: 6.23" + placeholder: "6.23" validations: required: true - type: input id: plugin-version attributes: label: Which version of the DeDRM plugin are you running? - description: "Example: v10.0.0" - placeholder: "v10.0.0" + description: "Example: v10.0.2" + placeholder: "v10.0.2" validations: required: true - type: input diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0ecbcd..51478fb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,11 @@ List of changes since the fork of Apprentice Harper's repository: - Fix Nook Study key retrieval code (partially fixes #50). - Make the plugin work on Calibre 6 (Qt 6). (fixes #54 and #98) If you're running Calibre 6 and you notice any issues, please open a bug report. -## Fixes on master (not yet released): +## Fixes in v10.0.9 (RC for v10.1.0, 2023-08-02): + +Note that versions v10.0.4(s), v10.0.5(s) and v10.0.6(s) were released by other people in various forks, so I have decided to make a larger version jump so there are no conflicting version numbers / different builds with the same version number. + +This is v10.0.9, a release candidate for v10.1.0. I don't expect there to be major issues / bugs, but since a lot of code has changed in the last year I wanted to get some "extended testing" before this becomes v10.1.0. - Fix a bug introduced with #48 that breaks DeDRM'ing on Calibre 4 (fixes #101). - Fix some more Calibre-6 bugs in the Obok plugin (should fix #114). @@ -92,3 +96,7 @@ List of changes since the fork of Apprentice Harper's repository: - Two bugfixes for Amazon DeDRM from Satuoni ( https://github.com/noDRM/DeDRM_tools/issues/315#issuecomment-1508305428 ) and andrewc12 ( https://github.com/andrewc12/DeDRM_tools/commit/d9233d61f00d4484235863969919059f4d0b2057 ) that might make the plugin work with newer versions. - Fix font decryption not working with some books (fixes #347), thanks for the patch @bydioeds. - Fix a couple unicode errors for Python2 in Kindle and Nook code. + +## Fixes on master (not yet released): + +- (none) diff --git a/DeDRM_plugin/DeDRM_Help.htm b/DeDRM_plugin/DeDRM_Help.htm index 5d851592..f658c1c6 100644 --- a/DeDRM_plugin/DeDRM_Help.htm +++ b/DeDRM_plugin/DeDRM_Help.htm @@ -17,7 +17,7 @@ -

DeDRM Plugin (v10.0.3)

+

DeDRM Plugin (v10.0.9 / v10.1.0 RC1)

This plugin removes DRM from ebooks when they are imported into calibre. If you already have DRMed ebooks in your calibre library, you will need to remove them and import them again.

@@ -26,6 +26,8 @@

DeDRM Plugin (v10.0.3)

Installation

You have obviously managed to install the plugin, as otherwise you wouldn’t be reading this help file. However, you should also delete any older DRM removal plugins, as this DeDRM plugin replaces the five older plugins: Kindle and Mobipocket DeDRM (K4MobiDeDRM), Ignoble Epub DeDRM (ignobleepub), Inept Epub DeDRM (ineptepub), Inept PDF DeDRM (ineptepub) and eReader PDB 2 PML (eReaderPDB2PML).

+

This plugin (in versions v10.0.0 and above) will automatically replace the older 7.X and below versions from Apprentice Alf and Apprentice Harper.

+

Configuration

On Windows and Mac, the keys for ebooks downloaded for Kindle for Mac/PC and Adobe Digital Editions are automatically generated. If all your DRMed ebooks can be opened and read in Kindle for Mac/PC and/or Adobe Digital Editions on the same computer on which you are running calibre, you do not need to do any configuration of this plugin. On Linux, keys for Kindle for PC and Adobe Digital Editions need to be generated separately (see the Linux section below).

@@ -60,7 +62,7 @@

Credits:

  • And probably many more.
    • -

    For additional help read the FAQs at NoDRM's GitHub repository (or the corresponding FAQs at Apprentice Harpers’s GitHub repository). You can open issue reportsrelated to this fork at NoDRM's GitHub repository.

    +

    For additional help read the FAQs at NoDRM's GitHub repository (or the corresponding FAQs at Apprentice Harpers’s GitHub repository). You can open issue reports related to this fork at NoDRM's GitHub repository.

    Linux Systems Only

    diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py index 9204600b..9098817a 100644 --- a/DeDRM_plugin/__init__.py +++ b/DeDRM_plugin/__init__.py @@ -5,7 +5,7 @@ # __init__.py for DeDRM_plugin # Copyright © 2008-2020 Apprentice Harper et al. -# Copyright © 2021 NoDRM +# Copyright © 2021-2023 NoDRM __license__ = 'GPL v3' __docformat__ = 'restructuredtext en' @@ -82,6 +82,7 @@ # 10.0.0 - First forked version by NoDRM. See CHANGELOG.md for details. # 10.0.1 - Fixes a bug in the watermark code. # 10.0.2 - Fix Kindle for Mac & update Adobe key retrieval +# For changes made in 10.0.3 and above, see the CHANGELOG.md file """ Decrypt DRMed ebooks. diff --git a/DeDRM_plugin/__version.py b/DeDRM_plugin/__version.py index ab2ebb0f..e83b3a41 100644 --- a/DeDRM_plugin/__version.py +++ b/DeDRM_plugin/__version.py @@ -4,7 +4,7 @@ #@@CALIBRE_COMPAT_CODE@@ PLUGIN_NAME = "DeDRM" -__version__ = '10.0.3' +__version__ = '10.0.9' PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")]) PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE]) diff --git a/Obok_plugin/__init__.py b/Obok_plugin/__init__.py index f752d5cd..864ded37 100644 --- a/Obok_plugin/__init__.py +++ b/Obok_plugin/__init__.py @@ -3,7 +3,7 @@ print_function) __license__ = 'GPL v3' -__version__ = '10.0.3' +__version__ = '10.0.9' __docformat__ = 'restructuredtext en' ##################################################################### @@ -20,7 +20,7 @@ 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 = (10, 0, 3) +PLUGIN_VERSION_TUPLE = (10, 0, 9) 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/obok/obok.py b/Obok_plugin/obok/obok.py index dc0a30d7..603e7739 100644 --- a/Obok_plugin/obok/obok.py +++ b/Obok_plugin/obok/obok.py @@ -168,8 +168,8 @@ """Manage all Kobo books, either encrypted or DRM-free.""" from __future__ import print_function -__version__ = '10.0.1' -__about__ = "Obok v{0}\nCopyright © 2012-2022 Physisticated et al.".format(__version__) +__version__ = '10.0.9' +__about__ = "Obok v{0}\nCopyright © 2012-2023 Physisticated et al.".format(__version__) import sys import os diff --git a/Obok_plugin/obok_dedrm_Help.htm b/Obok_plugin/obok_dedrm_Help.htm index 4d1247e1..9ccb736e 100644 --- a/Obok_plugin/obok_dedrm_Help.htm +++ b/Obok_plugin/obok_dedrm_Help.htm @@ -8,7 +8,7 @@

    Obok DeDRM Plugin

    -

    (version 10.0.2)

    +

    (version 10.0.9 / 10.1.0 RC1)

    Installation: