diff --git a/src/newsreader/news/collection/base.py b/src/newsreader/news/collection/base.py index eb11619..7286526 100644 --- a/src/newsreader/news/collection/base.py +++ b/src/newsreader/news/collection/base.py @@ -4,7 +4,6 @@ from newsreader.news.collection.constants import ( WHITELISTED_ATTRIBUTES, WHITELISTED_TAGS, ) -from newsreader.news.collection.models import CollectionRule from newsreader.news.core.models import Post @@ -33,7 +32,7 @@ class Client: stream = Stream def __init__(self, rules=[]): - self.rules = rules if rules else CollectionRule.objects.enabled() + self.rules = rules def __enter__(self): for rule in self.rules: @@ -130,14 +129,6 @@ class PostStream(Stream): class PostClient(Client): stream = PostStream - def __init__(self, rules=[]): - if rules: - self.rules = rules - else: - self.rules = CollectionRule.objects.enabled().filter( - type=self.stream.rule_type - ) - def set_rule_error(self, rule, exception): length = rule._meta.get_field("error").max_length @@ -146,7 +137,7 @@ class PostClient(Client): class PostCollector(Collector): - def collect(self, rules=None): + def collect(self, rules=[]): with self.client(rules=rules) as client: for payload, stream in client: with self.builder(payload, stream) as builder: diff --git a/src/newsreader/news/collection/reddit.py b/src/newsreader/news/collection/reddit.py index 284c82f..1cb9e29 100644 --- a/src/newsreader/news/collection/reddit.py +++ b/src/newsreader/news/collection/reddit.py @@ -243,7 +243,6 @@ class RedditStream(PostStream): ) from e -# TODO fix client class RedditClient(PostClient): stream = RedditStream