From 9c40b3ce5a0e2d3f0c74e6a816947a81778a3c4b Mon Sep 17 00:00:00 2001 From: NoDRM Date: Wed, 29 Dec 2021 09:14:35 +0100 Subject: [PATCH] Cleanup --- .gitignore | 6 +- CALIBRE_CLI_INSTRUCTIONS.md | 6 +- DeDRM_plugin/DeDRM_Help.htm | 2 +- DeDRM_plugin/__init__.py | 4 +- ...{activitybar.py => _unused_activitybar.py} | 2 + ...twidget.py => _unused_scrolltextwidget.py} | 3 + DeDRM_plugin/ignobleepub.py | 448 ------------------ DeDRM_plugin/scriptinterface.py | 12 +- DeDRM_plugin/topazextract.py | 4 +- 9 files changed, 24 insertions(+), 463 deletions(-) rename DeDRM_plugin/{activitybar.py => _unused_activitybar.py} (98%) rename DeDRM_plugin/{scrolltextwidget.py => _unused_scrolltextwidget.py} (97%) delete mode 100644 DeDRM_plugin/ignobleepub.py diff --git a/.gitignore b/.gitignore index 4564a12..f3f3d47 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,8 @@ .DS_Store # local test data -/user_data/ \ No newline at end of file +/user_data/ + +# Cache +/DeDRM_plugin/__pycache__ +/DeDRM_plugin/standalone/__pycache__ \ No newline at end of file diff --git a/CALIBRE_CLI_INSTRUCTIONS.md b/CALIBRE_CLI_INSTRUCTIONS.md index 9c1359f..0d7dbd4 100644 --- a/CALIBRE_CLI_INSTRUCTIONS.md +++ b/CALIBRE_CLI_INSTRUCTIONS.md @@ -13,16 +13,16 @@ platforms. #### Install plugins - Download the DeDRM `.zip` archive from DeDRM_tools' - [latest release](https://github.com/apprenticeharper/DeDRM_tools/releases/latest). + [latest release](https://github.com/noDRM/DeDRM_tools/releases/latest). Then unzip it. - Add the DeDRM plugin to Calibre: ``` cd *the unzipped DeDRM_tools folder* - calibre-customize --add DeDRM_calibre_plugin/DeDRM_plugin.zip + calibre-customize --add DeDRM_plugin.zip ``` - Add the Obok plugin: ``` - calibre-customize --add Obok_calibre_plugin/obok_plugin.zip + calibre-customize --add Obok_plugin.zip ``` #### Enter your keys diff --git a/DeDRM_plugin/DeDRM_Help.htm b/DeDRM_plugin/DeDRM_Help.htm index 6ec385c..c5a92ac 100644 --- a/DeDRM_plugin/DeDRM_Help.htm +++ b/DeDRM_plugin/DeDRM_Help.htm @@ -46,7 +46,7 @@ p {margin-top: 0}

Credits: