|
@@ -27,10 +27,10 @@ class Domain(TimeStampedModel):
|
|
|
|
|
|
tags = TaggableManager(blank=True)
|
|
|
|
|
|
- def __str__(self):
|
|
|
+ def __str__(self) -> str:
|
|
|
if self.name:
|
|
|
- return self.name
|
|
|
- return self.root
|
|
|
+ return str(self.name)
|
|
|
+ return str(self.root)
|
|
|
|
|
|
def scrobbles_for_user(self, user_id):
|
|
|
from scrobbles.models import Scrobble
|
|
@@ -49,11 +49,11 @@ class WebPage(ScrobblableMixin):
|
|
|
domain = models.ForeignKey(Domain, on_delete=models.DO_NOTHING, **BNULL)
|
|
|
extract = models.TextField(**BNULL)
|
|
|
|
|
|
- def __str__(self):
|
|
|
+ def __str__(self) -> str:
|
|
|
if self.title:
|
|
|
- return self.title
|
|
|
+ return "{} ({})".format(self.title, self.domain)
|
|
|
if self.domain:
|
|
|
- return self.domain.name
|
|
|
+ return "Unknown ({})".format(self.domain)
|
|
|
return str(self.uuid)
|
|
|
|
|
|
def _raw_domain(self):
|