arnekeller/googleplay-api
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/googleplay-api.git synced 2024-10-18 06:50:45 +00:00
Code Issues Projects Releases Wiki Activity

Python code linting and cleanup

Browse Source
This commit is contained in:
Domenico Iezzi 2017-11-07 14:02:23 +01:00
parent e37daed28b
commit 639c7f9e98
No known key found for this signature in database
GPG Key ID: 7AC94D5DDA2FB7EE
3 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
__pycache__/
.ropeproject/
*.swp
*.apk
*.obb

22
gpapi/googleplay.py
View File

@ -8,7 +8,7 @@ from Crypto.Cipher import PKCS1_OAEP
from clint.textui import progress
import requests
import base64
from base64 import b64decode, urlsafe_b64encode
from itertools import chain
from . import googleplay_pb2, config, utils
@ -57,7 +57,7 @@ class GooglePlayAPI(object):
"""Encrypt the password using the google publickey, using
the RSA encryption algorithm"""
binaryKey = base64.b64decode(config.GOOGLE_PUBKEY)
binaryKey = b64decode(config.GOOGLE_PUBKEY)
i = utils.readInt(binaryKey, 0)
modulus = utils.toBigInt(binaryKey[4:][0:i])
j = utils.readInt(binaryKey, i+4)
@ -72,7 +72,7 @@ class GooglePlayAPI(object):
combined = login.encode() + b'\x00' + passwd.encode()
encrypted = cipher.encrypt(combined)
h = b'\x00' + SHA.new(binaryKey).digest()[0:4]
return base64.urlsafe_b64encode(h + encrypted)
return urlsafe_b64encode(h + encrypted)
def setAuthSubToken(self, authSubToken):
self.authSubToken = authSubToken
@ -83,13 +83,11 @@ class GooglePlayAPI(object):
def getDefaultHeaders(self):
"""Return the default set of request headers, which
can later be updated, based on the request type"""
can later be expanded, based on the request type"""
headers = {
"Accept-Language": self.deviceBuilder.locale.replace('_', '-'),
headers = {"Accept-Language": self.deviceBuilder.locale.replace('_', '-'),
"X-DFE-Encoded-Targets": config.DFE_TARGETS,
"User-Agent": self.deviceBuilder.getUserAgent()
}
"User-Agent": self.deviceBuilder.getUserAgent()}
if self.gsfId is not None:
headers["X-DFE-Device-Id"] = "{0:x}".format(self.gsfId)
if self.authSubToken is not None:
@ -122,8 +120,8 @@ class GooglePlayAPI(object):
return response.androidId
def uploadDeviceConfig(self):
"""Upload the device configuration defined in the file
*device.properties* to the google account. Default device is a Google Nexus 6P"""
"""Upload the device configuration of the fake device
selected in the __init__ methodi to the google account."""
upload = googleplay_pb2.UploadDeviceConfigRequest()
upload.deviceConfiguration.CopyFrom(self.deviceBuilder.getDeviceConfig())
@ -227,7 +225,9 @@ class GooglePlayAPI(object):
previousParams['google_play_services_version'] = '11518448'
previousParams.pop('Email')
previousParams.pop('EncryptedPasswd')
response = requests.post(self.AUTHURL, data=previousParams, verify=ssl_verify)
response = requests.post(self.AUTHURL,
data=previousParams,
verify=ssl_verify)
data = response.text.split()
if self.debug:
self.lastResponseText = response.text

52
gpapi/utils.py
View File

@ -5,39 +5,36 @@ VERSION = sys.version_info[0]
def fromDocToDictionary(app):
return {
"docId": app.docid,
return {"docId": app.docid,
"title": app.title,
"author": app.creator,
"offer": [{
"micros": o.micros,
"offer": [{"micros": o.micros,
"currencyCode": o.currencyCode,
"formattedAmount": o.formattedAmount,
"checkoutFlowRequired": o.checkoutFlowRequired,
"offerType": o.offerType
} for o in app.offer],
"images": [{
"imageType": img.imageType,
"width": img.dimension.width if hasattr(img.dimension, "width")
"offerType": o.offerType}
for o in app.offer],
"images": [{"imageType": img.imageType,
"width": img.dimension.width
if hasattr(img.dimension, "width")
else 0,
"height": img.dimension.height if hasattr(img.dimension, "height")
"height": img.dimension.height
if hasattr(img.dimension, "height")
else 0,
"url": img.imageUrl,
"supportsFifeUrlOptions": img.supportsFifeUrlOptions
} for img in app.image],
"supportsFifeUrlOptions": img.supportsFifeUrlOptions}
for img in app.image],
"versionCode": app.details.appDetails.versionCode,
"installationSize": app.details.appDetails.installationSize,
"numDownloads": app.details.appDetails.numDownloads,
"uploadDate": app.details.appDetails.uploadDate,
"files": [{
"fileType": f.fileType,
"files": [{"fileType": f.fileType,
"version": f.versionCode,
"size": f.size
} for f in app.details.appDetails.file],
"size": f.size}
for f in app.details.appDetails.file],
"unstable": app.details.appDetails.unstable,
"containsAds": app.details.appDetails.containsAds,
"aggregateRating": {
"type": app.aggregateRating.type,
"aggregateRating": {"type": app.aggregateRating.type,
"starRating": app.aggregateRating.starRating,
"ratingsCount": app.aggregateRating.ratingsCount,
"oneStarRatings": app.aggregateRating.oneStarRatings,
@ -45,18 +42,13 @@ def fromDocToDictionary(app):
"threeStarRatings": app.aggregateRating.threeStarRatings,
"fourStarRatings": app.aggregateRating.fourStarRatings,
"fiveStarRatings": app.aggregateRating.fiveStarRatings,
"commentCount": app.aggregateRating.commentCount
},
"dependencies": [{
"packageName": d.packageName,
"version": d.version
} for d in app.details.appDetails.dependencies.dependency],
"category": {
"appType": app.relatedLinks.categoryInfo.appType,
"appCategory": app.relatedLinks.categoryInfo.appCategory
},
"detailsUrl": app.detailsUrl
}
"commentCount": app.aggregateRating.commentCount},
"dependencies": [{"packageName": d.packageName,
"version": d.version}
for d in app.details.appDetails.dependencies.dependency],
"category": {"appType": app.relatedLinks.categoryInfo.appType,
"appCategory": app.relatedLinks.categoryInfo.appCategory},
"detailsUrl": app.detailsUrl}
def readInt(byteArray, start):