Commit Graph

109 Commits (master)

Author SHA1 Message Date
Apprentice Harper dbc5c2b4de
Merge pull request #1269 from keshavgbpecdelhi/patch-4
using the Kindle & prompt
4 years ago
Apprentice Harper 856fef55be
Merge pull request #1268 from keshavgbpecdelhi/patch-3
changing wil to will
4 years ago
Apprentice Harper f2fa0426b7
Merge pull request #1267 from keshavgbpecdelhi/patch-2
prompt and will
4 years ago
Apprentice Harper c3376cc492
Merge pull request #1266 from keshavgbpecdelhi/patch-1
"promt" doesn't make any sense
4 years ago
Apprentice Harper c52e4db3df Python 3 fix for old ereader PDB DRM removal 4 years ago
Apprentice Harper 45038cc77b Python 3 fix for epubtest.py that detects version of DRM used 4 years ago
Apprentice Harper 5ec9c98a0b Python 3 fixes for Android kindle key retrieval 4 years ago
xxyzz 66bab7bd7d
using byte string in kfxdedrm.py 4 years ago
Apprentice Harper e0c7d7d382 Revert "PyCrypto requires RSA values to be long"
This reverts commit a1703e15d4.
4 years ago
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. 4 years ago
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)
4 years ago
Apprentice Harper dbc7f26097
Merge pull request #1357 from task-hazy/python_3_cli_linux
Adjust wineutils to better call wine python
4 years ago
Aldo Bleeker 74bcf33591 Python 3 fixes 4 years ago
Ivan Lazar Miljenovic a1703e15d4 PyCrypto requires RSA values to be long
This is at least true for PyCrypto 2.6.1
4 years ago
Task Hazy 591448d1f5 Adjust wineutils to better call wine python
Separate out logic to find correct python executable, and change to not
do shell call with subprocess
4 years ago
Aldo Bleeker a74f37c79e Minor Python 3 fix for Customize dialog 4 years ago
Aldo Bleeker 7f4e6698ef More Python 3 fixes for Customize plugin dialog 4 years ago
fireattack 4a319a3522 Convert all to bytes first before concat 4 years ago
Apprentice Harper f1ef1b8ecd
Merge pull request #1340 from ableeker/python3
Python 3 fixes config.py alfcrypto.py
4 years ago
Aldo 6dd022e6a0 Python 3 fixes config.py alfcrypto.py 4 years ago
Ivan Lazar Miljenovic ef59e112c1 Set PYTHONPATH="" when running through wine
Without this, it's possible for the Linux PYTHONPATH to leak through
and mixing up the PyCrypto libraries being called (or possibly
exceeding the allowed length of the PYTHONPATH in wine).
4 years ago
Jeremy Whiting e0ec691dd6 Fix another exception thrown when unable to find kindle keys. 4 years ago
Jeremy Whiting 0add3646d9 _winreg in python3 has been changed to winreg. Update imports. 4 years ago
Apprentice Harper c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch
Get working kindlekey.py on Python 3.8.6
4 years ago
Task Hazy cc33f40ecc Get working kindlekey.py on Python 3.8.6 4 years ago
Apprentice Harper 939cdbb0c9 More fixes for Amazon books, fixing identity checks, started on Topaz. 4 years ago
Apprentice Harper dc27c36761 test file type correctly 4 years ago
Apprentice Harper 781268e17e More general changes, and get mobidedrm and kindlekey to work on Mac. 4 years ago
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. 4 years ago
Jeremy Whiting dca0cf7d00 Fix kgenpids string vs bytes usage for python3 for calibre 5.1.
In order to properly get pids etc. we need to pass bytes to MD5 and SHA1
instead of unicode strings. Also ord() is no longer needed since
data is bytes value gets int and we need chr() to get characters from
the mapping bytearrays.
4 years ago
Jeremy Whiting 62e0a69089 Fix launching help link from customization dialog.
To fix error with python3 when launching help link open files in binary
mode.
4 years ago
Jeremy Whiting 9df1563492 Use open instead of file() to export keys to file.
Fixes export of Kindle keys in calibre 5.0.1 here.
4 years ago
keshavgbpecdelhi 971db9ae71
using the Kindle & prompt
As I already said prompt is the right word so yeah...
and "you are use kindle" is making no sense so replacing it to make it meaningful i.e. "If you are using the Kindle for PC under Wine"
4 years ago
keshavgbpecdelhi cf829db532
wil to will
typo
4 years ago
keshavgbpecdelhi 80c8bd2d24
prompt and will
Sorry but typos are typos 
"promt" should be written as "prompt"
and "wil" should be "will"
4 years ago
keshavgbpecdelhi 969599ce6b
"promt" doesn't make any sense
I think it may be a silly mistake or something because the other prompts are written well except this. Just to webpage will not look authentic by using a wrong spelling so writing the sentence like as follows :
Clicking this button will prompt you to enter a new name for the highlighted key in the list.
4 years ago
Apprentice Harper ff8d44492e Fix problem on Mac with byte arrays. 4 years ago
Christian Clauss 558efebbff
Update genbook.py 4 years ago
Christian Clauss 1eaee6a0a8
Old style exceptions are syntax errors in Python 3
Switch to new style exceptions which work on both Python 2 and Python 3.
4 years ago
Christian Clauss 3f644ddfd6
print() is a function in Python since 1/1/2020 4 years ago
Christian Clauss 08bdacf476
Fix Python syntax error: add a comma
Discovered by flake8 running in our GitHub Action
4 years ago
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 4 years ago
kubik147 2800f7cd80 Remove the u string prefixes 4 years ago
kubik147 61c5096da0 Make adobekey.py work in Python 3 4 years ago
Apprentice Harper c3aa1b62bb
Merge pull request #1241 from erikbrinkman/patch-1
Support ebook-convert
4 years ago
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
4 years ago
Erik Brinkman c516306858
Support ebook-convert
`ebook-convert`  converts ebooks without adding them to the calibre library, and so dedrm_tools fails to run and convert books that are processed in this way. Adding on_preprocess means that it will also run on any preprocessing allowing these tools to be used by the cli tools.

