use upstream android_backup (#101)

* use upstream android_backup * use non-streaming mode for reading just the database file * fix install_requires to be saner
rytilahti · Nov 1, 2017 · 05711fd · 05711fd
1 parent 26b13ba
commit 05711fd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 230 deletions.
diff --git a/miio/android_backup.py b/miio/android_backup.py
diff --git a/miio/extract_tokens.py b/miio/extract_tokens.py
@@ -5,7 +5,7 @@
 from Crypto.Cipher import AES
 from pprint import pformat as pf
 import attr
-from .android_backup import AndroidBackup
+from android_backup import AndroidBackup
 
 logging.basicConfig(level=logging.INFO)
 _LOGGER = logging.getLogger(__name__)
@@ -111,7 +111,7 @@ def main(backup, write_to_disk, password, dump_all, dump_raw):
     reader = BackupDatabaseReader(dump_raw)
     if backup.endswith(".ab"):
         DBFILE = "apps/com.xiaomi.smarthome/db/miio2.db"
-        with AndroidBackup(backup) as f:
+        with AndroidBackup(backup, stream=False) as f:
             tar = f.read_data(password)
             try:
                 db = tar.extractfile(DBFILE)

diff --git a/setup.py b/setup.py
@@ -26,8 +26,15 @@
     packages=["miio", "mirobo"],
 
     python_requires='>=3.4',
-    install_requires=['construct', 'click', 'cryptography', 'pretty_cron',
-                      'typing', 'zeroconf', 'pycrypto', 'attrs', 'pytz'],
+    install_requires=['construct',
+                      'click',
+                      'cryptography',
+                      'pretty_cron',
+                      'typing',
+                      'zeroconf',
+                      'pycrypto',
+                      'attrs',
+                      'android_backup'],
 
     entry_points={
         'console_scripts': [