models: Renamed extractor_cache_date to last_updated for MediaCollection and MediaElement

server/app.py

@@ -219,7 +219,7 @@ def test():
         "data": first.to_dict(),
     }, 200
 
-# TODO add table for failed attempts so these may be resolved afterwards with increasing delays (add to MediaElement with flag "retrieved" and "extractor_cache_date" as date to resolve last try)
+# TODO add table for failed attempts so these may be resolved afterwards with increasing delays (add to MediaElement with flag "retrieved" and "last_updated" as date to resolve last try)
 
 
 @flask_app.route("/api/media/list")

server/entertainment_decider/extractors/generic.py

@@ -125,7 +125,7 @@ class GeneralExtractor(Generic[E, T]):
         return object
 
     def update_object(self, object: E, check_cache_expired: bool = True) -> E:
-        if object.extractor_cache_date and check_cache_expired and not self._cache_expired(object.extractor_cache_date):
+        if object.last_updated and check_cache_expired and not self._cache_expired(object.last_updated):
             return object
         data = self._extract_online(object.uri, object.extractor_cache)
         logging.debug(f"Updating info for media: {data!r}")

server/entertainment_decider/models.py

@@ -119,7 +119,7 @@ class MediaElement(db.Entity):
     extractor_key: str = orm.Required(str)
     orm.composite_key(extractor_name, extractor_key)
     _extractor_cache: Dict = orm.Optional(orm.Json, nullable=True)
-    extractor_cache_date: datetime = orm.Optional(datetime)
+    last_updated: datetime = orm.Optional(datetime)
 
     watched: bool = orm.Required(bool, default=False)
     ignored: bool = orm.Required(bool, default=False)
@@ -131,13 +131,13 @@ class MediaElement(db.Entity):
     collection_links: Iterable[MediaCollectionLink] = orm.Set(lambda: MediaCollectionLink)
 
     def extractor_cache_valid(self, max_age: timedelta):
-        return (datetime.now() - self.extractor_cache_date) < max_age
+        return (datetime.now() - self.last_updated) < max_age
 
     def __get_cache(self):
         return self._extractor_cache
     def __set_cache(self, cache: Dict):
         self._extractor_cache = cache
-        self.extractor_cache_date = datetime.now()
+        self.last_updated = datetime.now()
     extractor_cache = property(__get_cache, __set_cache)
 
     @property
@@ -231,7 +231,7 @@ class MediaCollection(db.Entity):
     extractor_key: str = orm.Required(str)
     orm.composite_key(extractor_name, extractor_key)
     _extractor_cache: Dict = orm.Optional(orm.Json, nullable=True)
-    extractor_cache_date: datetime = orm.Optional(datetime)
+    last_updated: datetime = orm.Optional(datetime)
 
     keep_updated: bool = orm.Required(bool, default=False)
     watch_in_order_auto: bool = orm.Required(bool, default=True)
@@ -244,13 +244,13 @@ class MediaCollection(db.Entity):
     media_links: Iterable[MediaCollectionLink] = orm.Set(MediaCollectionLink)
 
     def extractor_cache_valid(self, max_age: timedelta):
-        return (datetime.now() - self.extractor_cache_date) < max_age
+        return (datetime.now() - self.last_updated) < max_age
 
     def __get_cache(self):
         return self._extractor_cache
     def __set_cache(self, cache: Dict):
         self._extractor_cache = cache
-        self.extractor_cache_date = datetime.now()
+        self.last_updated = datetime.now()
     extractor_cache = property(__get_cache, __set_cache)
 
     @property