Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix a few edge cases

Browse source
This commit is contained in:
Your Name 2024-07-23 10:36:01 -04:00 • committed by Henri Dickson
parent 7416676462
commit a06eccf827
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalog/common/models.py
View file

@ -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":

20
catalog/common/sites.py
View file

@ -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,

2
mastodon/models/email.py
View file

@ -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]: