diff --git a/catalog/common/models.py b/catalog/common/models.py index 4a7c1b1e..1215b542 100644 --- a/catalog/common/models.py +++ b/catalog/common/models.py @@ -654,7 +654,7 @@ class Item(PolymorphicModel): @property def brief_description(self): - return (self.display_description or "")[:155] + return (str(self.display_description) or "")[:155] @classmethod def get_by_url(cls, url_or_b62: str, resolve_merge=False) -> "Self | None": diff --git a/catalog/common/sites.py b/catalog/common/sites.py index 9821face..34a56407 100644 --- a/catalog/common/sites.py +++ b/catalog/common/sites.py @@ -131,18 +131,18 @@ class AbstractSite: ids = resource.get_lookup_ids(cls.DEFAULT_MODEL) for t, v in ids: matched = None + # matched = model.objects.filter( + # primary_lookup_id_type=t, + # primary_lookup_id_value=v, + # title=resource.metadata["title"], + # ).first() + # if matched is None and resource.id_type not in [ + # IdType.DoubanMusic, # DoubanMusic has many dirty data with same UPC + # # IdType.Goodreads, # previous scraper generated some dirty data + # ]: matched = model.objects.filter( - primary_lookup_id_type=t, - primary_lookup_id_value=v, - title=resource.metadata["title"], + primary_lookup_id_type=t, primary_lookup_id_value=v ).first() - if matched is None and resource.id_type not in [ - IdType.DoubanMusic, # DoubanMusic has many dirty data with same UPC - # IdType.Goodreads, # previous scraper generated some dirty data - ]: - matched = model.objects.filter( - primary_lookup_id_type=t, primary_lookup_id_value=v - ).first() if matched is None: matched = model.objects.filter( primary_lookup_id_type=resource.id_type, diff --git a/mastodon/models/email.py b/mastodon/models/email.py index 19bc753b..2401e539 100644 --- a/mastodon/models/email.py +++ b/mastodon/models/email.py @@ -40,7 +40,7 @@ class Email: fail_silently=False, ) except Exception as e: - logger.error(f"send email to {email} failed: {e}", extra={"exception": e}) + logger.error(f"send email to {email} failed: {e}") @staticmethod def generate_login_email(email: str, action: str) -> tuple[str, str]: