Commit Graph

662 Commits

Author SHA1 Message Date
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
Christian Clauss
ce8538a2ca
Remove the unused rename_key() method 2020-01-23 13:24:45 +01: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
Christian Clauss
b35f777580
Focus only on legacy Python for now 2020-01-20 15:23:19 +01:00
Christian Clauss
0895aeb323
Undefined name: from ignoblekeygen import generate_key 2020-01-20 15:17:06 +01:00
Christian Clauss
eddbefcf91
Undefined name: strip(uuidnum) --> uuidnum.strip() 2020-01-20 15:11:14 +01:00
Christian Clauss
0955713cd6
Undefined name: errlog = '' 2020-01-20 14:58:03 +01:00
Christian Clauss
4e26b9d4e7
Undefined name: errlog = '' 2020-01-20 14:55:42 +01:00
Christian Clauss
8c08c67aa8
Undefined name: import zipfix 2020-01-20 14:47:04 +01:00
Christian Clauss
90335bb925
Undefined name: Define RegError 2020-01-20 14:41:29 +01:00
Christian Clauss
a10d9a617f
Undefined name: Error() --> ValueError() 2020-01-20 14:34:56 +01:00
Christian Clauss
7edebeef0d
import erdr2pml, ineptpdf, k4mobidedrm 2020-01-20 14:33:16 +01:00
Christian Clauss
e35b37c4f4
Undefined name: from .convert2xml import encodeNumber 2020-01-20 14:29:03 +01:00
Christian Clauss
1fd972ee17
Identity is not the same thing as equality in Python 2020-01-20 13:54:20 +01:00
Christian Clauss
616548a9a8
Undefined name: import traceback for line 70 2020-01-20 13:52:54 +01:00
Christian Clauss
e4c1a09d45
Undefined name: import traceback 2020-01-20 13:49:02 +01:00
Christian Clauss
89cf29cb78
flake8 . --builtins=_,I 2020-01-20 13:46:20 +01:00
Christian Clauss
c74f4b20d3
Undefined name: from datetime import datetime 2020-01-20 13:45:36 +01:00
Christian Clauss
ae703e523c
flake8 . --builtins=_ 2020-01-20 13:41:14 +01:00
Christian Clauss
48dac14218
builtins=_ 2020-01-20 13:39:27 +01:00
Christian Clauss
798a7f9c8e
GitHub Action: There is no requirements.txt 2020-01-20 13:35:10 +01: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
Carson Gaspar
fc6f830088 Update lzma import to include calibre >= 4.6.0 2020-01-04 05:20:16 -08:00
Jake Marsden
ff51ee8227
Fix very minor typo in contrib README 2019-12-29 23:30:29 +13:00
Christian Clauss
952b7fa7c0
GitHub Actions: Lint and test our Python code 2019-12-17 08:51:25 +01:00
Cory Solovewicz
0e9e3cf7ca
Update FAQs.md
Update formatting: Wrap all filenames, file paths, and terminal commands in code quotes and cleaned up the file hashes by putting them in an unordered ist.
2019-10-05 12:03:59 -07:00
Andrew (Paradi) Alexander
57702b7d17
Update link 2019-09-05 12:04:40 -04:00
taroxd
666af55404
Update DeDRM_plugin_ReadMe.txt 2019-07-15 20:27:00 +08:00
taroxd
60f1865b53
Fix typo 2019-07-15 20:19:40 +08:00
snah
488cc540cd Allow users to specify Kobo directory and add 'ip' command for linux 2019-07-06 11:01:28 +08:00
cclauss
5bb6b58bc1 Use print() function in both Python 2 and Python 3
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
2019-06-24 18:49:38 +02:00
Dan Walters
3f591ce66f Allow decryption with DSN only. 2019-06-14 14:20:56 -05:00
Adam Plaice
8bd53cd998 Improve documentation for using Kindle for PC with Linux in Wine
I've tested this on Ubuntu 18.04, with wine installed from the default
package repos (no PPAs) with Kindle for PC version 1.17.
2019-06-12 22:36:14 +02:00
Adam Plaice
4bd89fa4aa Fix automatic import of decryption keys on Linux with wine
By default, the wineprefix passed to WineGetKeys is "". Unfortunately,

    os.path.abspath(os.path.expanduser(os.path.expandvars("")))

returns the path to the working directory, which depends on the
directory from which calibre was invoked.  Hence under current
behaviour the wineprefix becomes that path, no longer being the empty
string.  This means that the `cmdline` that's run is always
`WINEPREFIX=/some/path/ wine python.exe [...]`, rather than `wine
python.exe [...]` even under default conditions, when the wineprefix
hasn't been changed.  Unless the user is improbably lucky and invokes
calibre from ~/.wine/ (the default wineprefix), this causes automatic
retrieval of the keys to always fail.

The bug was introduced in f2190a6755.

Checking for "" allows for correct behaviour in the default case,
while keeping the nice behaviour of expanding `~`.
2019-06-12 21:13:25 +02: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
Apprentice Harper
aca8043174
Update FAQs.md
better pycrypto install instructions for Mac
2019-04-22 15:01:43 +01:00
Apprentice Harper
8165ad3ebb Fix silly version number error 2019-03-30 16:13:05 +00:00
Apprentice Harper
3d0aa17b2e Version to 6.6.3 with update for kindle book name cleanup and .kinf2018 support (initial) 2019-03-30 15:02:40 +00:00