From 727791c5e77fa054899d275ef9e7ce49611dfd38 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Tue, 24 Oct 2017 17:28:04 +0300 Subject: [PATCH] [Sync] ImageCollectionToken build --- utils/Sync/kazimir/Token.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/utils/Sync/kazimir/Token.py b/utils/Sync/kazimir/Token.py index 0f96f86e..3d09f9df 100644 --- a/utils/Sync/kazimir/Token.py +++ b/utils/Sync/kazimir/Token.py @@ -140,7 +140,9 @@ class ImageToken(Token): self.build = None def merge(self, token: Token): - return ImageCollectionToken([self.data, token.data]) + merged_token = ImageCollectionToken([self.data, token.data]) + merged_token.build = self.build + return merged_token async def compile(self): img = self.parse_data() @@ -167,17 +169,26 @@ class ImageCollectionToken(ImageToken): def __init__(self, data) -> None: super().__init__(data) self.name = 'image_collection' + self.build = None def merge(self, token: Token): if isinstance(token.data, list): data = token.data else: data = [token.data] - return ImageCollectionToken([*self.data, *data]) + merged_token = ImageCollectionToken([*self.data, *data]) + merged_token.build = self.build + return merged_token async def compile(self): data = self.parse_data() - images = [f'' for x in data] + images = [] + for x in data: + img = await self.build(x) + images.append(img) + + images = [x['src'] for x in images] + images = [f'' for x in images] images = '\n'.join(images) return f''' @@ -192,8 +203,7 @@ class ImageCollectionToken(ImageToken): ''' def parse_data(self): - images = [parse_file(x) for x in self.data] - return [x['file'] for x in images] + return [parse_file(x) for x in self.data] class UrlToken(Token):