From bd87428f8e7aca599a308b40de18788bd2926dee Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Sun, 15 Oct 2017 00:18:23 +0300 Subject: [PATCH] [Sync] Image.id -> Image.ref --- utils/Sync/sync/models/Album.py | 4 ++-- utils/Sync/sync/models/Article.py | 2 +- utils/Sync/sync/models/Image.py | 4 ++-- utils/Sync/sync/models/Page.py | 2 +- utils/Sync/sync/models/Person.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/Sync/sync/models/Album.py b/utils/Sync/sync/models/Album.py index ac7e2ba0..0f9b26aa 100644 --- a/utils/Sync/sync/models/Album.py +++ b/utils/Sync/sync/models/Album.py @@ -170,11 +170,11 @@ class Album(Model): # ) def bake(self): - preview = None if not self.preview else self.preview.id + preview = None if not self.preview else self.preview.ref return { **self.params, - 'images': [i.id for i in self.images], + 'images': [i.ref for i in self.images], 'preview': preview, 'post': self.post, 'id': self.id, diff --git a/utils/Sync/sync/models/Article.py b/utils/Sync/sync/models/Article.py index fa59d7cc..6a924bf7 100644 --- a/utils/Sync/sync/models/Article.py +++ b/utils/Sync/sync/models/Article.py @@ -124,7 +124,7 @@ class Article(Model): 'file': self.file, 'origin': self.origin, 'version': self.version, - 'preview': self.preview if isinstance(self.preview, str) else self.preview.id, + 'preview': self.preview if isinstance(self.preview, str) else self.preview.ref, } def __set_id(self): diff --git a/utils/Sync/sync/models/Image.py b/utils/Sync/sync/models/Image.py index e83fa33d..8d9ee61c 100644 --- a/utils/Sync/sync/models/Image.py +++ b/utils/Sync/sync/models/Image.py @@ -45,7 +45,7 @@ class Image(Model): else: doc = await Image.find_one({'file': file}) img = Image(provider, file, doc['data'], url_factory) - img.__set_id(doc['_id']) + img.ref = doc['_id'] return img @@ -93,7 +93,7 @@ class Image(Model): async def save(self): c = sync_image(self.bake()) - self.__set_id(c['_id']) + self.ref = c['_id'] def bake(self): return { diff --git a/utils/Sync/sync/models/Page.py b/utils/Sync/sync/models/Page.py index de5a3766..b8e29fb6 100644 --- a/utils/Sync/sync/models/Page.py +++ b/utils/Sync/sync/models/Page.py @@ -126,7 +126,7 @@ class Page(Model): self.images = images def bake(self): - images = [image.id for image in self.images] + images = [image.ref for image in self.images] data = create_post(self.params['data'], lambda src: self.__image_url_by_src(src)) diff --git a/utils/Sync/sync/models/Person.py b/utils/Sync/sync/models/Person.py index 8ca2b5c2..50925ddc 100644 --- a/utils/Sync/sync/models/Person.py +++ b/utils/Sync/sync/models/Person.py @@ -68,7 +68,7 @@ class Person(Model): 'id': self.id, 'hash': self.hash, 'file': self.file, - 'picture': self.picture.id, + 'picture': self.picture.ref, } def __set_id(self):