skoobasteeve/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2026-09-16 06:15:39 +00:00
Code Issues Projects Releases Wiki Activity
516 Commits 2 Branches 94 Tags
01c654cb6865fbf3c274d9ef76b6a300e9e76dc4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Apprentice Harper 01c654cb68 Merge pull request #1560 from Threak/master 
Try new openssl library name
 2021-04-11 14:04:04 +01:00
Apprentice Harper 5bc28623cb Merge pull request #1546 from mkb79/master 
Enhance parsing DrmIon files
 2021-04-11 14:00:21 +01:00
Apprentice Harper c1d7fcbb7f Merge pull request #1545 from lejando/patch-1 
Update FAQs.md. Thanks, lejando.
 2021-04-11 13:57:29 +01:00
Apprentice Harper 45eefd6c80 Merge pull request #1539 from josdion/master 
Preserve filename encoding flag when fixing epub archive
 2021-04-11 13:56:19 +01:00
Apprentice Harper 76a47e0dd0 Version number update 
Update to 7.1.0 for a full release
 2021-02-21 14:35:49 +00:00
Apprentice Harper 70a754fb46 Merge pull request #1529 from ableeker/python3 
Fix for Python 3
 2021-02-21 14:19:59 +00:00
Apprentice Harper 52bdbe95c9 Merge pull request #1522 from lkcv/patch-1 
Add detection for Kobo directory location on Linux
 2021-02-14 08:56:58 +00:00
Apprentice Harper 495dda3809 Merge pull request #1502 from ableeker/python3 
Fix for broken book keys
 2021-02-14 08:55:56 +00:00
Apprentice Harper 52e83922c0 Merge pull request #1499 from xxyzz/kfx 
encode serialnum before returning it, close #1479
 2021-02-14 08:50:26 +00:00
Apprentice Harper 8d2d6627cf Merge pull request #1482 from 2weak2live/master 
Fix python3 encoding problem in voucher decryption
 2021-01-23 14:32:43 +00:00
Apprentice Harper 6f198b247c Merge pull request #1481 from icaroscherma/patch-1 
[Tetrachroma FileOpen] Fixes Python 2.7 import issue, not linked to pywin
 2021-01-23 14:30:21 +00:00
Apprentice Harper 9fb95eff41 Merge pull request #1491 from jony0008/master 
Update sv
 2021-01-23 14:29:56 +00:00
Apprentice Harper a7974f0f14 Update ineptpdf.py 
integer division, and version
 2021-01-03 16:11:02 +00:00
Apprentice Harper ed412bee35 Updated to inept.pdf for PC 
Contributed changes for PC compatibility. Thanks, Aldo.

Update main version to 7.0.2
 2021-01-03 16:01:14 +00:00
Apprentice Harper 6cee615f26 Update ineptpdf.py 
Fix handling of metadata
 2021-01-03 15:35:17 +00:00
Apprentice Harper c4581b4d72 Version to 7.0.1, ineptpdf fixes 
ineptpdf should now decrypt at least some Adobe PDFs
 2020-12-30 12:14:04 +00:00
Apprentice Harper f6a568bcc1 Update ineptepub.py 
Handle uncompressed elements (if any) in the zip file.
 2020-12-27 12:16:11 +00:00
Apprentice Harper bf6170e613 Merge pull request #1445 from ableeker/python3 
Some more fixes for ePub
 2020-12-26 16:02:12 +00:00
Apprentice Harper afcd79c0cc Merge pull request #1443 from jony0008/master 
Update sv translation
 2020-12-26 16:00:04 +00:00
Apprentice Harper fdf0389936 MobiDeDRM fixes 
Change handling of PIDs to cope with byte arrays or strings passed in. Also fixed handling of a very old default key format.
 2020-12-26 15:58:42 +00:00
Apprentice Harper d33f679eae Merge pull request #1413 from ableeker/python3 
Small fix to make Obok help link work.
 2020-12-13 11:28:51 +00:00
Apprentice Harper 13e9a14907 Merge pull request #1398 from xxyzz/config 
return str from load_resource()
 2020-12-04 12:52:42 +00:00
Apprentice Harper 92ea0a2f24 Merge pull request #1392 from penenkel/patch-1 
Add conversion from bytearray to bytes so that pids are hashable
 2020-12-04 12:51:26 +00:00
