intake-praw: change nsfw, spoiler, and video filters to only/any/none logic

intake-praw/intake_praw/core.py

@@ -23,6 +23,10 @@ def stderr(*args, **kwargs):
     print(*args, **kwargs, file=sys.stderr)
 
 
+def yn(s):
+    return s if s == "yes" or s == "no" else "--"
+
+
 def main():
     # Get the reddit client
     client_id = os.environ.get("CLIENT_ID")
@@ -72,18 +76,21 @@ def main():
         stderr("Invalid subreddit page", sub_page)
         return 1
 
+    # backwards compatibility with previous filter logic
+    if os.environ.get("FILTER_NSFW", False) and "NSFW" not in os.environ:
+        os.environ["NSFW"] = "no"
+    if os.environ.get("FILTER_SPOILER", False) and "SPOILER" not in os.environ:
+        os.environ["SPOILER"] = "no"
+    if os.environ.get("NO_VIDEO", False) and "VIDEO" not in os.environ:
+        os.environ["VIDEO"] = "no"
     # Pull item configuration options from the environment
-    filter_nsfw = os.environ.get("FILTER_NSFW", False)
+    env = os.environ.get
-    filter_spoiler = os.environ.get("FILTER_SPOILER", False)
     min_score = int(os.environ.get("MIN_SCORE", 0))
-    tags = [tag for tag in os.environ.get("TAGS", "").split(",") if tag]
-    no_video = os.environ.get("NO_VIDEO", False)
 
-    stderr("filter nsfw =", bool(filter_nsfw))
+    stderr("nsfw =", yn(env("NSFW")))
-    stderr("filter spoiler =", bool(filter_spoiler))
+    stderr("spoiler =", yn(env("SPOILER")))
+    stderr("video =", yn(env("VIDEO")))
     stderr("min score =", min_score)
-    stderr("tags =", ", ".join(tags))
-    stderr("no video =", bool(no_video))
 
     for post in posts:
         # Fill in some basic tags
@@ -93,28 +100,28 @@ def main():
         item["author"] = f"/u/{post.author.name}" if post.author else "[deleted]"
         item["link"] = f"https://old.reddit.com{post.permalink:}"
         item["time"] = int(post.created_utc)
-        item["tags"] = list(tags)
         item["ttl"] = SORT_TTL.get(sub_sort, 60 * 60 * 24 * 8)
 
         # Special handling for native video posts
-        if "v.redd" in post.url:
+        is_video = "v.redd" in post.url
-            if no_video:
+        if (is_video and env("VIDEO") == "no") or (not is_video and env("VIDEO") == "yes"):
             continue
+        if is_video:
             item["title"] = "[V] " + item["title"]
 
         # Special handling for NSFW
-        if post.over_18:
+        is_nsfw = post.over_18
-            if filter_nsfw:
+        if (is_nsfw and env("NSFW") == "no") or (not is_nsfw and env("NSFW") == "yes"):
             continue
+        if is_nsfw:
             item["title"] = "[NSFW] " + item["title"]
-            item["tags"].append("nsfw")
 
         # Special handling for spoilers
-        if post.spoiler:
+        is_spoiler = post.spoiler
-            if filter_spoiler:
+        if (is_spoiler and env("SPOILER") == "no") or (not is_spoiler and env("SPOILER") == "yes"):
             continue
+        if is_spoiler:
             item["title"] = "[S] " + item["title"]
-            item["tags"].append("spoiler")
 
         # Post score
         if min_score and post.score < min_score:

intake-praw/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "intake-praw"
-version = "1.1.1"
+version = "1.2.0"
 
 [project.scripts]
 intake-praw = "intake_praw.core:main"