update apkdiff.py apkfrombundle.py

This commit is contained in:
xaxtix 2023-01-26 17:06:12 +04:00
parent 17283cea01
commit 2628a58147
2 changed files with 24 additions and 24 deletions

View file

@ -3,12 +3,12 @@ from zipfile import ZipFile
def compareFiles(first, second): def compareFiles(first, second):
while True: while True:
firstBytes = first.read(4096); firstBytes = first.read(4096)
secondBytes = second.read(4096); secondBytes = second.read(4096)
if firstBytes != secondBytes: if firstBytes != secondBytes:
return False return False
if firstBytes == b"": if firstBytes == b"" and secondBytes == b"":
break break
return True return True

View file

@ -2,16 +2,16 @@ import sys
from zipfile import ZipFile from zipfile import ZipFile
def compareFiles(first, second): def compareFiles(first, second):
while True: while True:
firstBytes = first.read(4096); firstBytes = first.read(4096)
secondBytes = second.read(4096); secondBytes = second.read(4096)
if firstBytes != secondBytes: if firstBytes != secondBytes:
return False return False
if firstBytes != b"" or secondBytes != b"": if firstBytes == b"" and secondBytes == b"":
break break
return True return True
def remove_prefix(text, prefix): def remove_prefix(text, prefix):
if text.startswith(prefix): if text.startswith(prefix):
@ -19,7 +19,7 @@ def remove_prefix(text, prefix):
return text return text
def compareApkFromBundle(bundle, apk): def compareApkFromBundle(bundle, apk):
FILES_TO_IGNORE = ["META-INF/MANIFEST.MF", "META-INF/CERT.RSA", "META-INF/CERT.SF", "resources.arsc"] FILES_TO_IGNORE = ["resources.arsc", "stamp-cert-sha256"]
apkZip = ZipFile(apk, 'r') apkZip = ZipFile(apk, 'r')
bundleZip = ZipFile(bundle, 'r') bundleZip = ZipFile(bundle, 'r')
@ -60,12 +60,12 @@ def compareApkFromBundle(bundle, apk):
return True return True
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 3: if len(sys.argv) != 3:
print("Usage: apkfrombundle <pathToBundle> <pathToApk>") print("Usage: apkfrombundle <pathToBundle> <pathToApk>")
sys.exit(1) sys.exit(1)
if sys.argv[1] == sys.argv[2] or compareApkFromBundle(sys.argv[1], sys.argv[2]) == True: if sys.argv[1] == sys.argv[2] or compareApkFromBundle(sys.argv[1], sys.argv[2]) == True:
print("APKs are from bundle!") print("APK from bundle!")
else: else:
print("APKs are different!") print("APK has difference!")