Ignore some files

This commit is contained in:
fanboynz 2016-04-16 06:04:01 +02:00
parent 1b678bf57c
commit 6e59f575e2
4 changed files with 33 additions and 34 deletions

5
FOP.py
View File

@ -51,8 +51,8 @@ BLANKPATTERN = re.compile(r"^\s*$")
COMMITPATTERN = re.compile(r"^(A|M|P)\:\s(\((.+)\)\s)?(.*)$")
# List the files that should not be sorted, either because they have a special sorting system or because they are not filter files
IGNORE = ("CC-BY-SA.txt", "easytest.txt", "GPL.txt", "MPL.txt",
"enhancedstats-addon.txt", "fanboy-tracking", "firefox-regional", "other")
IGNORE = ("Submissions for the Annoyances List.txt", "hg-searching.txt", "hg-howto.txt", "filter-additions.txt", "Windows_merge_notes.pdf",
"Windows_merge_notes.doc")
# List all Adblock Plus options (excepting domain, which is handled separately), as of version 1.3.9
KNOWNOPTIONS = ("collapse", "document", "elemhide",
@ -65,6 +65,7 @@ REPODEF = collections.namedtuple("repodef", "name, directory, locationoption, re
GIT = REPODEF(["git"], "./.git/", "--work-tree=", "--git-dir=", ["status", "-s", "--untracked-files=no"], ["diff"], ["commit", "-m"], ["pull"], ["push"])
HG = REPODEF(["hg"], "./.hg/", "-R", None, ["stat", "-q"], ["diff"], ["commit", "-m"], ["pull"], ["push"])
REPOTYPES = (GIT, HG)
#REPOTYPES = (GIT)
def start ():
""" Print a greeting message and run FOP in the directories

View File

@ -1,29 +1,3 @@
Any element that distracts the user from the main content, even including self promos.
Any social sites affected directly by the Annoyances filter will be corrected when reported.
Blocking of some popular sites outright like Twitter, Facebook etc. Just aiming to block the certain scripts used on each site.
CSS Elements (next page/prev page/top of the page) that stay with the page
CSS Flyouts (popups that "fly" out, generally if scroll through the website)
CSS Popups or Takeovers (Anything that takes over the screen)
CSS Toolbars that stay with the page
Disabling comments used by the social websites (such as facebook chat within a website)
Disabling donation buttons (assuming they don't override or hide webpage content)
Domains blocked by the Annoyances filter will be 3rd party only, and shouldn't affect the site directly.
Eliminating any whitespace left over from standard Adblocking.
Filter removals, suggestions and additions are at the discretion of the subscription author.
For users not wanting International support, an English only list is available.
Generally not considered ads, but items that can distract from the main content of the website.
Generic international elements will be added as normal generic filters.
If a blocked toolbar or CSS element limits functionality of site, it shall be removed. (searching, Login to the site)
If the site is designed around social aspect, the filters will be either whitelisted, excempted or removed.
If the site some decent generic elements, filters or commonly used 3rd party annoyances, it may* be accepted for inclusion.
International requests will be added (elements, 3rd-party, site specific filters) into a seperate section.
International white lists and Site specific exceptions are included in the same sections as the english sections.
Job ads & affiliate promos.
Newsletter signup fields and div elements.
Self promos of apps (iphone/ipad/...)
Social divs and boxes (which generally hold the social images)
Social images (rss, twitter, facebook etc)
The site needs to be fairly popular to get any site specific blocks.
-=================-
-===================-
-======================-
@ -31,14 +5,40 @@
-=========================-
-=================================-
=> If the site can offer the functionality through another method, blocking a toolbar or element could be permitted.
Any element that distracts the user from the main content, even including self promos.
Any social sites affected directly by the Annoyances filter will be corrected when reported.
Block social media sites
Blocking of some popular sites outright like Twitter, Facebook etc. Just aiming to block the certain scripts used on each site.
CSS Elements (next page/prev page/top of the page) that stay with the page
CSS Flyouts (popups that "fly" out, generally if scroll through the website)
CSS Popups or Takeovers (Anything that takes over the screen)
CSS Toolbars that stay with the page
Disabling comments used by the social websites (such as facebook chat within a website)
Disabling donation buttons (assuming they don't override or hide webpage content)
Domains blocked by the Annoyances filter will be 3rd party only, and shouldn't affect the site directly.
Eliminating any whitespace left over from standard Adblocking.
Filter removals, suggestions and additions are at the discretion of the subscription author.
Filters not accepted
For users not wanting International support, an English only list is available.
Generally not considered ads, but items that can distract from the main content of the website.
Generic international elements will be added as normal generic filters.
If a blocked toolbar or CSS element limits functionality of site, it shall be removed. (searching, Login to the site)
If the site is designed around social aspect, the filters will be either whitelisted, excempted or removed.
If the site some decent generic elements, filters or commonly used 3rd party annoyances, it may* be accepted for inclusion.
International Annoyances
International requests will be added (elements, 3rd-party, site specific filters) into a seperate section.
International white lists and Site specific exceptions are included in the same sections as the english sections.
Job ads & affiliate promos.
Newsletter signup fields and div elements.
Overview
Self promo filters
Self promos of apps (iphone/ipad/...)
Social Content & Annoyances
Social divs and boxes (which generally hold the social images)
Social images (rss, twitter, facebook etc)
Submission of Filters
Submissions for the Annoyances List
The Annoyances list is a mix of social, self promo cleanups, CSS toolbars/flyouts/popups and any other distracting elements.
The following annoyances will be covered by the list;
The site needs to be fairly popular to get any site specific blocks.
Updated: 21/09/2012

View File

@ -1,8 +1,3 @@
If the filter has http://www.adserver.com, just filter create the filter .adserver.com/
If the filter is like http://site.com/banners.phps?, a filter using the http://.. is needed.
Note: If a filter needs to be modified/modified, create a new Adzilla record, follow same directions as above.
Note: Once the filter has been uploaded to googlecode set the Adzilla record to be "Completed".
"winscript adzilla: #xxxx" (xxxx being the record ID)
"winscript site: http://..." is only needed (no adzilla needed)
(1) Avoid the use of the "=" in the urlfilter
@ -44,6 +39,8 @@ Filters:
Generally, be careful with any major changes or removals.
If blocking/Whitelist filters are required (in either Firefox, Opera or Iron)
If no blocking filters are required. A simple,
If the filter has http://www.adserver.com, just filter create the filter .adserver.com/
If the filter is like http://site.com/banners.phps?, a filter using the http://.. is needed.
In the comments, put down why the change was required. etc.
Iron
Issues/Notes:
@ -51,6 +48,8 @@ Its better to create a filter like http://ad.filter.com/* rather than */ad.filte
Just slows things down in Opera
Limit the amount of wildcards used 3 at the most, more wildcards the slower the content filter in Opera.
need to be created for each instantance. Best to *only* add the case involved.
Note: If a filter needs to be modified/modified, create a new Adzilla record, follow same directions as above.
Note: Once the filter has been uploaded to googlecode set the Adzilla record to be "Completed".
Occasionally some filters can be problematic, if we do come across any issues. Browsing through Adzilla would
Once its been added,
Opera

View File

@ -1,4 +1,3 @@
+++ b/fanboy-adblocklist-current-expanded.txt Mon May 17 20:52:25 2010 +1200
--- a/fanboy-adblocklist-current-expanded.txt Mon May 17 20:50:14 2010 +1200
...