As far as I'm aware, there's nothing wrong with having this run in both instances, and it still seems to allow conversion in the "standard way".
4 years ago
Apprentice Harper 4868a7460e Updates to FAQs and ReadMes 4 years ago
Apprentice Harper 0859f197fc Update init file, update versions in files, update comments in files 4 years ago
Apprentice Harper da85d4ffac
Merge pull request #1095 from fondfire/patch-1
Create ignoblepdf.py
4 years ago
Apprentice Harper 6fd5535072
Merge pull request #1091 from vanicat/inetepub-python3
Inetepub python3
4 years ago
apprenticesakuya 22d2b37e04
Support KFX VoucherEnvelope versions 2 and 3 4 years ago
apprenticesakuya 837562db66
Support .kinf2018 on Mac 4 years ago
fondfire 3dcf3a5483
Create ignoblepdf.py
New Python 2 program to decrypt Barnes & Noble encrypted PDF files.
4 years ago
Rémi Vanicat f7b4efc3e1 More handling of difference between python2 and python3
Place where python3 use bytes/int and python2 str/str
4 years ago
Rémi Vanicat 2fbf2c1c5f decoding from base64 in a portable way 4 years ago
Rémi Vanicat 3166273622 modernizing ineptepub.
decrypting as python2 work
failing with python3:
  File "ineptepub.py", line 424, in decryptBook
    bookkey = rsa.decrypt(bookkey.decode('base64'))
AttributeError: 'str' object has no attribute 'decode'
4 years ago
apprenticesakuya ea916d85fc
Finish .kinf2018 support 4 years ago
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 4 years ago