New upstream version 1.31.1.upstream/1.31.1

1 files changed, 6 insertions, 6 deletions

diff --git a/gallery_dl/extractor/nekohouse.py b/gallery_dl/extractor/nekohouse.py
index e6b0461..728912b 100644
--- a/gallery_dl/extractor/nekohouse.py
+++ b/gallery_dl/extractor/nekohouse.py
@@ -12,7 +12,7 @@ from .common import Extractor, Message
 from .. import text
 
 BASE_PATTERN = r"(?:https?://)?nekohouse\.su"
-USER_PATTERN = BASE_PATTERN + r"/([^/?#]+)/user/([^/?#]+)"
+USER_PATTERN = rf"{BASE_PATTERN}/([^/?#]+)/user/([^/?#]+)"
 
 
 class NekohouseExtractor(Extractor):
@@ -27,7 +27,7 @@ class NekohousePostExtractor(NekohouseExtractor):
                      "{post_id} {date} {title[b:230]}")
     filename_fmt = "{num:>02} {id|filename}.{extension}"
     archive_fmt = "{service}_{user_id}_{post_id}_{hash}"
-    pattern = USER_PATTERN + r"/post/([^/?#]+)"
+    pattern = rf"{USER_PATTERN}/post/([^/?#]+)"
     example = "https://nekohouse.su/SERVICE/user/12345/post/12345"
 
     def items(self):
@@ -42,7 +42,7 @@ class NekohousePostExtractor(NekohouseExtractor):
         post["post_id"] = post_id
         post["count"] = len(files)
 
-        yield Message.Directory, post
+        yield Message.Directory, "", post
         for post["num"], file in enumerate(files, 1):
             url = file["url"]
             text.nameext_from_url(url, file)
@@ -59,8 +59,8 @@ class NekohousePostExtractor(NekohouseExtractor):
                 'class="scrape__user-name', '</').rpartition(">")[2].strip()),
             "title"   : text.unescape(extr(
                 'class="scrape__title', '</').rpartition(">")[2]),
-            "date"   : text.parse_datetime(extr(
-                'datetime="', '"')[:19], "%Y-%m-%d %H:%M:%S"),
+            "date"   : self.parse_datetime_iso(extr(
+                'datetime="', '"')[:19]),
             "content": text.unescape(extr(
                 'class="scrape__content">', "</div>").strip()),
         }
@@ -98,7 +98,7 @@ class NekohousePostExtractor(NekohouseExtractor):
 
 class NekohouseUserExtractor(NekohouseExtractor):
     subcategory = "user"
-    pattern = USER_PATTERN + r"/?(?:\?([^#]+))?(?:$|\?|#)"
+    pattern = rf"{USER_PATTERN}/?(?:\?([^#]+))?(?:$|\?|#)"
     example = "https://nekohouse.su/SERVICE/user/12345"
 
     def items(self):