From c6f93134c19a032b6891eda5e66ec1918ac1bcc9 Mon Sep 17 00:00:00 2001
From: Rehmat Alam <contact@rehmat.works>
Date: Fri, 19 Feb 2021 17:39:55 +0500
Subject: [PATCH] Requirements

---
 .DS_Store          | Bin 0 -> 6148 bytes
 gplaydl/.DS_Store  | Bin 0 -> 6148 bytes
 gplaydl/gplaydl.py | 176 ++++++++++++++++++++++-----------------------
 requirements.txt   |   9 ++-
 setup.py           |  17 ++++-
 5 files changed, 106 insertions(+), 96 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 gplaydl/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bf483944deb2ef8dd3f55f9b3d53f5a86e37bd72
GIT binary patch
literal 6148
zcmeHKK~BRk5FCdfT5-vd3sOEnBz_R8a^Tz#(9%*Ng#=2A=q-01!)tg9CzxGZRpSE3
z3ZY$TckIoqV^5+u2H*y(={b-A=+Om}KEpRA*Tr`%2^qQQbd2d$)!a;~X0pSz#NSjv
zp4}lPSm6#8wx6H85*PI1Q%$FzVoKf<mRrwRcyAH!2y;AeyfN0SsJd)-`aAo1w5Y45
zo|DD5imzs8EEJeAGshWcQsWj)H2P~adLIi`j5&{cV!;@#(tSh~nN~ciCQ>VPHI`g=
z!T1udK9QMjtJEWNM&^nd6!dj>hRJ)xXV=UWFa=D3y(%DIS6c7bqeWA|6fgxg3dr{%
zrwf(=TaWtbV9+A~F=bkfZTTUTnmk|`u=U6*H0Mi+zSM;yhV$jj=YdxSY(4sNxN!Jz
z;m$6cP@LYK<L63;D?M5?1x$gi0tddE$^L)&^ZCD9WIa>B6!=#PxO6xg4!ESSx9%)X
u_S&3&O&1eh>v2=UhHk~=%2s?rS7Sbx2C)p-dSr%XKLRR)1yf+J3VZ>rNOU0p

literal 0
HcmV?d00001

diff --git a/gplaydl/.DS_Store b/gplaydl/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8e50f7881823da512915d68863e3780fd0045aee
GIT binary patch
literal 6148
zcmeHK%}T>S5T4Nr!CrdwBJ2|se1o;rgXcbgHWo@CCL${Imb(w*BkDIlEhYxMiRet2
z{bqM(W_Lfx{tyu_o;MdnGa@RWf-J^}Nb_jdkvpFNS#wnML^t^6^e~d>H#W)Kr#k0~
z8u~o{-F4mGm33RfL+H7L&fisF?W68#ji~0Z>S5H|AgZ7(xLHFhs-b0n6n_2A|7G>q
z)NQkcA2_E|%~vDijyA|B%n#<k=YyQ6h6Dq_Krj#t{9^{>{D2fw!zhD+U?3PcFd+Lw
zf(mBG&QP}w6#4`JPSC6ZTQ18IlN_^SXNVpMTPV;%*`F9};b>3pmmNDp3n%u+2m8qT
z#|!J|$e+}mI2%S83<Lvx29B*dlk@)yzs%?(zaJ8{U?3RyV+`<Qxmqr;C_h`jEKknb
u1igidh+iiL1a|KdfQsxRXWD7~No@FK$Iei)NV|pu<07DhL=g=900SS<JxW3V

literal 0
HcmV?d00001

diff --git a/gplaydl/gplaydl.py b/gplaydl/gplaydl.py
index 289d5c5..c6ef2fb 100644
--- a/gplaydl/gplaydl.py
+++ b/gplaydl/gplaydl.py
@@ -10,79 +10,79 @@
 from termcolor import colored
 from getpass import getpass
 
-devicecode = "shamu"
+devicecode = 'shamu'
 
 ap = argparse.ArgumentParser(
-    description="Command line APK downloader for Google Play Store.")
-subparsers = ap.add_subparsers(dest="action")
+    description='Command line APK downloader for Google Play Store.')
+subparsers = ap.add_subparsers(dest='action')
 
 # Args for configuring Google auth
-cp = subparsers.add_parser("configure", help="Configure Google login info.")
-cp.add_argument("--device", dest="device",
-                help="Device code name", default=devicecode)
+cp = subparsers.add_parser('configure', help='Configure Google login info.')
+cp.add_argument('--device', dest='device',
+                help='Device code name', default=devicecode)
 
 # Args for downloading an app
 dl = subparsers.add_parser(
-    "download", help="Download an app or a game from Google Play.")
-dl.add_argument("--device", dest="device",
-                help="Device code name", default=devicecode)
-dl.add_argument("--packageId", required=True, dest="packageId",
-                help="Package ID of the app, i.e. com.whatsapp")
-dl.add_argument("--path", dest="storagepath",
-                help="Path where to store downloaded files", default=False)
-dl.add_argument("--ex", dest="expansionfiles",
-                help="Download expansion (OBB) data if available", default='y')
-dl.add_argument("--splits", dest="splits",
-                help="Download split APKs if available", default='y')
+    'download', help='Download an app or a game from Google Play.')
+dl.add_argument('--device', dest='device',
+                help='Device code name', default=devicecode)
+dl.add_argument('--packageId', required=True, dest='packageId',
+                help='Package ID of the app, i.e. com.whatsapp')
+dl.add_argument('--path', dest='storagepath',
+                help='Path where to store downloaded files', default=False)
+dl.add_argument('--ex', dest='expansionfiles',
+                help='Download expansion (OBB) data if available', default='y')
+dl.add_argument('--splits', dest='splits',
+                help='Download split APKs if available', default='y')
 
 args = ap.parse_args()
 
 if (args.action == 'download' or args.action == 'configure') and args.device:
     devicecode = args.device
 
-HOMEDIR = expanduser("~/.gplaydl")
-CACHEDIR = os.path.join(HOMEDIR, "cache")
-CACHEFILE = os.path.join(CACHEDIR, "%s.txt" % devicecode)
-CONFIGDIR = os.path.join(HOMEDIR, "config")
-CONFIGFILE = os.path.join(CONFIGDIR, "config.txt")
+HOMEDIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), '.gplaydl')
+CACHEDIR = os.path.join(HOMEDIR, 'cache')
+CACHEFILE = os.path.join(CACHEDIR, '%s.txt' % devicecode)
+CONFIGDIR = os.path.join(HOMEDIR, 'config')
+CONFIGFILE = os.path.join(CONFIGDIR, 'config.txt')
 
 
 def sizeof_fmt(num):
-    for unit in ["", "KB", "MB", "GB", "TB", "PB", "EB", "ZB"]:
+    for unit in ['', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB']:
         if abs(num) < 1024.0:
-            return "%3.1f%s" % (num, unit)
+            return '%3.1f%s' % (num, unit)
         num /= 1024.0
-    return "%.1f%s" % (num, "Yi")
+    return '%.1f%s' % (num, 'Yi')
 
 
 def configureauth():
     email = None
     password = None
     while email is None:
-        em = input("Google Email: ").strip()
+        em = input('Google Email: ').strip()
         if validators.email(em):
             email = em
         else:
-            print(colored("Provided email is invalid.", "red"))
+            print(colored('Provided email is invalid.', 'red'))
 
     while password is None:
-        password = getpass("Google Password: ").strip()
+        password = getpass('Google Password: ').strip()
         if len(password) == 0:
             password = None
 
     if not os.path.exists(CONFIGDIR):
         os.makedirs(CONFIGDIR, exist_ok=True)
 
-    server = GooglePlayAPI("en_US", "America/New York", devicecode)
+    server = GooglePlayAPI('en_US', 'America/New York', devicecode)
     try:
         server.login(email, password)
-        server.details("com.whatsapp")
-        config = {"email": email, "password": password}
-        pickle.dump(config, open(CONFIGFILE, "wb"))
+        server.details('com.whatsapp')
+        config = {'email': email, 'password': password}
+        pickle.dump(config, open(CONFIGFILE, 'wb'))
         print(colored(
-            "Configuration file created successfully! Try downloading an app now.", "green"))
+            'Configuration file created successfully! Try downloading an app now.', 'green'))
     except Exception as e:
-        print(colored(str(e), "yellow"))
+        print(colored(str(e), 'yellow'))
         configureauth()
 
 
@@ -90,105 +90,105 @@ def downloadapp(packageId):
     if args.storagepath:
         storagepath = args.storagepath
     else:
-        storagepath = "./"
+        storagepath = './'
     if os.path.exists(CONFIGFILE):
-        with open(CONFIGFILE, "rb") as f:
+        with open(CONFIGFILE, 'rb') as f:
             config = pickle.load(f)
-            email = config.get("email")
-            password = config.get("password")
+            email = config.get('email')
+            password = config.get('password')
     else:
         print(
-            colored("Login credentials not found. Please configure them first.", "yellow"))
+            colored('Login credentials not found. Please configure them first.', 'yellow'))
         configureauth()
         sys.exit(0)
 
-    server = GooglePlayAPI("en_US", "America/New York", args.device)
+    server = GooglePlayAPI('en_US', 'America/New York', args.device)
     try:
         server = do_login(server, email, password)
     except Exception as e:
-        print(colored("Login failed. Please re-configure your auth.", "yellow"))
+        print(colored('Login failed. Please re-configure your auth.', 'yellow'))
         configureauth()
 
     try:
-        print(colored("Attempting to download %s" % packageId, "blue"))
+        print(colored('Attempting to download %s' % packageId, 'blue'))
         expansionFiles = True if args.expansionfiles == 'y' else False
         download = server.download(packageId, expansion_files=expansionFiles)
-        apkfname = "%s.apk" % download.get("docId")
+        apkfname = '%s.apk' % download.get('docId')
         apkpath = os.path.join(storagepath, apkfname)
 
         if not os.path.isdir(storagepath):
             os.makedirs(storagepath, exist_ok=True)
         saved = 0
-        totalsize = int(download.get("file").get("total_size"))
-        print(colored("Downloading %s....." % apkfname, "blue"))
-        with open(apkpath, "wb") as apkf:
-            for chunk in download.get("file").get("data"):
+        totalsize = int(download.get('file').get('total_size'))
+        print(colored('Downloading %s.....' % apkfname, 'blue'))
+        with open(apkpath, 'wb') as apkf:
+            for chunk in download.get('file').get('data'):
                 saved += len(chunk)
                 apkf.write(chunk)
                 done = int(50 * saved / totalsize)
-                sys.stdout.write("\r[%s%s] %s%s (%s/%s)" % ("*" * done, " " * (50-done), int(
-                    (saved/totalsize)*100), "%", sizeof_fmt(saved), sizeof_fmt(totalsize)))
-        print("")
-        print(colored("APK downloaded and stored at %s" % apkpath, "green"))
+                sys.stdout.write('\r[%s%s] %s%s (%s/%s)' % ('*' * done, ' ' * (50-done), int(
+                    (saved/totalsize)*100), '%', sizeof_fmt(saved), sizeof_fmt(totalsize)))
+        print('')
+        print(colored('APK downloaded and stored at %s' % apkpath, 'green'))
 
         if args.splits == 'y':
-            for split in download.get("splits"):
-                name = "%s.apk" % (split.get("name"))
-                print(colored("Downloading %s....." % name, "blue"))
+            for split in download.get('splits'):
+                name = '%s.apk' % (split.get('name'))
+                print(colored('Downloading %s.....' % name, 'blue'))
                 splitpath = os.path.join(
-                    storagepath, download.get("docId"), name)
-                if not os.path.isdir(os.path.join(storagepath, download.get("docId"))):
+                    storagepath, download.get('docId'), name)
+                if not os.path.isdir(os.path.join(storagepath, download.get('docId'))):
                     os.makedirs(os.path.join(
-                        storagepath, download.get("docId")), exist_ok=True)
+                        storagepath, download.get('docId')), exist_ok=True)
 
                 saved = 0
-                totalsize = int(split.get("file").get("total_size"))
-                with open(splitpath, "wb") as splitf:
-                    for chunk in split.get("file").get("data"):
+                totalsize = int(split.get('file').get('total_size'))
+                with open(splitpath, 'wb') as splitf:
+                    for chunk in split.get('file').get('data'):
                         splitf.write(chunk)
                         saved += len(chunk)
                         done = int(50 * saved / totalsize)
-                        sys.stdout.write("\r[%s%s] %s%s (%s/%s)" % ("*" * done, " " * (50-done), int(
-                            (saved/totalsize)*100), "%", sizeof_fmt(saved), sizeof_fmt(totalsize)))
-                print("")
-                print(colored("Split APK downloaded and stored at %s" %
-                              splitpath, "green"))
-
-        for obb in download.get("additionalData"):
-            name = "%s.%s.%s.obb" % (obb.get("type"), str(
-                obb.get("versionCode")), download.get("docId"))
-            print(colored("Downloading %s....." % name, "blue"))
-            obbpath = os.path.join(storagepath, download.get("docId"), name)
-            if not os.path.isdir(os.path.join(storagepath, download.get("docId"))):
+                        sys.stdout.write('\r[%s%s] %s%s (%s/%s)' % ('*' * done, ' ' * (50-done), int(
+                            (saved/totalsize)*100), '%', sizeof_fmt(saved), sizeof_fmt(totalsize)))
+                print('')
+                print(colored('Split APK downloaded and stored at %s' %
+                              splitpath, 'green'))
+
+        for obb in download.get('additionalData'):
+            name = '%s.%s.%s.obb' % (obb.get('type'), str(
+                obb.get('versionCode')), download.get('docId'))
+            print(colored('Downloading %s.....' % name, 'blue'))
+            obbpath = os.path.join(storagepath, download.get('docId'), name)
+            if not os.path.isdir(os.path.join(storagepath, download.get('docId'))):
                 os.makedirs(os.path.join(
-                    storagepath, download.get("docId")), exist_ok=True)
+                    storagepath, download.get('docId')), exist_ok=True)
 
             saved = 0
-            totalsize = int(obb.get("file").get("total_size"))
-            with open(obbpath, "wb") as obbf:
-                for chunk in obb.get("file").get("data"):
+            totalsize = int(obb.get('file').get('total_size'))
+            with open(obbpath, 'wb') as obbf:
+                for chunk in obb.get('file').get('data'):
                     obbf.write(chunk)
                     saved += len(chunk)
                     done = int(50 * saved / totalsize)
-                    sys.stdout.write("\r[%s%s] %s%s (%s/%s)" % ("*" * done, " " * (50-done), int(
-                        (saved/totalsize)*100), "%", sizeof_fmt(saved), sizeof_fmt(totalsize)))
-            print("")
-            print(colored("OBB file downloaded and stored at %s" % obbpath, "green"))
+                    sys.stdout.write('\r[%s%s] %s%s (%s/%s)' % ('*' * done, ' ' * (50-done), int(
+                        (saved/totalsize)*100), '%', sizeof_fmt(saved), sizeof_fmt(totalsize)))
+            print('')
+            print(colored('OBB file downloaded and stored at %s' % obbpath, 'green'))
     except Exception as e:
         print(colored(
-            "Download failed. gplaydl cannot download some apps that are paid or incompatible.", "red"))
+            'Download failed: %s' % str(e), 'red'))
 
 
 def write_cache(gsfId, token):
     if not os.path.exists(CACHEDIR):
         os.makedirs(CACHEDIR, exist_ok=True)
-    info = {"gsfId": gsfId, "token": token}
-    pickle.dump(info, open(CACHEFILE, "wb"))
+    info = {'gsfId': gsfId, 'token': token}
+    pickle.dump(info, open(CACHEFILE, 'wb'))
 
 
 def read_cache():
     try:
-        with open(CACHEFILE, "rb") as f:
+        with open(CACHEFILE, 'rb') as f:
             info = pickle.load(f)
     except:
         info = None
@@ -206,7 +206,7 @@ def do_login(server, email, password):
     if cacheinfo:
         # Sign in using cached info
         try:
-            server.login(None, None, cacheinfo["gsfId"], cacheinfo["token"])
+            server.login(None, None, cacheinfo['gsfId'], cacheinfo['token'])
         except:
             refresh_cache(email, password)
     else:
@@ -220,15 +220,15 @@ def main():
         print(colored('Only Python 3.2.x & up is supported. Please uninstall gplaydl and re-install under Python 3.2.x or up.', 'yellow'))
         sys.exit(1)
 
-    if args.action == "configure":
+    if args.action == 'configure':
         configureauth()
         sys.exit(0)
 
-    if args.action == "download":
+    if args.action == 'download':
         if args.packageId:
             downloadapp(packageId=args.packageId)
         sys.exit(0)
 
 
-if args.action not in ["download", "configure"]:
+if args.action not in ['download', 'configure']:
     ap.print_help()
diff --git a/requirements.txt b/requirements.txt
index d8d95dd..213e17f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,14 @@
 certifi==2020.4.5.1
 cffi==1.14.0
 chardet==3.0.4
-cryptography==3.2
+cryptography==2.9
 decorator==4.4.2
-gpapidl==1.0.1
-gplaydl==1.3.3
+gpapidl==1.0.2
 idna==2.9
-protobuf==3.11.3
+protobuf==3.14.0
 pycparser==2.20
 requests==2.23.0
 six==1.14.0
 termcolor==1.1.0
-urllib3==1.25.9
+urllib3==1.25.8
 validators==0.14.3
\ No newline at end of file
diff --git a/setup.py b/setup.py
index c8d2bb9..6b43f7f 100644
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,19 @@
 		'gplaydl'
 	],
 	install_requires=[
-		'gpapidl',
-		'validators',
-		'termcolor'
+		'certifi==2020.4.5.1',
+		'cffi==1.14.0',
+		'chardet==3.0.4',
+		'cryptography==2.9',
+		'decorator==4.4.2',
+		'gpapidl==1.0.2',
+		'idna==2.9',
+		'protobuf==3.14.0',
+		'pycparser==2.20',
+		'requests==2.23.0',
+		'six==1.14.0',
+		'termcolor==1.1.0',
+		'urllib3==1.25.8',
+		'validators==0.14.3'
 	]
 )