From 1cd3b7598bf24fdd4d96551860d670e1f812d2d7 Mon Sep 17 00:00:00 2001
From: Domenico Iezzi <domenico.iezzi.201@gmail.com>
Date: Mon, 18 Sep 2017 16:06:57 +0200
Subject: [PATCH] Added exception handling in test file

Signed-off-by: Domenico Iezzi <domenico.iezzi.201@gmail.com>
---
 config.py | 16 +++++++++++-----
 test.py   | 50 ++++++++++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/config.py b/config.py
index e140df2..6f45e87 100644
--- a/config.py
+++ b/config.py
@@ -9,6 +9,10 @@ SEPARATOR = ";"
 LANG            = "en_US"
 GOOGLE_PUBKEY   = "AAAAgMom/1a/v0lblO2Ubrt60J2gcuXSljGFQXgcyZWveWLEwo6prwgi3iJIZdodyhKZQrNWp5nKJ3srRXcUW+F1BD3baEVGcmEgqaLZUNBjm057pKRI16kB0YppeGx5qIQ5QjKzsR8ETQbKLNWgRY0QRNVz34kMJR3P/LgHax/6rmf5AAAAAwEAAQ=="
 
+# parse phone config from the file 'device.properties'.
+# if you want to add another phone, just create another section in
+# the file. Some configurations for common phones can be found here:
+# https://github.com/yeriomin/play-store-api/tree/master/src/main/resources
 config = configparser.ConfigParser()
 filepath = os.path.join( os.path.dirname( os.path.realpath(__file__) ), 'device.properties')
 config.read(filepath)
@@ -16,13 +20,15 @@ device = {}
 for (key, value) in config.items('angler'):
     device[key] = value
 
-libList = device['sharedlibraries'].split(",")
-featureList = device['features'].split(",")
-localeList = device['locales'].split(",")
-glList = device['gl.extensions'].split(",")
-platforms = device['platforms'].split(",")
+
 
 def getDeviceConfig():
+    libList = device['sharedlibraries'].split(",")
+    featureList = device['features'].split(",")
+    localeList = device['locales'].split(",")
+    glList = device['gl.extensions'].split(",")
+    platforms = device['platforms'].split(",")
+
     deviceConfig = googleplay_pb2.DeviceConfigurationProto()
     deviceConfig.touchScreen = int(device['touchscreen'])
     deviceConfig.keyboard = int(device['keyboard'])
diff --git a/test.py b/test.py
index 7cddc91..35436cd 100644
--- a/test.py
+++ b/test.py
@@ -1,32 +1,38 @@
 from googleplay import GooglePlayAPI
 
+import sys
+
 EMAIL = ""
 PASSWD = ""
 
 testApps = ['com.cpuid.cpu_z']
 server = GooglePlayAPI(True)
 
-print('\nLogging in with email and password\n')
-server.login(EMAIL, PASSWD, None, None)
-ac2dmToken = server.ac2dmToken
-gsfId = server.gsfId
+try:
+    print('\nLogging in with email and password\n')
+    server.login(EMAIL, PASSWD, None, None)
+    ac2dmToken = server.ac2dmToken
+    gsfId = server.gsfId
 
-print('\nNow trying secondary login with ac2dm token and gsfId saved\n')
-server.login(EMAIL, PASSWD, ac2dmToken, gsfId)
+    print('\nNow trying secondary login with ac2dm token and gsfId saved\n')
+    server.login(EMAIL, PASSWD, ac2dmToken, gsfId)
 
-apps = server.search('telegram', 1, None)
-print('\nFound those apps:\n')
-for a in apps:
-    print(a['docId'])
-docid = apps[0]['docId']
-version = apps[0]['versionCode']
-print('\nTelegram docid is: %s\n' % docid)
-print('\nAttempting to download %s\n' % docid)
-fl = server.download(docid, version)
-with open(docid + '.apk', 'wb') as f:
-    f.write(fl)
-    print('\nDownload successful\n')
-    f.close()
-print('\nGetting details for %s\n' % testApps[0])
-bulk = server.bulkDetails(testApps)
-print(bulk)
+    apps = server.search('telegram', 1, None)
+    print('\nFound those apps:\n')
+    for a in apps:
+        print(a['docId'])
+    docid = apps[0]['docId']
+    version = apps[0]['versionCode']
+    print('\nTelegram docid is: %s\n' % docid)
+    print('\nAttempting to download %s\n' % docid)
+    fl = server.download(docid, version)
+    with open(docid + '.apk', 'wb') as f:
+        f.write(fl)
+        print('\nDownload successful\n')
+        f.close()
+    print('\nGetting details for %s\n' % testApps[0])
+    bulk = server.bulkDetails(testApps)
+    print(bulk)
+except Exception as e:
+    print(str(e))
+    sys.exit(1)