kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

generate HTML diff from verify using diffoscope

Browse Source 
If diffoscope is installed, then use it to generate HTML diffs of all
verification builds.
This commit is contained in:
Hans-Christoph Steiner 2016-12-14 15:54:01 +01:00
parent 03ec590989
commit c5c244ccbd
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fdroidserver/common.py
View File

@ -1998,6 +1998,23 @@ def compare_apks(apk1, apk2, tmp_dir):
trying to do the comparison.
"""
absapk1 = os.path.abspath(apk1)
absapk2 = os.path.abspath(apk2)
# try to find diffoscope in the path, if it hasn't been manually configed
if 'diffoscope' not in config:
tmp = find_command('diffoscope')
if tmp is not None:
config['diffoscope'] = tmp
if 'diffoscope' in config:
htmlfile = absapk1 + '.diffoscope.html'
textfile = absapk1 + '.diffoscope.txt'
if subprocess.call([config['diffoscope'],
'--max-report-size', '12345678', '--max-diff-block-lines', '100',
'--html', htmlfile, '--text', textfile,
absapk1, absapk2]) != 0:
return("Failed to unpack " + apk1)
apk1dir = os.path.join(tmp_dir, apk_badchars.sub('_', apk1[0:-4])) # trim .apk
apk2dir = os.path.join(tmp_dir, apk_badchars.sub('_', apk2[0:-4])) # trim .apk
for d in [apk1dir, apk2dir]: