From c69e6f37d6d9eee40b78f217d9d9f458d5e8ff7c Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Mon, 27 Jan 2020 23:19:23 +0800 Subject: [PATCH 1/2] Keep use of the file --- data/ookla-speedtest | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/ookla-speedtest b/data/ookla-speedtest index e650a7ec..2b501dbe 100644 --- a/data/ookla-speedtest +++ b/data/ookla-speedtest @@ -4,7 +4,7 @@ # For more details, please visit: # https://github.com/v2ray/domain-list-community/blob/master/.github/workflows/build.yml # -# Or you can generate manually with following Javascript: +# Or you can generate manually with following Javascript code: # let servers = []; # document.querySelectorAll('server').forEach(s => { # let v = s.attributes.host.value; @@ -27,6 +27,5 @@ # }); # console.log(output); - -# Placeholder & just for demo +# Do not remove the following line include:ookla-speedtest-ads From 12ce969d587fd2835b7beb2afb46565d871dd35c Mon Sep 17 00:00:00 2001 From: loyalsoldier Date: Mon, 27 Jan 2020 23:17:10 +0800 Subject: [PATCH 2/2] Refine ookla-speedtest hosts generation script using Perl --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f0f7de6..bdfc3d8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,7 @@ jobs: - name: Automatically generate ookla-speedtest sub-list from source run: | curl -L -o servers-source.xml "https://c.speedtest.net/speedtest-servers-static.php" - cat servers-source.xml | sed -nEe 's/.+host="(.+):[0-9]+".+/\L\1/p' | sort -u > hosts-with-ip.txt - sed -E '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/d' hosts-with-ip.txt > hosts-without-ip.txt - cat hosts-without-ip.txt | awk '{printf "full:%s\n", $0}' > $GOPATH/src/$REPO_URL/data/ookla-speedtest - echo "include:ookla-speedtest-ads" >> $GOPATH/src/$REPO_URL/data/ookla-speedtest + perl -ne '/host="(.+):[0-9]+"/ && print "full:$1\n"' servers-source.xml | perl -ne 'print if not /^(full:([0-9]{1,3}\.){3}[0-9]{1,3})$/' | perl -ne 'print lc' | sort --ignore-case -u >> $GOPATH/src/$REPO_URL/data/ookla-speedtest - name: Build geosite.dat file run: |