diff --git a/CHANGELOG.md b/CHANGELOG.md index 569d9821..48a09bd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,7 +97,7 @@ This is v10.0.9, a release candidate for v10.1.0. I don't expect there to be maj - 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): +## Fixes in v10.1.0 (2026-06-10): - Fix a bug where decrypting a 40-bit RC4 pdf with R=2 didn't work. - Fix a bug where decrypting a 256-bit AES pdf with V=5 didn't work. @@ -110,4 +110,7 @@ This is v10.0.9, a release candidate for v10.1.0. I don't expect there to be maj - Make Kobo DRM removal not fail when there are undownloaded ebooks (#384, thanks @precondition). - Fix Obok import failing in Calibre flatpak due to missing ip command (#586 and #585, thanks @jcotton42). - Don't re-pack EPUB if there's no DRM to remove and no postprocessing done (fixes #555). +- Update note about K4PC key import/export in help file (fixes #663). +- Update Obok readme to include wmic requirement (fixes #670). +- Remove future import from ion.py. diff --git a/DeDRM_plugin/__version.py b/DeDRM_plugin/__version.py index e83b3a41..b7b5d018 100644 --- a/DeDRM_plugin/__version.py +++ b/DeDRM_plugin/__version.py @@ -4,7 +4,7 @@ #@@CALIBRE_COMPAT_CODE@@ PLUGIN_NAME = "DeDRM" -__version__ = '10.0.9' +__version__ = '10.1.0' 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/DeDRM_release_10.1.0/DeDRM_plugin.zip b/DeDRM_release_10.1.0/DeDRM_plugin.zip new file mode 100644 index 00000000..198d2202 Binary files /dev/null and b/DeDRM_release_10.1.0/DeDRM_plugin.zip differ diff --git a/DeDRM_release_10.1.0/DeDRM_plugin_ReadMe.txt b/DeDRM_release_10.1.0/DeDRM_plugin_ReadMe.txt new file mode 100644 index 00000000..91e1d28f --- /dev/null +++ b/DeDRM_release_10.1.0/DeDRM_plugin_ReadMe.txt @@ -0,0 +1,36 @@ +DeDRM_plugin.zip +================ + +This plugin will remove the DRM from: + + - Kindle ebooks (files from Kindle for Mac/PC and eInk Kindles). + - Adobe Digital Editions ePubs (including Kobo and Google ePubs downloaded to ADE) + - Adobe Digital Editions PDFs + +For limitations and work-arounds, see the FAQ at https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md (or the FAQ in Apprentice Harper's original repository at https://github.com/apprenticeharper/DeDRM_tools/blob/master/FAQs.md) + + +Installation +------------ +Open calibre's Preferences dialog. Click on the "Plugins" button. Next, click on the button, "Load plugin from file". Navigate to the unzipped DeDRM_tools folder, find the file "DeDRM_plugin.zip". Click to select the file and select "Open". Click "Yes" in the "Are you sure?" dialog box. Click the "OK" button in the "Success" dialog box. + + +Customization +------------- +For Kindle ebooks from an E-Ink based Kindle (e.g. Voyage), or books downloaded from the Amazon web site 'for transfer via USB' to an E-Ink base Kindle, you must enter the Kindle's serial number in the customisation dialog. + +When you have finished entering your configuration information, you must click the OK button to save it. If you click the Cancel button, all your changes in all the configuration dialogs will be lost. + + +Troubleshooting +--------------- +If you find that the DeDRM plugin is not working for you (imported ebooks still have DRM - that is, they won't convert or open in the calibre ebook viewer), you should make a log of the import process by deleting the DRMed ebook from calibre and then adding the ebook to calibre when it's running in debug mode. This will generate a lot of helpful debugging info that can be copied into any online help requests. Here's how to do it: + + - Remove the DRMed book from calibre. + - Click the Preferences drop-down menu and choose 'Restart in debug mode'. + - Once calibre has re-started, import the problem ebook. + - Now close calibre. + +A log will appear that you can copy and paste into a GitHub issue report at https://github.com/noDRM/DeDRM_tools/issues. Please also include information about the eBook file. + +If you're using Apprentice Harper's original version, you can also comment at Apprentice Alf's blog, http://apprenticealf.wordpress.com/ or open an issue at Apprentice Harper's repository, https://github.com/apprenticeharper/DeDRM_tools/issues. diff --git a/DeDRM_release_10.1.0/Obok_plugin.zip b/DeDRM_release_10.1.0/Obok_plugin.zip new file mode 100644 index 00000000..315d669c Binary files /dev/null and b/DeDRM_release_10.1.0/Obok_plugin.zip differ diff --git a/DeDRM_release_10.1.0/ReadMe_Overview.txt b/DeDRM_release_10.1.0/ReadMe_Overview.txt new file mode 100644 index 00000000..82cd5471 --- /dev/null +++ b/DeDRM_release_10.1.0/ReadMe_Overview.txt @@ -0,0 +1,60 @@ +Welcome to the tools! +===================== + +This file is to give users a quick overview of what is available and how to get started. This document is part of the DeDRM Tools archive from noDRM's github repository: https://github.com/noDRM/DeDRM_tools/ + +This archive includes calibre plugins to remove DRM from: + + - Kindle ebooks (files from Kindle for Mac/PC and eInk Kindles). + - Adobe Digital Editions ePubs (including Kobo and Google ePubs downloaded to ADE) + - Adobe Digital Editions PDFs + - Kobo kePubs from the Kobo Desktop application and attached Kobo readers. + +These tools do NOT work with Apple's iBooks FairPlay DRM. Use iBook Copy from TunesKit. +These tools no longer work well with books from Barnes & Noble. +Due to a DMCA request, these tools no longer work with LCP-encrypted books - see https://github.com/noDRM/DeDRM_tools/issues/18 for details. + +For limitations and work-arounds, see the FAQ at https://github.com/noDRM/DeDRM_tools/blob/master/FAQs.md + +About the tools +--------------- +These tools are updated and maintained by noDRM and many others. They are based on Apprentice Harper's Calibre plugin. You can find the latest updates at noDRM's github repository https://github.com/noDRM/DeDRM_tools/ and get support by creating an issue at the repository (github account required). + +If you re-post these tools, a link to the repository would be appreciated. + +The tools are provided in the form of plugins for calibre. Calibre is an open source freeware ebook library manager. It is the best tool around for keeping track of your ebooks. + + +DeDRM plugin for calibre (Linux, Mac OS X and Windows) +------------------------------------------------------- +calibe 5.x and later are now written in Python 3, and plugins must also use Python 3. + +The DeDRM plugin for calibre removes DRM from your Kindle and Adobe DRM ebooks when they are imported to calibre. Just install the DeDRM plugin (DeDRM_plugin.zip), following the instructions and configuration directions provided in the ReadMe file and the help links in the plugin's configuration dialogs. + +Once installed and configured, you can simply add a DRM book to calibre and a DRM-free version will be imported into the calibre database. Note that DRM removal only occurs on IMPORT not on CONVERSION or at any other time. If you have already imported DRMed books you'll need to remove the books from calibre and re-import them. + + +Obok plugin for calibre (Mac OS X and Windows) +---------------------------------------------- +To import ebooks from the Kobo Desktop app or from a Kobo ebook reader, install the Obok plugin. This works in a different way to the DeDRM plugin, in that it finds your ebooks downloaded using the Kobo Desktop app, or on an attached Kobo ebooks reader, and displays them in a list, so that you can choose the ones you want to import into calibre. + +For instructions, see the obok_plugin_ReadMe.txt file. + + +Credits +------- +The original inept and ignoble scripts were by i♥cabbages +~The original Readium LCP DRM removal by NoDRM~ (removed due to a DMCA request) +The original mobidedrm and erdr2pml scripts were by The Dark Reverser +The original topaz DRM removal script was by CMBDTC +The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson +The original KFX format decryption was by lulzkabulz, converted to python by Apprentice Naomi and integrated into the tools by tomthumb1997 +The alfcrypto library is by some_updates +The DeDRM plugin is based on plugins by DiapDealer and is currently maintained by noDRM +The DeDRM plugin has been maintained by Apprentice Alf and Apprentice Harper until 2021. + +The original obok script was by Physisticated +The plugin conversion was done anonymously. +The Kobo reader support was added by norbusan + +Fixes, updates and enhancements to the scripts and applicatons have been made by many other anonymous people. diff --git a/DeDRM_release_10.1.0/obok_plugin_ReadMe.txt b/DeDRM_release_10.1.0/obok_plugin_ReadMe.txt new file mode 100644 index 00000000..df97e631 --- /dev/null +++ b/DeDRM_release_10.1.0/obok_plugin_ReadMe.txt @@ -0,0 +1,34 @@ +obok_plugin.zip +================ + +This plugin will remove the DRM from Kobo ebooks download on Mac or Windows using the Kobo desktop application, or from Kobo ebooks on an attached E-Ink Kobo reader (but not a Kobo Arc or Kobo Vox). If both are available, ebooks will be read from the attached E-Ink Kobo reader. To import from the desktop application, unplug the Kobo reader. + + +Installation +------------ +Open calibre's Preferences dialog. Click on the "Plugins" button. Next, click on the button, "Load plugin from file". Navigate to the unzipped DeDRM_tools folder, find the file "obok_plugin.zip". Click to select the file and select "Open". Click "Yes" in the "Are you sure?" dialog box. Click the "OK" button in the "Success" dialog box. + +Note: This plugin requires the "wmic" component on Windows. On Windows 10 and below this will be available by default, on Windows 11 it needs to be explicitly enabled. Make sure that on your Windows 11 machine, under Settings -> System -> Optional features -> Add an optional feature -> View features, "WMIC" is enabled / activated, otherwise this plugin may not work correctly. + + +Customization +------------- +No customization is required, except choosing which menus will show the plugin. Although the ability to enter a device serial number is given, this should not need to be filled in, as the serial number should be picked up automatically from the attached Kobo reader. + + +Using the plugin +---------------- +Select the plugin's menu or icon from whichever part of the calibre interface you have chosen to have it. Follow the instructions in the dialog that appears. + + +Troubleshooting +--------------- +If you find that the DeDRM plugin is not working for you (imported ebooks still have DRM - that is, they won't convert or open in the calibre ebook viewer), you should make a log of the import process by deleting the DRMed ebook from calibre and then adding the ebook to calibre when it's running in debug mode. This will generate a lot of helpful debugging info that can be copied into any online help requests. Here's how to do it: + + - Remove the DRMed book from calibre. + - Click the Preferences drop-down menu and choose 'Restart in debug mode'. + - Once calibre has re-started, import the problem ebook. + - Now close calibre. + +A log will appear that you can copy and paste into a GitHub issue at noDRM's repository, https://github.com/noDRM/DeDRM_tools/issues . You should also give details of your computer, and how you obtained the ebook file. + diff --git a/DeDRM_tools.zip b/DeDRM_tools.zip new file mode 100644 index 00000000..9d178889 Binary files /dev/null and b/DeDRM_tools.zip differ diff --git a/DeDRM_tools_10.1.0.zip b/DeDRM_tools_10.1.0.zip new file mode 100644 index 00000000..23f18800 Binary files /dev/null and b/DeDRM_tools_10.1.0.zip differ diff --git a/Obok_plugin/__init__.py b/Obok_plugin/__init__.py index 864ded37..590acef2 100644 --- a/Obok_plugin/__init__.py +++ b/Obok_plugin/__init__.py @@ -3,7 +3,7 @@ print_function) __license__ = 'GPL v3' -__version__ = '10.0.9' +__version__ = '10.1.0' __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, 9) +PLUGIN_VERSION_TUPLE = (10, 1, 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/README.md b/README.md index b04af46a..3237e91f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ DeDRM tools for 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 stable (released) version is v10.1.0 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.1.0). 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.