mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-07-06 13:45:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #401 from mouse-reeve/infinite-recursion-bug

Browse source 
Fixes infinite recursion when loading books
This commit is contained in:
Mouse Reeve 2020-12-17 12:56:07 -08:00 committed by GitHub
parent 2799ed68e3 04ba5abf45
commit 80029f3137
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/activitypub/book.py
View file

@ -38,7 +38,7 @@ class Edition(Book):
isbn13: str = '' isbn13: str = ''
oclcNumber: str = '' oclcNumber: str = ''
asin: str = '' asin: str = ''
pages: str = '' pages: int = None
physicalFormat: str = '' physicalFormat: str = ''
publishers: List[str] = field(default_factory=lambda: []) publishers: List[str] = field(default_factory=lambda: [])

3
bookwyrm/models/book.py
View file

@ -92,7 +92,8 @@ class Work(OrderedCollectionPageMixin, Book):
default_edition = fields.ForeignKey( default_edition = fields.ForeignKey(
'Edition', 'Edition',
on_delete=models.PROTECT, on_delete=models.PROTECT,
null=True null=True,
load_remote=False
) )
def get_default_edition(self): def get_default_edition(self):

10
bookwyrm/models/fields.py
View file

@ -100,12 +100,19 @@ class ActivitypubFieldMixin:
class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin): class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
''' default (de)serialization for foreign key and one to one ''' ''' default (de)serialization for foreign key and one to one '''
def __init__(self, *args, load_remote=True, **kwargs):
self.load_remote = load_remote
super().__init__(*args, **kwargs)
def field_from_activity(self, value): def field_from_activity(self, value):
if not value: if not value:
return None return None
related_model = self.related_model related_model = self.related_model
if isinstance(value, dict) and value.get('id'): if isinstance(value, dict) and value.get('id'):
if not self.load_remote:
# only look in the local database
return related_model.find_existing(value)
# this is an activitypub object, which we can deserialize # this is an activitypub object, which we can deserialize
activity_serializer = related_model.activity_serializer activity_serializer = related_model.activity_serializer
return activity_serializer(**value).to_model(related_model) return activity_serializer(**value).to_model(related_model)
@ -116,6 +123,9 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
# we don't know what this is, ignore it # we don't know what this is, ignore it
return None return None
# gets or creates the model field from the remote id # gets or creates the model field from the remote id
if not self.load_remote:
# only look in the local database
return related_model.find_existing_by_remote_id(value)
return activitypub.resolve_remote_id(related_model, value) return activitypub.resolve_remote_id(related_model, value)