update apkdiff.py apkfrombundle.py
This commit is contained in:
parent
17283cea01
commit
2628a58147
@ -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
|
||||||
|
@ -2,31 +2,31 @@ 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):
|
||||||
return text[len(prefix):]
|
return text[len(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')
|
||||||
|
|
||||||
firstList = list(filter(lambda info: info.filename not in FILES_TO_IGNORE, apkZip.infolist()))
|
firstList = list(filter(lambda info: info.filename not in FILES_TO_IGNORE, apkZip.infolist()))
|
||||||
secondList = list(filter(lambda secondInfo: secondInfo.filename not in FILES_TO_IGNORE, bundleZip.infolist()))
|
secondList = list(filter(lambda secondInfo: secondInfo.filename not in FILES_TO_IGNORE, bundleZip.infolist()))
|
||||||
|
|
||||||
for apkInfo in firstList:
|
for apkInfo in firstList:
|
||||||
if (apkInfo.filename.startswith("META-INF/")):
|
if (apkInfo.filename.startswith("META-INF/")):
|
||||||
continue
|
continue
|
||||||
@ -56,16 +56,16 @@ def compareApkFromBundle(bundle, apk):
|
|||||||
if found == False:
|
if found == False:
|
||||||
print("file %s not found in APK" % apkInfo.filename)
|
print("file %s not found in APK" % apkInfo.filename)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
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:
|
|
||||||
print("APKs are from bundle!")
|
if sys.argv[1] == sys.argv[2] or compareApkFromBundle(sys.argv[1], sys.argv[2]) == True:
|
||||||
else:
|
print("APK from bundle!")
|
||||||
print("APKs are different!")
|
else:
|
||||||
|
print("APK has difference!")
|
||||||
|
Loading…
Reference in New Issue
Block a user