Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Infer filenames consistently

This commit is contained in:
Zhuoyun Wei 2018-04-18 05:21:44 -04:00
parent 85e3db8f7c
commit a6ceea1ed9
No known key found for this signature in database
GPG Key ID: AE9C22168EBA0BDB
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py
View File

@ -262,12 +262,16 @@ def decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serials, pids):
traceback.print_exc() traceback.print_exc()
return 1 return 1
# if we're saving to the same folder as the original, use file name_ # Try to infer a reasonable name
# if to a different folder, use book name orig_fn_root = os.path.splitext(os.path.basename(infile))[0]
if os.path.normcase(os.path.normpath(outdir)) == os.path.normcase(os.path.normpath(os.path.dirname(infile))): if (
outfilename = os.path.splitext(os.path.basename(infile))[0] re.match('^B[A-Z0-9]{9}(_EBOK|_EBSP|_sample)?$', orig_fn_root) or
else: re.match('^{0-9A-F-}{36}$', orig_fn_root)
outfilename = cleanup_name(book.getBookTitle()) ): # Kindle for PC / Mac / Android / Fire / iOS
clean_title = cleanup_name(book.getBookTitle())
outfilename = '{}_{}'.format(orig_fn_root, clean_title)
else: # E Ink Kindle, which already uses a reasonable name
outfilename = orig_fn_root
# avoid excessively long file names # avoid excessively long file names
if len(outfilename)>150: if len(outfilename)>150: