diff options
| author | hackademix | 2018-09-05 13:33:38 +0200 |
|---|---|---|
| committer | hackademix | 2018-09-05 15:08:41 +0200 |
| commit | 6ffe07f8f6453d201005fae0a28299cb7ddec15b (patch) | |
| tree | fb60fd47ccdd2a0c25d08e18834ffc1cbfb23bd9 | |
| parent | 99a81a6f1f1cbc6b2dd6ccaf8bbe40dbe35f83b1 (diff) | |
| download | noscript-6ffe07f8f6453d201005fae0a28299cb7ddec15b.tar.gz noscript-6ffe07f8f6453d201005fae0a28299cb7ddec15b.tar.xz noscript-6ffe07f8f6453d201005fae0a28299cb7ddec15b.zip | |
Reduced noise from tld.js regular expressions generation.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | TLD/generate.pl | 7 | ||||
| -rw-r--r-- | TLD/generate.sh | 12 |
3 files changed, 12 insertions, 8 deletions
@@ -3,6 +3,7 @@ # build artifacts xpi *.xpi +*.bak # dev env options .eslintrc.json # auto-generated files diff --git a/TLD/generate.pl b/TLD/generate.pl index e37ffd5..8f6709a 100644 --- a/TLD/generate.pl +++ b/TLD/generate.pl @@ -16,7 +16,7 @@ sub generate { s/\s+utf.*//; s/[\r\n]//g; if(/^!/) { - s/^!//; + s/^!//; push(@ex, lc($_)); } elsif (!/^(\/\/|[ \n\r]|$)/) { s/\*\\\./[^\\.]+\\./; @@ -24,7 +24,7 @@ sub generate { } } close(DAT); - + #$o = Regexp::Optimizer->new; #$o = Regexp::List->new; $o = Regexp::Assemble->new; @@ -38,14 +38,13 @@ sub generate { s/\(\?-xism:(.*)\)/$1/; $ex = $_; @ex = NULL; - + open(SRC, $src) || die("Cannot open $src"); open(DST, ">$dst") || die("Cannot open $dst"); while(<SRC>) { s/(_tldRx:\s*\/\(.*?\)).*?(?=\$\/)/$1$rx/s; s/(_tldEx:\s*\/\(.*?\)).*?(?=\$\/)/$1$ex/s; print DST; - print; } close(SRC); close(DST); diff --git a/TLD/generate.sh b/TLD/generate.sh index b05af33..9ccace7 100644 --- a/TLD/generate.sh +++ b/TLD/generate.sh @@ -1,16 +1,19 @@ #!/bin/bash BASE=$(dirname "$0") +TEMPLATE=tld_template.js if [ -f "$1" ]; then - cp "$1" "$BASE/tld_template.js" + cp "$1" "$BASE/$TEMPLATE" fi -pushd "$BASE" +pushd "$BASE" >/dev/null fname=public_suffix_list.dat nflag="" if [ -f "$fname" ]; then nflag="-z $fname" + cp "$fname" "$fname.bak" fi +echo 'Updating TLDs...' URL=https://publicsuffix.org/list/$fname -curl -O $nflag "$URL" +curl -sO $nflag "$URL" if ! grep 'com' "$fname" >/dev/null; then echo >&2 "$fname empty or corrupt!" @@ -18,4 +21,5 @@ if ! grep 'com' "$fname" >/dev/null; then fi ./generate.pl -popd +[ -f "$fname.bak" ] && diff "$fname" "$fname.bak" && echo 'No new data from pubblic suffix list.' +popd >/dev/null |