Separate filter lines into {black,white}list

kbinani · Feb 20, 2017 · 7da6bac · 7da6bac
1 parent 74302ce
commit 7da6bac
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/blacklist.txt b/blacklist.txt
@@ -0,0 +1,3 @@
+https://www.youtube.com^
+||googlesyndication.com^
+||doubleclick.net^
diff --git a/filter.txt b/filter.txt
diff --git 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
@@ -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
@@ -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/?*