From 45942072c7d0d3b5f987ee89c3060e90a966ce84 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:20:54 +0100 Subject: [PATCH 01/12] Rewrite README.md --- README.md | 72 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index b04af46..32d20a3 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,53 @@ # DeDRM_tools -DeDRM tools for ebooks +This is a repository that tracks all the scripts and other tools for removing DRM from eBooks. -This is a fork of Apprentice Harper's version of the DeDRM tools. Apprentice Harper said that the original version of the plugin [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes. - -The latest stable (released) version is v10.0.3 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3). The latest beta is v10.0.9, as a release candidate for v10.1.0. It [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.9). - -The latest alpha version is available [at this link](https://github.com/noDRM/DeDRM_tools_autorelease/releases). This version is completely untested and will contain the latest code changes in this repository. With each commit in this repository, a new automatic alpha version will be uploaded there. If you want the most up-to-date code to test things and are okay with the plugin occasionally breaking, you can download this version. - -Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). - -My version of the plugin should both work with Calibre 5.x/6.x (Python 3) as well as Calibre 4.x and lower (Python 2). If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report. - -# Original README from Apprentice Harper - -This is a repository that tracks all the scripts and other tools for removing DRM from ebooks that I could find, committed in date order as best as I could manage. (Except for the Requiem tools for Apple's iBooks, and Convert LIT for Microsoft's .lit ebooks.) This includes the tools from a time before Apprentice Alf had a blog, and continues through to when Apprentice Harper (with help) took over maintenance of the tools. - -The individual scripts are now released as two plugins for calibre: DeDRM and Obok. -The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats. -The Obok plugin handles Kobo DRM. - -Users with calibre 5.x or later should use release 7.2.0 or later of the tools. -Users with calibe 4.x or earlier should use release 6.8.x of the tools. - -For the latest Amazon KFX format, users of the calibre plugin should also install the KFX Input plugin from the standard calibre plugin menu. It's also available from the MobileRead thread here: https://www.mobileread.com/forums/showthread.php?t=291290 +This plugin should work with both Calibre 5.x/6.x (Python 3), as well as Calibre 4.x and lower (Python 2).
+If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report. Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. -I welcome contributions from others to improve these tools, from expanding the range of books handled, improving key retrieval, to just general bug fixes, speed improvements and UI enhancements. +For the latest Amazon KFX format, users of the calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu.
+It is also available from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290).* -I urge people to read the FAQs. But to cover the most common: Do remember to unzip the downloaded archive to get the plugin (beta versions may be just the plugin don't unzip that). You can't load the whole tools archive into calibre. +## FAQ -My special thanks to all those developers who have done the hard work of reverse engineering to provide the initial tools. +You are urged to read the [FAQ](https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md). -Apprentice Harper. +The most common issue however - You can't load the nested archive with all the tools into Calibre. +You need to unarchive the downloaded tools archive, to get just the archive with the standalone plugin.
+Beta versions may be just the plugin, don't unarchive that.
+ +## Versions +The latest stable (released) version is v10.0.3, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
+ +The latest beta is v10.0.9, as a release candidate for v10.1.0, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.9).
+ +The latest alpha version, completely untested, [available here](https://github.com/noDRM/DeDRM_tools_autorelease/releases).
+With each commit in this repository, a new alpha version containing the latest code changes will be automatically uploaded.
+If you want the most up-to-date code to test things and you are okay with the plugin occasionally breaking, you can use this version. + +## Tools + +The individual scripts are released as two plugins for Calibre: DeDRM and Obok. + +The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats.
+The Obok plugin handles Kobo DRM. + +## Forked from Apprentice Harper + +Original repository of Apprentice Harper [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes. + +Original README.MD can be found [there](https://github.com/apprenticeharper/DeDRM_tools?tab=readme-ov-file#dedrm_tools). + +## Changelog +Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). + +## Contributions + +Contributions are welcome, including, but not limited to: +* Speed improvements and UI enhancements +* Expanding the range of books handled +* Improving key retrieval +* General bug fixes + +Special thanks to all the developers who have done the hard work of reverse engineering and provided the first DeDRM tools. From 322aa01def329a71903d05346048ffb23df0577b Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:27:38 +0100 Subject: [PATCH 02/12] README.md: Refer to the plugins in correct plural, create separate DeDRM and Obok sections --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 32d20a3..efdb1a7 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,8 @@ # DeDRM_tools This is a repository that tracks all the scripts and other tools for removing DRM from eBooks. -This plugin should work with both Calibre 5.x/6.x (Python 3), as well as Calibre 4.x and lower (Python 2).
-If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report. - -Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. - -For the latest Amazon KFX format, users of the calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu.
-It is also available from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290).* +The provided plugins should work with both Calibre 5.x/6.x (Python 3), as well as Calibre 4.x and lower (Python 2).
+If you encounter issues with the plugins in Calibre 4.x or lower, please open a bug report. ## FAQ @@ -24,13 +19,22 @@ The latest beta is v10.0.9, as a release candidate for v10.1.0, [available here] The latest alpha version, completely untested, [available here](https://github.com/noDRM/DeDRM_tools_autorelease/releases).
With each commit in this repository, a new alpha version containing the latest code changes will be automatically uploaded.
-If you want the most up-to-date code to test things and you are okay with the plugin occasionally breaking, you can use this version. +If you want the most up-to-date code to test things and you are okay with the plugins occasionally breaking, you can use this version. ## Tools The individual scripts are released as two plugins for Calibre: DeDRM and Obok. +### DeDRM + The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats.
+For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu.
+It is also available from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290). + +Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. + +### Obok + The Obok plugin handles Kobo DRM. ## Forked from Apprentice Harper From 12329e7245fafb4cd3ee5a83411d6438aaa4a971 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:29:30 +0100 Subject: [PATCH 03/12] README.md: Remove upstream README mention as this readme contains all its usable contents, and is already linked in the maintenance section --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index efdb1a7..d25ab18 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ This is a repository that tracks all the scripts and other tools for removing DR The provided plugins should work with both Calibre 5.x/6.x (Python 3), as well as Calibre 4.x and lower (Python 2).
If you encounter issues with the plugins in Calibre 4.x or lower, please open a bug report. +The original repository of Apprentice Harper [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes. + ## FAQ You are urged to read the [FAQ](https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md). @@ -37,12 +39,6 @@ Note that Amazon changes the DRM for KFX files frequently. What works for KFX to The Obok plugin handles Kobo DRM. -## Forked from Apprentice Harper - -Original repository of Apprentice Harper [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes. - -Original README.MD can be found [there](https://github.com/apprenticeharper/DeDRM_tools?tab=readme-ov-file#dedrm_tools). - ## Changelog Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). From 580a81f6858b103d2134736cbdd8f73c46f768fd Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:30:17 +0100 Subject: [PATCH 04/12] README.md: Add missing linebreak --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d25ab18..6e4717d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The original repository of Apprentice Harper [is no longer maintained](https://g You are urged to read the [FAQ](https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md). -The most common issue however - You can't load the nested archive with all the tools into Calibre. +The most common issue however - You can't load the nested archive with all the tools into Calibre.
You need to unarchive the downloaded tools archive, to get just the archive with the standalone plugin.
Beta versions may be just the plugin, don't unarchive that.
From 14d600ff9a052d778db3fb350b6b8c09d8b64ee8 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:32:56 +0100 Subject: [PATCH 05/12] README.md: Drop a redundant word --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e4717d..4657b3a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # DeDRM_tools -This is a repository that tracks all the scripts and other tools for removing DRM from eBooks. +This is a repository that tracks all the scripts and tools for removing DRM from eBooks. The provided plugins should work with both Calibre 5.x/6.x (Python 3), as well as Calibre 4.x and lower (Python 2).
If you encounter issues with the plugins in Calibre 4.x or lower, please open a bug report. From ab0a1876385661e1ad0424e93c8d4b1e9050604a Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:41:03 +0100 Subject: [PATCH 06/12] README.md: Link all other READMEs --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4657b3a..6bc65ad 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,15 @@ The original repository of Apprentice Harper [is no longer maintained](https://g ## FAQ -You are urged to read the [FAQ](https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md). +You are urged to read the [FAQ](FAQs.md). -The most common issue however - You can't load the nested archive with all the tools into Calibre.
+The most common issue you may run into is that you cannot load the nested archive with all the tools into Calibre.
You need to unarchive the downloaded tools archive, to get just the archive with the standalone plugin.
Beta versions may be just the plugin, don't unarchive that.
+ReadMe_Overview.txt + + ## Versions The latest stable (released) version is v10.0.3, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
@@ -27,6 +30,10 @@ If you want the most up-to-date code to test things and you are okay with the pl The individual scripts are released as two plugins for Calibre: DeDRM and Obok. +See the plugin [README](DeDRM_plugin_ReadMe.txt) overview. + +For using the tools with Calibre from the CLI, see that [README](CALIBRE_CLI_INSTRUCTIONS.md). + ### DeDRM The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats.
@@ -35,12 +42,16 @@ It is also available from [the MobileRead thread](https://www.mobileread.com/for Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. +See its [README](DeDRM_plugin_ReadMe.txt). + ### Obok The Obok plugin handles Kobo DRM. +See its [README](obok_plugin_ReadMe.txt). + ## Changelog -Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). +Take a look at [the CHANGELOG](CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). ## Contributions From ee4e5fb825303cf12d33f49c9d63e94a4e174b43 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:42:04 +0100 Subject: [PATCH 07/12] README.md: Reduce linebreaks --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6bc65ad..17321ba 100644 --- a/README.md +++ b/README.md @@ -30,25 +30,22 @@ If you want the most up-to-date code to test things and you are okay with the pl The individual scripts are released as two plugins for Calibre: DeDRM and Obok. -See the plugin [README](DeDRM_plugin_ReadMe.txt) overview. - +See the plugin [README](DeDRM_plugin_ReadMe.txt) overview.
For using the tools with Calibre from the CLI, see that [README](CALIBRE_CLI_INSTRUCTIONS.md). ### DeDRM -The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats.
+The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats, see its [README](DeDRM_plugin_ReadMe.txt). +.
For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu.
It is also available from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290). Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. -See its [README](DeDRM_plugin_ReadMe.txt). ### Obok -The Obok plugin handles Kobo DRM. - -See its [README](obok_plugin_ReadMe.txt). +The Obok plugin handles Kobo DRM, see its [README](obok_plugin_ReadMe.txt). ## Changelog Take a look at [the CHANGELOG](CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). From 2639db9942be92ac8566c1e9a8382f914a711fe0 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:42:48 +0100 Subject: [PATCH 08/12] README.md: Reduce linebreaks --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 17321ba..20f5177 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,11 @@ For using the tools with Calibre from the CLI, see that [README](CALIBRE_CLI_INS The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats, see its [README](DeDRM_plugin_ReadMe.txt). .
-For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu.
-It is also available from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290). + +For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu, or manually from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290). Note that Amazon changes the DRM for KFX files frequently. What works for KFX today might not work tomorrow. - ### Obok The Obok plugin handles Kobo DRM, see its [README](obok_plugin_ReadMe.txt). From af0430bce494144ebd96cc941d1a5cd97525637b Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:43:12 +0100 Subject: [PATCH 09/12] README.md: Remove extra dot --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 20f5177..430360b 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ For using the tools with Calibre from the CLI, see that [README](CALIBRE_CLI_INS ### DeDRM The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats, see its [README](DeDRM_plugin_ReadMe.txt). -.
For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu, or manually from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290). From a801effe528df86724960ef6e0288308eece65b2 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 15:46:12 +0100 Subject: [PATCH 10/12] README.md: Name Stable release as such instead of adding (released) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 430360b..ef5fb8e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ReadMe_Overview.txt ## Versions -The latest stable (released) version is v10.0.3, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
+The latest stable release is v10.0.3, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
The latest beta is v10.0.9, as a release candidate for v10.1.0, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.9).
From 4a8a30a541443804b3d962c9db95aa160c79ddf1 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 18:07:44 +0100 Subject: [PATCH 11/12] README.md: Fix up README link to overview --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ef5fb8e..0e972d1 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,7 @@ The most common issue you may run into is that you cannot load the nested archiv You need to unarchive the downloaded tools archive, to get just the archive with the standalone plugin.
Beta versions may be just the plugin, don't unarchive that.
-ReadMe_Overview.txt - +There is also a general [README overview](ReadMe_Overview.txt). ## Versions The latest stable release is v10.0.3, [available here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3).
@@ -30,8 +29,8 @@ If you want the most up-to-date code to test things and you are okay with the pl The individual scripts are released as two plugins for Calibre: DeDRM and Obok. -See the plugin [README](DeDRM_plugin_ReadMe.txt) overview.
-For using the tools with Calibre from the CLI, see that [README](CALIBRE_CLI_INSTRUCTIONS.md). +See the [plugin README overview](DeDRM_plugin_ReadMe.txt).
+For using the tools on CLI, see the [Calibre CLI README](CALIBRE_CLI_INSTRUCTIONS.md). ### DeDRM @@ -43,7 +42,7 @@ Note that Amazon changes the DRM for KFX files frequently. What works for KFX to ### Obok -The Obok plugin handles Kobo DRM, see its [README](obok_plugin_ReadMe.txt). +The Obok plugin handles Kobo DRM, see the [Obok README](obok_plugin_ReadMe.txt). ## Changelog Take a look at [the CHANGELOG](CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). From f93fd57c0979ade68cfa987649ed88de6a96c875 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 10 Nov 2024 18:08:09 +0100 Subject: [PATCH 12/12] README.md: Add DeDRM readme text to the hyperlink --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e972d1..c66b558 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ For using the tools on CLI, see the [Calibre CLI README](CALIBRE_CLI_INSTRUCTION ### DeDRM -The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats, see its [README](DeDRM_plugin_ReadMe.txt). +The DeDRM plugin handles books that use Amazon DRM, Adobe Digital Editions DRM, Barnes & Noble DRM, and some historical formats, see the [DeDRM README](DeDRM_plugin_ReadMe.txt). For the latest Amazon KFX format, users of the Calibre plugin should also install the KFX Input plugin from the standard Calibre plugin menu, or manually from [the MobileRead thread](https://www.mobileread.com/forums/showthread.php?t=291290).