android.py name change to androidkindlekey.py

This commit is contained in:
Apprentice Alf 2015-03-17 07:05:00 +00:00
parent c7c34274e9
commit 27d8f08b54
9 changed files with 9 additions and 33 deletions

View File

@ -1,7 +0,0 @@
1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
2. run `k4mobidedrm.py <infile> <outdir>'

View File

@ -80,12 +80,12 @@ if inCalibre:
from calibre_plugins.dedrm import mobidedrm
from calibre_plugins.dedrm import topazextract
from calibre_plugins.dedrm import kgenpids
from calibre_plugins.dedrm import android
from calibre_plugins.dedrm import androidkindlekey
else:
import mobidedrm
import topazextract
import kgenpids
import android
import androidkindlekey
# Wrap a stream so that output gets flushed immediately
# and also make sure that any unicode strings get
@ -317,8 +317,7 @@ def cli_main():
if o == '-a':
if a == None:
continue
serials.extend(android.get_serials(a))
serials.extend(android.get_serials())
serials.extend(androidkindlekey.get_serials(a))
# try with built in Kindle Info files if not on Linux
k4 = not sys.platform.startswith('linux')

View File

@ -1,7 +0,0 @@
1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
2. run `k4mobidedrm.py <infile> <outdir>'

View File

@ -80,12 +80,12 @@ if inCalibre:
from calibre_plugins.dedrm import mobidedrm
from calibre_plugins.dedrm import topazextract
from calibre_plugins.dedrm import kgenpids
from calibre_plugins.dedrm import android
from calibre_plugins.dedrm import androidkindlekey
else:
import mobidedrm
import topazextract
import kgenpids
import android
import androidkindlekey
# Wrap a stream so that output gets flushed immediately
# and also make sure that any unicode strings get
@ -317,8 +317,7 @@ def cli_main():
if o == '-a':
if a == None:
continue
serials.extend(android.get_serials(a))
serials.extend(android.get_serials())
serials.extend(androidkindlekey.get_serials(a))
# try with built in Kindle Info files if not on Linux
k4 = not sys.platform.startswith('linux')

View File

@ -1,7 +0,0 @@
1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
2. run `k4mobidedrm.py <infile> <outdir>'

View File

@ -80,12 +80,12 @@ if inCalibre:
from calibre_plugins.dedrm import mobidedrm
from calibre_plugins.dedrm import topazextract
from calibre_plugins.dedrm import kgenpids
from calibre_plugins.dedrm import android
from calibre_plugins.dedrm import androidkindlekey
else:
import mobidedrm
import topazextract
import kgenpids
import android
import androidkindlekey
# Wrap a stream so that output gets flushed immediately
# and also make sure that any unicode strings get
@ -317,8 +317,7 @@ def cli_main():
if o == '-a':
if a == None:
continue
serials.extend(android.get_serials(a))
serials.extend(android.get_serials())
serials.extend(androidkindlekey.get_serials(a))
# try with built in Kindle Info files if not on Linux
k4 = not sys.platform.startswith('linux')