diff --git a/blacklist.txt b/blacklist.txt new file mode 100644 index 0000000..f88e069 --- /dev/null +++ b/blacklist.txt @@ -0,0 +1,3 @@ +https://www.youtube.com^ +||googlesyndication.com^ +||doubleclick.net^ diff --git a/filter.txt b/filter.txt deleted file mode 100644 index 5a82db1..0000000 --- a/filter.txt +++ /dev/null @@ -1,9 +0,0 @@ -https://www.youtube.com^ -@@https://www.youtube.com/*_ajax?* -@@https://www.youtube.com/api/stats/atr* -@@https://www.youtube.com/heartbeat?* -@@https://www.youtube.com/yts/jsbin/* -@@https://www.youtube.com/yts/cssbin/* -@@https://www.youtube.com/yts/img/* -||googlesyndication.com^ -||doubleclick.net^ diff --git a/sign b/sign index a729a0e..6986957 100644 --- a/sign +++ b/sign @@ -1,11 +1,12 @@ -#!/bin/bash - -( - cd "$(dirname "$0")" - ( - echo "[Adblock Plus 1.1]" - cat filter.txt - ) | python ext/adblockplus/addChecksum.py > signed.txt - - cat signed.txt | python ext/adblockplus/validateChecksum.py -) +#!/bin/bash + +( + cd "$(dirname "$0")" + ( + echo "[Adblock Plus 1.1]" + cat blacklist.txt | sort + cat whitelist.txt | sort | sed 's/^\(.*\)$/@@\1/g' + ) | python ext/adblockplus/addChecksum.py > signed.txt + + cat signed.txt | python ext/adblockplus/validateChecksum.py +) diff --git a/signed.txt b/signed.txt index 519472c..4e506f1 100644 --- a/signed.txt +++ b/signed.txt @@ -1,11 +1,12 @@ [Adblock Plus 1.1] -! Checksum: C/ycEjf+uQtjh+fliAGBzg +! Checksum: Qp9QMvPyJnS9jm6INfzgvQ +||doubleclick.net^ +||googlesyndication.com^ https://www.youtube.com^ @@https://www.youtube.com/*_ajax?* @@https://www.youtube.com/api/stats/atr* @@https://www.youtube.com/heartbeat?* -@@https://www.youtube.com/yts/jsbin/* +@@https://www.youtube.com/playlist_edit_service_ajax/?* @@https://www.youtube.com/yts/cssbin/* @@https://www.youtube.com/yts/img/* -||googlesyndication.com^ -||doubleclick.net^ +@@https://www.youtube.com/yts/jsbin/* diff --git a/whitelist.txt b/whitelist.txt new file mode 100644 index 0000000..7cdfd37 --- /dev/null +++ b/whitelist.txt @@ -0,0 +1,7 @@ +https://www.youtube.com/*_ajax?* +https://www.youtube.com/api/stats/atr* +https://www.youtube.com/heartbeat?* +https://www.youtube.com/yts/jsbin/* +https://www.youtube.com/yts/cssbin/* +https://www.youtube.com/yts/img/* +https://www.youtube.com/playlist_edit_service_ajax/?*