Apprentice Harper d3c7388327 Merge pull request #1389 from ableeker/python3 
Python 3 fixes for __init__.py
 2020-11-29 16:35:46 +00:00
Apprentice Harper ccfa454226 Merge branch 'Python2' - the DeDRM plugn version change 2020-11-29 10:47:09 +00:00
Apprentice Harper 6716db1f62 Derive calibre version tuple from __version__ string 2020-11-29 10:40:14 +00:00
Apprentice Harper 0e0d7d8b14 Don't rule out running from the command line 2020-11-28 16:25:54 +00:00
Apprentice Harper 981aadc497 Merge pull request #1380 from xxyzz/byte-string 
Fix byte string error for KFX
 2020-11-28 16:19:17 +00:00
Apprentice Harper 26eb5d676c Merge branch 'Python2' Bring across version number updates from 6.8.1 release 2020-11-28 16:18:09 +00:00
Apprentice Harper 464788a3f1 Update DeDRM version number to 6.8.1, and kindlekey to 2.8 2020-11-28 16:11:17 +00:00
Apprentice Harper 036f9007fd Merge branch 'Python2': Get the changes to fix Kindle key retrieval for Mac OS X Big Sur 2020-11-28 16:07:31 +00:00
Apprentice Harper bdd1c2e474 Merge pull request #1383 from ableeker/python3 
Python 3 fixes for Barnes&Noble
 2020-11-28 15:47:22 +00:00
Apprentice Harper 54a58d05a5 Merge pull request #1382 from koumaza/koumaza/refine-github-actions-workflow 
Refine GitHub Actions Workflow
 2020-11-28 15:45:43 +00:00
Apprentice Harper 218539f131 Merge pull request #1381 from protochron/fix_big_sur_python_2 
Fix loading libcrypto on OSX Big Sur
 2020-11-28 15:44:42 +00:00
Apprentice Harper dbc5c2b4de Merge pull request #1269 from keshavgbpecdelhi/patch-4 
using the Kindle & prompt
 2020-11-27 19:34:20 +00:00
Apprentice Harper 856fef55be Merge pull request #1268 from keshavgbpecdelhi/patch-3 
changing wil to will
 2020-11-27 19:34:08 +00:00
Apprentice Harper f2fa0426b7 Merge pull request #1267 from keshavgbpecdelhi/patch-2 
prompt and will
 2020-11-27 19:33:59 +00:00
Apprentice Harper c3376cc492 Merge pull request #1266 from keshavgbpecdelhi/patch-1 
"promt" doesn't make any sense
 2020-11-27 19:33:46 +00:00
Apprentice Harper dc72c368a5 Update ReadMe_Overview.txt 2020-11-27 19:32:25 +00:00
Apprentice Harper 77033e1602 Update FAQs.md 
update with calibre 5 and new KFX info
 2020-11-27 19:29:12 +00:00
Apprentice Harper 15cd372ad9 Update README.md 
Update ReadMe for calibre 5 and new KFX DRM
 2020-11-27 19:20:44 +00:00
Apprentice Harper c52e4db3df Python 3 fix for old ereader PDB DRM removal 2020-11-27 15:51:33 +00:00
Apprentice Harper 45038cc77b Python 3 fix for epubtest.py that detects version of DRM used 2020-11-27 15:49:57 +00:00
Apprentice Harper 5ec9c98a0b Python 3 fixes for Android kindle key retrieval 2020-11-27 15:46:06 +00:00
Apprentice Harper e0c7d7d382 Revert "PyCrypto requires RSA values to be long" 
This reverts commit a1703e15d4.
 2020-11-25 08:36:06 +00:00
Apprentice Harper f12a4f3856 Revert to byte arrays for maps on PC, and so fix for Mac which still used byte arrays. Remove some unused code. 2020-11-23 14:22:48 +00:00
Apprentice Harper 87881659c4 Merge pull request #1362 from ivan-m/pycrypto_rsa_long 
PyCrypto requires RSA values to be long not int (which is possible for small numbers)
 2020-11-23 13:31:10 +00:00
Apprentice Harper dbc7f26097 Merge pull request #1357 from task-hazy/python_3_cli_linux 
Adjust wineutils to better call wine python
 2020-11-23 13:28:29 +00:00
Apprentice Harper c58e82d97f Merge pull request #1354 from ableeker/python3 
Python3 customisation dialog
 2020-11-23 13:26:27 +00:00
