Add patch from Paul Wise to filter out various unwanted stuff

git-svn-id: svn+ssh://svn.debian.org/svn/planet-debian/trunk@1618 c2f067bf-98e0-425f-9c98-e76020cfa380

diff --git a/config/config.ini b/config/config.ini
index 08d4ea68acc5c696725bb48924221f5faf4fb70e..35f1d167dde38beb403ce558f492bae4c606e49b 100644 (file)
--- a/config/config.ini
+++ b/config/config.ini
@@ -61,6 +61,9 @@ days_per_page = 0
 encoding = utf-8
 # locale = C
 
 encoding = utf-8
 # locale = C
 

+filters = remove-trackers-and-ads.plugin
+filter_directories = filters = remove-trackers-and-ads.plugin
+

 [templates/index.html.tmpl]
 date_format = %I:%M%P
 
 [templates/index.html.tmpl]
 date_format = %I:%M%P
 

diff --git a/config/config.ini.deriv b/config/config.ini.deriv
index a6a5c302f7621f6775a22ee5b995b8f8ad0009fc..d4da95a9a21682c455d11443e32a4b414b863f88 100644 (file)
--- a/config/config.ini.deriv
+++ b/config/config.ini.deriv
@@ -93,6 +93,9 @@ days_per_page = 0
 encoding = utf-8
 # locale = C
 
 encoding = utf-8
 # locale = C
 

+filters = remove-trackers-and-ads.plugin
+filter_dir = filters
+

 [templates/index.html.dj]
 date_format = %I:%M%P
 
 [templates/index.html.dj]
 date_format = %I:%M%P
 

diff --git a/config/config.ini.es b/config/config.ini.es
index 5e18ace9a293b44dc38a21e6b460966f38f50d2c..0642059b673af6361fe0f1f87775a06971f32454 100644 (file)
--- a/config/config.ini.es
+++ b/config/config.ini.es
@@ -92,6 +92,9 @@ days_per_page = 0
 encoding = utf-8
 # locale = C
 
 encoding = utf-8
 # locale = C
 

+filters = remove-trackers-and-ads.plugin
+filter_dir = filters
+

 [templates/index.html.dj]
 date_format = %I:%M%P
 
 [templates/index.html.dj]
 date_format = %I:%M%P
 

diff --git a/config/config.ini.tmpl b/config/config.ini.tmpl
index c28e7a612d0e71dae24a661d17f3788f20091e91..0cb19248941a44abb1333a520c0885d4cc97cb03 100644 (file)
--- a/config/config.ini.tmpl
+++ b/config/config.ini.tmpl
@@ -93,6 +93,9 @@ days_per_page = 0
 encoding = utf-8
 # locale = C
 
 encoding = utf-8
 # locale = C
 

+filters = remove-trackers-and-ads.plugin
+filter_dir = filters
+

 [templates/index.html.dj]
 date_format = %I:%M%P
 
 [templates/index.html.dj]
 date_format = %I:%M%P
 

diff --git a/filters/remove-trackers-and-ads.plugin b/filters/remove-trackers-and-ads.plugin
new file mode 100644 (file)
index 0000000..84c2a04
--- /dev/null
+++ b/filters/remove-trackers-and-ads.plugin
@@ -0,0 +1,26 @@
+import sys
+import re
+
+data = sys.stdin.read()
+
+regexes = [
+       # Blogger tracking images
+       r"""<img [^>]*?src=["']https?://blogger\.googleusercontent\.com/tracker/[^'"]*['"][^>]*>""",
+       # Feedburner ads
+       r"""<p><a href=['"]https?://[a-zA-Z0-9\-\.]*/~a/[a-zA-Z0-9]*\?a=[a-zA-Z0-9]*['"]><img border=['"]0['"] src=['"]https?://[a-zA-Z0-9\.\-]*/~a/[a-zA-Z0-9/]*\?i=[a-zA-Z0-9]*['"]/></a></p>""",
+       # Feedburner tracking images
+       r"""<img [^>]*?src=['"]https?://feeds\.feedburner\.com/~r/[^"']*['"][^>]*>""",
+       # Wordpress tracking images
+       r"""<img [^>]*?src=['"]https?://stats\.wordpress\.com/b\.gif[^"']*['"][^>]*>""",
+       # Amazon tracking images
+       r"""<img [^>]*?src=['"]https?://www\.assoc-amazon\.com/e/ir[^"']*['"][^>]*>""",
+       # Paypal tracking images
+       r"""<img [^>]*?src=['"]https?://www\.paypalobjects\.com/[^/]*/i/scr/pixel.gif[^"']*['"][^>]*>""",
+       # Other tracking images
+       r'<img [^>]*?width=["']1["'][^>]*?height=["']1["'][^>]*>',
+       r'<img [^>]*?height=["']1["'][^>]*?width=["']1["'][^>]*>',
+]
+
+for regex in regexes: data = re.sub(regex, '', data)
+
+sys.stdout.write(data)