X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=reddit_renderer.py;h=192bc206e75b860661816837d396afc3059ac6b1;hb=477c84bcdefc573278ec8ed8974d5be8baac562d;hp=a4050a20f0f47dcd9b2e2ed6ce294c34d2b5411c;hpb=e4dca16bbd329afdb587e8488767d88e17777254;p=kiosk.git diff --git a/reddit_renderer.py b/reddit_renderer.py index a4050a2..192bc20 100644 --- a/reddit_renderer.py +++ b/reddit_renderer.py @@ -1,19 +1,22 @@ #!/usr/bin/env python3 -import praw # type: ignore -import random +import logging from typing import Callable, Dict, Iterable, List, Set -import constants +import praw # type: ignore + import file_writer import grab_bag import page_builder import profanity_filter import renderer -import secrets +import kiosk_secrets as secrets + +logger = logging.getLogger(__file__) -class reddit_renderer(renderer.debuggable_abstaining_renderer): + +class reddit_renderer(renderer.abstaining_renderer): """A renderer to pull text content from reddit.""" def __init__( @@ -25,7 +28,7 @@ class reddit_renderer(renderer.debuggable_abstaining_renderer): font_size: int = 24, additional_filters: Iterable[Callable[[str], bool]] = [], ): - super(reddit_renderer, self).__init__(name_to_timeout_dict, True) + super().__init__(name_to_timeout_dict) self.subreddit_list = subreddit_list self.praw = praw.Reddit( client_id=secrets.reddit_client_id, @@ -36,19 +39,13 @@ class reddit_renderer(renderer.debuggable_abstaining_renderer): self.font_size = font_size self.messages = grab_bag.grab_bag() self.filters: List[Callable[..., bool]] = [ - profanity_filter.profanity_filter().contains_bad_words + profanity_filter.ProfanityFilter().contains_bad_word ] self.filters.extend(additional_filters) self.deduper: Set[str] = set() - def debug_prefix(self) -> str: - x = "" - for subreddit in self.subreddit_list: - x += f"{subreddit} " - return f"reddit({x.strip()})" - def periodic_render(self, key: str) -> bool: - self.debug_print('called for "%s"' % key) + logger.debug('called for "%s"' % key) if key == "Scrape": return self.scrape_reddit() elif key == "Shuffle": @@ -67,23 +64,26 @@ class reddit_renderer(renderer.debuggable_abstaining_renderer): filtered = filt.__name__ break if filtered != "": - print(f'Filter {filtered} struck down "{title}"') + logger.info( + f'Filter {filtered} struck down "{title}"' + ) continue if msg.ups < self.min_votes: - print(f'"{title}" doesn\'t have enough upvotes to be interesting') + logger.debug( + f'"{title}" doesn\'t have enough upvotes to be interesting' + ) continue - try: - self.deduper.add(title) - content = f"{msg.ups}" - if ( + self.deduper.add(title) + content = f"{msg.ups}" + if ( msg.thumbnail != "self" and msg.thumbnail != "default" and msg.thumbnail != "" - ): - content = f'' - self.messages.add( - f""" + ): + content = f'' + self.messages.add( +f"""