From 7286d2259038b2b2047d70e44abd00a00a174df1 Mon Sep 17 00:00:00 2001 From: Daniel Cheng Date: Mon, 15 Apr 2019 21:19:56 +0000 Subject: [PATCH] Update convert-3pas-product-registry.js to use blocklist terminology Bug: 842296 Change-Id: Ib51df38e7f907ef3576000eb180644bdae3c9921 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1566970 Reviewed-by: Andrey Kosyakov Reviewed-by: Dmitry Gozman Commit-Queue: Daniel Cheng Cr-Original-Commit-Position: refs/heads/master@{#650986} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c9c72272e5cf17296354d41f3d59c67d5a1a5e24 --- scripts/convert-3pas-product-registry.js | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/convert-3pas-product-registry.js b/scripts/convert-3pas-product-registry.js index e4ea131e8b..a41d3497b6 100644 --- a/scripts/convert-3pas-product-registry.js +++ b/scripts/convert-3pas-product-registry.js @@ -36,20 +36,20 @@ data = data.substr(headerLine.length); var columnNames = Array.from(csvUnmarshaller(headerLine)).map(v => v[0]); var lineObjs = []; -var blacklistData = fs.readFileSync('3pas-blacklist.csv', 'utf8'); -var blacklistHeaderLine = blacklistData.split('\n', 1)[0]; -blacklistData = blacklistData.substr(blacklistHeaderLine.length); -var blacklistColumnNames = Array.from(csvUnmarshaller(blacklistHeaderLine)).map(v => v[0]); -var blacklistDomainColumnIndex = blacklistColumnNames.findIndex(name => name === 'domain'); -console.assert(blacklistDomainColumnIndex !== undefined, '"domain" column not found in blacklist file.'); +var blocklistData = fs.readFileSync('3pas-blocklist.csv', 'utf8'); +var blocklistHeaderLine = blocklistData.split('\n', 1)[0]; +blocklistData = blocklistData.substr(blocklistHeaderLine.length); +var blocklistColumnNames = Array.from(csvUnmarshaller(blocklistHeaderLine)).map(v => v[0]); +var blocklistDomainColumnIndex = blocklistColumnNames.findIndex(name => name === 'domain'); +console.assert(blocklistDomainColumnIndex !== undefined, '"domain" column not found in blocklist file.'); -var marshaller = csvUnmarshaller(blacklistData, 2); -var blacklistDomains = new Set(); +var marshaller = csvUnmarshaller(blocklistData, 2); +var blocklistDomains = new Set(); var colIndex = 0; for (var [colData, isEnding] of marshaller) { - // extracts just the 'domain' column from blacklist file - if (colIndex === blacklistDomainColumnIndex) - blacklistDomains.add(colData); + // extracts just the 'domain' column from blocklist file + if (colIndex === blocklistDomainColumnIndex) + blocklistDomains.add(colData); colIndex++; if (isEnding) colIndex = 0; @@ -69,8 +69,8 @@ for (var [colData, isEnding] of marshaller) { } } -// Removes blacklist items. -lineObjs = lineObjs.filter(lineObj => !blacklistDomains.has(lineObj.domain)); +// Removes blocklist items. +lineObjs = lineObjs.filter(lineObj => !blocklistDomains.has(lineObj.domain)); var map = new Map(); for (var lineObj of lineObjs) {