Apprentice Harper e2e19fb50f Merge pull request #1348 from fireattack/master 
Convert all to bytes first before concat (fix for Windows routine)
 2020-11-05 10:51:56 +00:00
Apprentice Harper f1ef1b8ecd Merge pull request #1340 from ableeker/python3 
Python 3 fixes config.py alfcrypto.py
 2020-10-29 14:09:28 +00:00
Apprentice Harper af0acf31a3 Merge pull request #1338 from ivan-m/wine_pythonpath 
Set PYTHONPATH="" when running through wine
 2020-10-29 14:06:53 +00:00
Apprentice Harper 019abecd05 Merge pull request #1333 from jpwhiting/fixwinreg 
Fixwinreg - thanks, these all look useful and good.
 2020-10-22 13:56:05 +01:00
Apprentice Harper 7b3bbbd008 Merge pull request #1331 from koumaza/koumaza/issue-template 
Create Question Issue Template
 2020-10-22 13:54:11 +01:00
Apprentice Harper 32968b1328 Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove 
Add link to Wiki Page `How to remove DRM` in README.md
 2020-10-22 13:53:01 +01:00
Apprentice Harper c4c20eb07e Merge pull request #1318 from task-hazy/kindle_fetch 
Get working kindlekey.py on Python 3.8.6
 2020-10-20 16:21:36 +01:00
Apprentice Harper 939cdbb0c9 More fixes for Amazon books, fixing identity checks, started on Topaz. 2020-10-16 13:58:59 +01:00
Apprentice Harper dc27c36761 test file type correctly 2020-10-16 13:22:19 +01:00
Apprentice Harper 7262264b95 Update README.md 2020-10-14 16:34:27 +01:00
Apprentice Harper 4b160132a5 Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 2020-10-14 16:33:14 +01:00
Apprentice Harper 85fb4ff729 Merge pull request #1297 from PetraOleum/patch-1 
Update doc link for preferences code
 2020-10-14 16:25:01 +01:00
Apprentice Harper 608bd400ee Merge pull request #1296 from tartley/lint-fixes 
Fix CI lint failures
 2020-10-14 16:24:16 +01:00
Apprentice Harper 781268e17e More general changes, and get mobidedrm and kindlekey to work on Mac. 2020-10-14 16:23:49 +01:00
Apprentice Harper e31752e334 Mostly Mac fixes. mobidedrm.py now works, and k4mobidedrm for at least some input. kindlekey.py should be working too. But lots more changes and testing to do. 2020-10-04 20:36:12 +01:00
Apprentice Harper 2eb31c8fb5 Merge pull request #1275 from jpwhiting/python3fixes 
Python3fixes
 2020-10-04 20:07:37 +01:00
Apprentice Harper a3c7bad67e Merge pull request #1265 from heindevries/master 
Some changes in obok.py to make it work on windows
 2020-10-04 20:04:32 +01:00
Apprentice Harper ff8d44492e Fix problem on Mac with byte arrays. 2020-09-30 13:25:32 +01:00
Apprentice Harper 21d4811bfe Merge pull request #1255 from cclauss/patch-2 
GitHub Action test on both Python 2 and Python 3
 2020-09-30 11:45:50 +01:00
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 2020-09-27 11:54:49 +01:00
Apprentice Harper 6920f79a26 Merge pull request #1248 from kubik147/adobekey 
Make adobekey.py work in Python 3
 2020-09-27 10:11:37 +01:00
Apprentice Harper 9118ce77ab Merge pull request #1170 from Dr-Willy/master 
Fix path in make_release.py
 2020-09-26 21:19:48 +01:00
Apprentice Harper c3aa1b62bb Merge pull request #1241 from erikbrinkman/patch-1 
Support ebook-convert
 2020-09-26 21:19:17 +01:00
Apprentice Harper afa4ac5716 Starting on Version 7.0 using the work done by others. Completely untested. I will be testing things, but I thought I'd get this base version up for others to give pull requests. 
THIS IS ON THE MASTER BRANCH. The Master branch will be Python 3.0 from now on. While Python 2.7 support will not be deliberately broken, all efforts should now focus on Python 3.0 compatibility.

I can see a lot of work has been done. There's more to do. I've bumped the version number of everything I came across to the next major number for Python 3.0 compatibility indication.

Thanks everyone. I hope to update here at least once a week until we have a stable 7.0 release for calibre 5.0
 2020-09-26 21:22:47 +01:00
