android.py name change to androidkindlekey.py

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android_readme.txt b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android_readme.txt
deleted file mode 100644 (file)
index cb29df3..0000000
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android_readme.txt
+++ /dev/null
@@ -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>'

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/androidkindlekey.py
similarity index 100%
rename from DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android.py
rename to DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/androidkindlekey.py

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
index 504105b3879eb8656648fd261270925ac70c3a76..f4dd3fba802b2656d0d60cef7ffc9aabaa3536e2 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
@@ -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')

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android_readme.txt b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android_readme.txt
deleted file mode 100644 (file)
index cb29df3..0000000
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android_readme.txt
+++ /dev/null
@@ -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>'

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/androidkindlekey.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/androidkindlekey.py

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
index 504105b3879eb8656648fd261270925ac70c3a76..f4dd3fba802b2656d0d60cef7ffc9aabaa3536e2 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
@@ -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')

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/android_readme.txt b/DeDRM_calibre_plugin/DeDRM_plugin/android_readme.txt
deleted file mode 100644 (file)
index cb29df3..0000000
--- a/DeDRM_calibre_plugin/DeDRM_plugin/android_readme.txt
+++ /dev/null
@@ -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>'

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/android.py b/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/android.py
rename to DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py b/DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py
index 504105b3879eb8656648fd261270925ac70c3a76..f4dd3fba802b2656d0d60cef7ffc9aabaa3536e2 100644 (file)
--- a/DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py
@@ -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')