New upstream version 1.17.2.upstream/1.17.2

1 files changed, 8 insertions, 0 deletions

diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py
index a5f0138..ea5bb6d 100644
--- a/gallery_dl/extractor/sankaku.py
+++ b/gallery_dl/extractor/sankaku.py
@@ -55,6 +55,7 @@ class SankakuExtractor(BooruExtractor):
         post["created_at"] = post["created_at"]["s"]
         post["date"] = text.parse_timestamp(post["created_at"])
         post["tags"] = [tag["name"] for tag in post["tags"]]
+        post["tag_string"] = " ".join(post["tags"])
 
     def _extended_tags(self, post):
         tags = collections.defaultdict(list)
@@ -63,6 +64,7 @@ class SankakuExtractor(BooruExtractor):
             tags[types[tag["type"]]].append(tag["name"])
         for key, value in tags.items():
             post["tags_" + key] = value
+            post["tag_string_" + key] = " ".join(value)
 
 
 class SankakuTagExtractor(SankakuExtractor):
@@ -122,7 +124,13 @@ class SankakuPoolExtractor(SankakuExtractor):
 
     def metadata(self):
         pool = SankakuAPI(self).pools(self.pool_id)
+        pool["tags"] = [tag["name"] for tag in pool["tags"]]
+        pool["artist_tags"] = [tag["name"] for tag in pool["artist_tags"]]
+
         self._posts = pool.pop("posts")
+        for num, post in enumerate(self._posts, 1):
+            post["num"] = num
+
         return {"pool": pool}
 
     def posts(self):