e

M3U8/scrapers/utils/caching.py

@@ -6,45 +6,37 @@ from .config import Time
 
 
 class Cache:
+
     def __init__(self, file: Path, exp: int | float) -> None:
         self.file = file
         self.exp = exp
+        self.now_ts = Time.now().timestamp()
 
     @staticmethod
-    def near_hr(dt: datetime) -> float:
-        return dt.replace(minute=0, second=0, microsecond=0).timestamp()
+    def clean(dt: datetime) -> float:
+        return dt.replace(second=0, microsecond=0).timestamp()
 
-    def is_fresh(
-        self,
-        entry: dict,
-        nearest_hr: bool,
-    ) -> bool:
+    def is_fresh(self, entry: dict) -> bool:
         ts: float | int = entry.get("timestamp", 31496400)
 
-        if nearest_hr:
-            ts = self.near_hr(Time.from_ts(ts))
+        dt_ts = self.clean(Time.from_ts(ts))
 
-        return Time.now().timestamp() - ts < self.exp
+        return self.now_ts - dt_ts < self.exp
 
-    def load(
-        self,
-        nearest_hr: bool = False,
-        per_entry: bool = True,
-    ) -> dict[str, dict[str, str | float]]:
+    def load(self, per_entry: bool = True) -> dict[str, dict[str, str | float]]:
         try:
             data: dict = json.loads(self.file.read_text(encoding="utf-8"))
         except (FileNotFoundError, json.JSONDecodeError):
             return {}
 
         if per_entry:
-            return {k: v for k, v in data.items() if self.is_fresh(v, nearest_hr)}
+            return {k: v for k, v in data.items() if self.is_fresh(v)}
 
         ts: float | int = data.get("timestamp", 31496400)
 
-        if nearest_hr:
-            ts = self.near_hr(Time.from_ts(ts))
+        dt_ts = self.clean(Time.from_ts(ts))
 
-        return data if self.is_fresh({"timestamp": ts}, False) else {}
+        return data if self.is_fresh({"timestamp": dt_ts}) else {}
 
     def write(self, data: dict) -> None:
         self.file.parent.mkdir(parents=True, exist_ok=True)