mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'blank-versionName' into 'master'
handle APKs with a blank versionName Closes #477, #478, fdroidclient#1416, fdroidclient#1417, and fdroidclient#1418 See merge request fdroid/fdroidserver!492
This commit is contained in:
commit
6cc26ad8c8
@ -213,6 +213,16 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
|
||||
if packageName not in apps:
|
||||
logging.info(_('Ignoring package without metadata: ') + package['apkName'])
|
||||
continue
|
||||
if not package.get('versionName'):
|
||||
app = apps[packageName]
|
||||
versionCodeStr = str(package['versionCode']) # TODO build.versionCode should be int!
|
||||
for build in app['builds']:
|
||||
if build['versionCode'] == versionCodeStr:
|
||||
versionName = build.get('versionName')
|
||||
logging.info(_('Overriding blank versionName in {apkfilename} from metadata: {version}')
|
||||
.format(apkfilename=package['apkName'], version=versionName))
|
||||
package['versionName'] = versionName
|
||||
break
|
||||
if packageName in output_packages:
|
||||
packagelist = output_packages[packageName]
|
||||
else:
|
||||
@ -479,7 +489,17 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
|
||||
|
||||
apkel = doc.createElement("package")
|
||||
apel.appendChild(apkel)
|
||||
addElement('version', apk['versionName'], doc, apkel)
|
||||
|
||||
versionName = apk.get('versionName')
|
||||
if not versionName:
|
||||
versionCodeStr = str(apk['versionCode']) # TODO build.versionCode should be int!
|
||||
for build in app.builds:
|
||||
if build['versionCode'] == versionCodeStr and 'versionName' in build:
|
||||
versionName = build['versionName']
|
||||
break
|
||||
if versionName:
|
||||
addElement('version', versionName, doc, apkel)
|
||||
|
||||
addElement('versioncode', str(apk['versionCode']), doc, apkel)
|
||||
addElement('apkname', apk['apkName'], doc, apkel)
|
||||
addElementIfInApk('srcname', apk, 'srcname', doc, apkel)
|
||||
|
@ -993,7 +993,7 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
|
||||
repo_file['hash'] = shasum
|
||||
repo_file['hashType'] = 'sha256'
|
||||
repo_file['versionCode'] = 0
|
||||
repo_file['versionName'] = shasum
|
||||
repo_file['versionName'] = shasum[0:7]
|
||||
# the static ID is the SHA256 unless it is set in the metadata
|
||||
repo_file['packageName'] = shasum
|
||||
|
||||
@ -1208,13 +1208,18 @@ def scan_apk_androguard(apk, apkfile):
|
||||
|
||||
apk['packageName'] = apkobject.get_package()
|
||||
apk['versionCode'] = int(apkobject.get_androidversion_code())
|
||||
apk['versionName'] = apkobject.get_androidversion_name()
|
||||
if apk['versionName'][0] == "@":
|
||||
version_id = int(apk['versionName'].replace("@", "0x"), 16)
|
||||
version_id = arsc.get_id(apk['packageName'], version_id)[1]
|
||||
apk['versionName'] = arsc.get_string(apk['packageName'], version_id)[1]
|
||||
apk['name'] = apkobject.get_app_name()
|
||||
|
||||
versionName = apkobject.get_androidversion_name()
|
||||
if versionName:
|
||||
apk['versionName'] = versionName
|
||||
try: # can be a literal value or a resId
|
||||
res_id = int(versionName.replace("@", "0x"), 16)
|
||||
res_id = arsc.get_id(apk['packageName'], res_id)[1]
|
||||
apk['versionName'] = arsc.get_string(apk['packageName'], res_id)[1]
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
if apkobject.get_max_sdk_version() is not None:
|
||||
apk['maxSdkVersion'] = apkobject.get_max_sdk_version()
|
||||
if apkobject.get_min_sdk_version() is not None:
|
||||
|
Binary file not shown.
@ -288,13 +288,13 @@
|
||||
{
|
||||
"added": 1513900800000,
|
||||
"apkName": "duplicate.permisssions_9999999.apk",
|
||||
"hash": "3d5db5f1ee6fd1d5d9e3c97cc9139b447f538bacd9907f648ba96cfd0848321d",
|
||||
"hash": "8367857fe75f85321ce2c344b34804d0bc193707f6ba03710d025d9030803434",
|
||||
"hashType": "sha256",
|
||||
"minSdkVersion": "18",
|
||||
"packageName": "duplicate.permisssions",
|
||||
"sig": "056c9f1554c40ba59a2103009c82b420",
|
||||
"signer": "659e1fd284549f70d13fb02c620100e27eeea3420558cce62b0f5d4cf2b77d84",
|
||||
"size": 27507,
|
||||
"size": 27446,
|
||||
"targetSdkVersion": "27",
|
||||
"uses-permission": [
|
||||
[
|
||||
@ -336,8 +336,7 @@
|
||||
null
|
||||
]
|
||||
],
|
||||
"versionCode": 9999999,
|
||||
"versionName": "0.3-7-gb817ac8"
|
||||
"versionCode": 9999999
|
||||
}
|
||||
],
|
||||
"fake.ota.update": [
|
||||
@ -349,7 +348,7 @@
|
||||
"packageName": "fake.ota.update",
|
||||
"size": 233,
|
||||
"versionCode": 1234,
|
||||
"versionName": "897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c"
|
||||
"versionName": "897a92a"
|
||||
}
|
||||
],
|
||||
"info.guardianproject.urzip": [
|
||||
|
@ -25,11 +25,10 @@
|
||||
<marketversion></marketversion>
|
||||
<marketvercode>9999999</marketvercode>
|
||||
<package>
|
||||
<version>0.3-7-gb817ac8</version>
|
||||
<versioncode>9999999</versioncode>
|
||||
<apkname>duplicate.permisssions_9999999.apk</apkname>
|
||||
<hash type="sha256">3d5db5f1ee6fd1d5d9e3c97cc9139b447f538bacd9907f648ba96cfd0848321d</hash>
|
||||
<size>27507</size>
|
||||
<hash type="sha256">8367857fe75f85321ce2c344b34804d0bc193707f6ba03710d025d9030803434</hash>
|
||||
<size>27446</size>
|
||||
<sdkver>18</sdkver>
|
||||
<targetSdkVersion>27</targetSdkVersion>
|
||||
<added>2017-12-22</added>
|
||||
@ -57,7 +56,7 @@
|
||||
<marketversion>0.2.1</marketversion>
|
||||
<marketvercode>2000</marketvercode>
|
||||
<package>
|
||||
<version>897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c</version>
|
||||
<version>897a92a</version>
|
||||
<versioncode>1234</versioncode>
|
||||
<apkname>fake.ota.update_1234.zip</apkname>
|
||||
<hash type="sha256">897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c</hash>
|
||||
|
Loading…
Reference in New Issue
Block a user