diff --git a/brozzler/model.py b/brozzler/model.py index 6da2cb6..fe9f8c0 100644 --- a/brozzler/model.py +++ b/brozzler/model.py @@ -34,7 +34,6 @@ import urllib import uuid import yaml import zlib -from enum import Enum from typing import Optional @@ -192,12 +191,6 @@ class ElapsedMixIn(object): return dt -class YTDLPStatus(Enum): - UNKNOWN = 0 - SKIP = 1 - CAPTURE = 2 - - class Job(doublethink.Document, ElapsedMixIn): logger = logging.getLogger(__module__ + "." + __qualname__) table = "jobs" @@ -243,7 +236,7 @@ class Site(doublethink.Document, ElapsedMixIn): if not "scope" in self: self.scope = {} if not "skip_ytdlp" in self: - self.skip_ytdlp = YTDLPStatus.UNKNOWN + self.skip_ytdlp = None # backward compatibility if "surt" in self.scope: diff --git a/brozzler/ydl.py b/brozzler/ydl.py index a755d5b..361c693 100644 --- a/brozzler/ydl.py +++ b/brozzler/ydl.py @@ -34,12 +34,11 @@ thread_local = threading.local() def should_ytdlp(site, page, skip_av_seeds): # called only after we've passed needs_browsing() check - from .model import YTDLPStatus if page.status_code != 200: logging.info("skipping ytdlp: non-200 page status") return False - if site.skip_ytdlp == YTDLPStatus.SKIP: + if site.skip_ytdlp: logging.info("skipping ytdlp: site marked skip_ytdlp") return False @@ -56,12 +55,12 @@ def should_ytdlp(site, page, skip_av_seeds): # TODO: develop UI and refactor if ytdlp_seed: - if site.skip_ytdlp == YTDLPStatus.UNKNOWN and ytdlp_seed in skip_av_seeds: + if site.skip_ytdlp is None and ytdlp_seed in skip_av_seeds: logging.info("skipping ytdlp: site in skip_av_seeds") - site.skip_ytdlp = YTDLPStatus.SKIP + site.skip_ytdlp = True return False else: - site.skip_ytdlp = YTDLPStatus.CAPTURE + site.skip_ytdlp = False return True