Reduced noise from tld.js regular expressions generation.
This commit is contained in:
parent
99a81a6f1f
commit
6ffe07f8f6
|
@ -3,6 +3,7 @@
|
|||
# build artifacts
|
||||
xpi
|
||||
*.xpi
|
||||
*.bak
|
||||
# dev env options
|
||||
.eslintrc.json
|
||||
# auto-generated files
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue