Merge pull request #685 from mvastola/master

Fix "UnicodeEncodeError" in k4mobidedrm.py with titles containing UTF-8 chars
This commit is contained in:
Apprentice Harper 2019-01-19 15:16:07 +00:00 committed by GitHub
commit 588d06e846
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -269,7 +269,7 @@ def decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serials, pids):
re.match('^{0-9A-F-}{36}$', orig_fn_root) re.match('^{0-9A-F-}{36}$', orig_fn_root)
): # Kindle for PC / Mac / Android / Fire / iOS ): # Kindle for PC / Mac / Android / Fire / iOS
clean_title = cleanup_name(book.getBookTitle()) clean_title = cleanup_name(book.getBookTitle())
outfilename = '{}_{}'.format(orig_fn_root, clean_title) outfilename = u'{}_{}'.format(orig_fn_root, clean_title)
else: # E Ink Kindle, which already uses a reasonable name else: # E Ink Kindle, which already uses a reasonable name
outfilename = orig_fn_root outfilename = orig_fn_root