new bugs list and filter
This commit is contained in:
parent
6ff788a782
commit
a5004449a5
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,13 @@
|
|||||||
import sys, json
|
import sys, json
|
||||||
|
|
||||||
|
def reorder_ids(bugs):
|
||||||
|
result = {}
|
||||||
|
for key, info in bugs.iteritems():
|
||||||
|
id = info['aid']
|
||||||
|
result[str(id)] = key
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
fp = sys.stdin
|
fp = sys.stdin
|
||||||
@ -10,6 +18,7 @@ if __name__ == '__main__':
|
|||||||
sys.exit('Error loading data... Aborting.')
|
sys.exit('Error loading data... Aborting.')
|
||||||
|
|
||||||
apps = data['apps']
|
apps = data['apps']
|
||||||
|
bugs = reorder_ids(data['bugs'])
|
||||||
|
|
||||||
result = {}
|
result = {}
|
||||||
result['ads'] = []
|
result['ads'] = []
|
||||||
@ -18,13 +27,13 @@ if __name__ == '__main__':
|
|||||||
result['widgets'] = []
|
result['widgets'] = []
|
||||||
result['privacy'] = []
|
result['privacy'] = []
|
||||||
|
|
||||||
|
|
||||||
hosts = data['firstPartyExceptions']
|
hosts = data['firstPartyExceptions']
|
||||||
|
|
||||||
for key, info in apps.iteritems():
|
for key, info in apps.iteritems():
|
||||||
if key in hosts:
|
k = bugs[key]
|
||||||
|
if k in hosts:
|
||||||
urls = []
|
urls = []
|
||||||
for u in hosts[key]:
|
for u in hosts[k]:
|
||||||
if info['cat'] == 'tracker':
|
if info['cat'] == 'tracker':
|
||||||
result['trackers'].append(u)
|
result['trackers'].append(u)
|
||||||
elif info['cat'] == 'ad':
|
elif info['cat'] == 'ad':
|
||||||
|
|||||||
@ -86,8 +86,12 @@ def run(options):
|
|||||||
writer = csv.DictWriter(out_csv, fieldnames=csv_fields)
|
writer = csv.DictWriter(out_csv, fieldnames=csv_fields)
|
||||||
writer.writeheader()
|
writer.writeheader()
|
||||||
|
|
||||||
|
last_seq = 0
|
||||||
for r in wpt_data:
|
for r in wpt_data:
|
||||||
|
seq = int(r['Sequence Number'])
|
||||||
|
if seq < last_seq:
|
||||||
|
break
|
||||||
|
last_seq = seq
|
||||||
stats['total'] += 1
|
stats['total'] += 1
|
||||||
host = r['Host']
|
host = r['Host']
|
||||||
if any(a in host for a in bugs_data['ads']):
|
if any(a in host for a in bugs_data['ads']):
|
||||||
|
|||||||
@ -32,8 +32,9 @@ def run(options):
|
|||||||
|
|
||||||
for f in csv_files:
|
for f in csv_files:
|
||||||
options.file = f
|
options.file = f
|
||||||
|
print "processing - " + f
|
||||||
wptf.run(options)
|
wptf.run(options)
|
||||||
print "..............."
|
print ".......done........"
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user