Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: abp/filters/renderer.py

Issue 29845767: Issue 6685 - Offer incremental filter list downloads (Closed) Base URL: https://hg.adblockplus.org/python-abp/
Patch Set: Remove metadata_keys, yield deletions first Created Aug. 27, 2018, 10:04 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: abp/filters/renderer.py
===================================================================
--- a/abp/filters/renderer.py
+++ b/abp/filters/renderer.py
@@ -24,7 +24,7 @@
from .parser import parse_filterlist, Comment, Metadata
from .sources import NotFound
-__all__ = ['IncludeError', 'MissingHeader', 'render_filterlist']
+__all__ = ['IncludeError', 'MissingHeader', 'render_filterlist', 'render_diff']
_logger = logging.getLogger(__name__)
@@ -180,3 +180,51 @@
_validate]:
lines = proc(lines)
return lines
+
+
+def _split_list_for_diff(list_in):
+ filterlist, metadata, keys = set(), set(), set()
+ for line in parse_filterlist(list_in):
+ if line.type == 'metadata' and 'Checksum' not in line.to_string():
Sebastian Noack 2018/08/28 19:52:18 I think it has been agreed on that this isn't nece
rhowell 2018/08/29 21:43:35 Done.
+ metadata.add(line.to_string())
+ keys.add(line.key)
Sebastian Noack 2018/08/28 19:52:18 This code has to be changed as well, to handle cas
rhowell 2018/08/29 21:43:34 Any reason to use a dict instead of a set? I guess
Sebastian Noack 2018/08/29 21:56:37 The algorithm I suggest here, is the (probably) si
rhowell 2018/08/29 22:52:23 Done.
+ elif line.type == 'filter':
+ filterlist.add(line.to_string())
+ return filterlist, metadata, keys
+
+
+def render_diff(base, latest):
+ """Return a diff between two filter lists.
+
+ Parameters
+ ----------
+ base : iterator of str
+ The base (old) list that we want to update to latest.
+ lastest : iterator of str
+ The latest (most recent) list that we want to update to.
+
+ Returns
+ -------
+ iterable of str
+ A diff between two lists (https://issues.adblockplus.org/ticket/6685)
+
+ """
+ latest_fl, latest_md, latest_keys = _split_list_for_diff(latest)
+ base_fl, base_md, base_keys = _split_list_for_diff(base)
+
+ new_md = latest_md - base_md
+ removed_keys = base_keys - latest_keys
+ add_fl = latest_fl - base_fl
+ remove_fl = base_fl - latest_fl
+
+ yield '[Adblock Plus Diff]'
+ for item in new_md:
+ yield item
+ for key in removed_keys:
+ # If a special comment has been removed, enter it with a blank value
+ # so the client will set it back to the default value
+ yield '! {}:'.format(key)
+ for item in remove_fl:
+ yield '- {}'.format(item)
+ for item in add_fl:
+ yield '+ {}'.format(item)
« no previous file with comments | « abp/filters/parser.py ('k') | tests/test_differ.py » ('j') | tests/test_parser.py » ('J')

Powered by Google App Engine
This is Rietveld