Commit Graph

386 Commits

Author SHA1 Message Date
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
Apprentice Harper b17b913839
Update FAQs.md
confirmed that it's Kindle for Mac and PC 1.25 that's incompatible at present.
2019-02-23 16:45:16 +00:00
Apprentice Harper d73cd15090 Update for Mac application - 64 bit and no splash screen 2019-02-23 16:13:22 +00:00
Apprentice Harper e4f44604d7 Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 2019-01-19 15:43:46 +00:00
Apprentice Harper 6ab4f633f1 Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 2019-01-19 15:36:09 +00:00
Apprentice Harper feae07c502
Update FAQs.md
better version info for Kindle for Mac and KIndle for PC
2019-01-19 15:30:06 +00:00
Apprentice Harper c8aaabcbca
Merge pull request #613 from jonahweissman/cli-instructions
Create Calibre CLI instructions
2019-01-19 15:17:06 +00:00
Apprentice Harper 588d06e846
Merge pull request #685 from mvastola/master
Fix "UnicodeEncodeError" in k4mobidedrm.py with titles containing UTF-8 chars
2019-01-19 15:16:07 +00:00
Apprentice Harper ca4bab45ec 64-bit Macintosh Application, executable bit set on droplet, Updated release script, Version set to 6.6.2 2018-12-02 12:37:52 +00:00
Apprentice Harper 3f21bd9f5a Move to new positions 2018-12-02 11:37:07 +00:00
Mike Vastola 454286b08b Small fix to bug in K4/Mobi DeDRM with unicode filenames.
Fixes #658
2018-11-14 18:01:25 -05:00
Jonah Weissman 63c8b28efd Clarify CLI instructions are for Calibre plugin 2018-10-13 14:34:47 -04:00
Apprentice Harper 9b001bfaf3
Merge pull request #421 from drzraf/patch-1
obok.py: support fetching mac address on linux
2018-10-13 18:58:46 +01:00
Apprentice Harper a76adf0ee1
Merge pull request #641 from adericbourg/patch-1
Fix typo
2018-10-13 18:48:54 +01:00
Apprentice Harper 49b064efa4
Merge pull request #623 from shhivam/master
Drastically simplified and corrected primes() in src/kindlekey.py
2018-10-13 18:44:23 +01:00
Apprentice Harper 8f23bf2b30
Merge pull request #546 from felixonmars/patch-1
Fix some typos in ReadMe_First.txt
2018-10-13 18:41:20 +01:00
Alban Dericbourg 1a38cdaf21
Fix typo
s/ooo/oo
2018-09-25 21:42:30 +02:00
shhivam c20089676d shifted the comment to docstring 2018-09-08 23:33:54 +05:30
shhivam f688bee0aa optimised and corrected primes func drastically 2018-09-08 23:30:00 +05:30
Jonah Weissman 114c4988c0 Create CLI instructions 2018-08-29 15:01:13 -04:00
Apprentice Harper 0b206e3fc5
Update FAQs.md 2018-08-29 08:07:02 +01:00
Apprentice Harper ed306a8488
Update FAQs.md 2018-08-29 08:03:47 +01:00
Felix Yan 34b533363a
Fix some typos in ReadMe_First.txt 2018-06-15 00:38:30 +08:00
Apprentice Harper b1d13f2b23
Update FAQs.md
Updated KFX info
2018-06-02 17:07:35 +01:00
Apprentice Harper 613450f84d
Update README.md 2018-06-02 17:00:10 +01:00
Apprentice Harper af6e479af4 Update version number to 6.6.1, with wzyboy's new folder structure. 2018-06-02 16:47:00 +01:00
Apprentice Harper 90e822f470
Merge pull request #502 from wzyboy/feature/reuse-code
Reuse code
2018-06-02 16:21:44 +01:00