Apprentice Harper 4868a7460e Updates to FAQs and ReadMes 2020-06-18 08:03:20 +01:00
Apprentice Harper 0859f197fc Update init file, update versions in files, update comments in files 2020-06-18 07:42:41 +01:00
Apprentice Harper da85d4ffac Merge pull request #1095 from fondfire/patch-1 
Create ignoblepdf.py
 2020-06-17 16:04:41 +01:00
Apprentice Harper 6fd5535072 Merge pull request #1091 from vanicat/inetepub-python3 
Inetepub python3
 2020-06-17 15:57:27 +01:00
Apprentice Harper 885ef5e890 Merge pull request #1037 from apprenticesakuya/master 
Finish .kinf2018 support and add KFX v2/v3 support
 2020-06-17 15:56:37 +01:00
Apprentice Harper 2bb73584f2 merge of translations 2020-02-17 12:07:35 +00:00
Apprentice Harper 8495ebe36d Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 2020-02-17 12:06:23 +00:00
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 2020-02-16 10:12:25 +00:00
Apprentice Harper e15ff385ca Merge pull request #989 from jony0008/master 
New translation for obok plug-in: Swedish
 2020-02-06 12:01:44 +00:00
Apprentice Harper d48f4b86cf Merge pull request #988 from ZolaLa9/Update-FAQs-for-Kindle-for-Mac-and-Catalina 
Update FAQs.md for K4Mac and Catalina
 2020-02-06 11:59:15 +00:00
Apprentice Harper ef3c7f261c Merge pull request #859 from HansChua/linux_handling 
Allow users to specify Kobo directory and add 'ip' command for linux
 2020-01-30 12:08:45 +00:00
Apprentice Harper 778ce4782e Merge branch 'master' into linux_handling 2020-01-30 12:06:38 +00:00
Apprentice Harper 69ac9b7399 Merge pull request #848 from sretlawd/kfx_dsn_fix 
Allow decryption with DSN only.
 2020-01-30 12:04:00 +00:00
Apprentice Harper 423dec0309 Merge pull request #847 from aplaice/linux_documentation 
Improve documentation for using Kindle for PC with Linux in Wine
 2020-01-30 12:03:08 +00:00
Apprentice Harper 582479c1f4 Merge pull request #845 from aplaice/fix_default_winepath 
Fix automatic import of decryption keys on Linux with wine
 2020-01-30 12:02:15 +00:00
Apprentice Harper c1ece2f288 Merge pull request #850 from cclauss/modernize-Python-2-codes 
Use print() function in both Python 2 and Python 3
 2020-01-30 12:00:02 +00:00
Apprentice Harper f5dd758b1b Merge branch 'master' into modernize-Python-2-codes 2020-01-30 11:58:50 +00:00
Apprentice Harper a107742191 Merge pull request #983 from cclauss/patch-1 
GitHub Action: There is no requirements.txt
 2020-01-30 11:57:21 +00:00
Apprentice Harper 2cf5960511 Merge pull request #863 from taroxd/patch-2 
Fix typos - thanks.
 2020-01-23 12:11:24 +00:00
Apprentice Harper ef687eb057 Merge pull request #895 from adrw/patch-1 
Update link - thanks.
 2020-01-23 12:10:34 +00:00
Apprentice Harper 7d5352fdf3 Merge pull request #910 from corysolovewicz/patch-2 
Update FAQs.md
 2020-01-23 12:09:31 +00:00
Apprentice Harper 795f413ecb Allow Kindle serial numbers to have spaces, allowing copy/paste from Amazon web site (thanks to jakemarsden) 2020-01-23 12:14:19 +00:00
Apprentice Harper 43f80b767a Merge pull request #957 from cclauss/patch-1 
GitHub Actions: Lint and test our Python code
 2020-01-20 12:32:28 +00:00
Apprentice Harper e07bb6523b Merge pull request #965 from jakemarsden/patch-1 
Fix very minor typo in contrib README
 2020-01-20 12:28:26 +00:00
Apprentice Harper 5d8dc595ce Merge pull request #971 from cgaspar/master 
Update lzma import to include calibre >= 4.6.0
 2020-01-19 14:48:20 +00:00
Apprentice Harper b71ed3887e Update README.md 
added three very FAQs
 2019-05-18 18:42:56 +01:00
Apprentice Harper d152586edc Update FAQs.md 2019-04-22 15:03:09 +01:00