New upstream version 1.30.2.upstream/1.30.2

1 files changed, 6 insertions, 8 deletions

diff --git a/gallery_dl/extractor/livedoor.py b/gallery_dl/extractor/livedoor.py
index e21659f..ab3be69 100644
--- a/gallery_dl/extractor/livedoor.py
+++ b/gallery_dl/extractor/livedoor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2019-2023 Mike Fährmann
+# Copyright 2019-2025 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -22,12 +22,11 @@ class LivedoorExtractor(Extractor):
 
     def __init__(self, match):
         Extractor.__init__(self, match)
-        self.user = match.group(1)
+        self.user = match[1]
 
     def items(self):
         for post in self.posts():
-            images = self._images(post)
-            if images:
+            if images := self._images(post):
                 yield Message.Directory, {"post": post}
                 for image in images:
                     yield Message.Url, image["url"], image
@@ -87,7 +86,7 @@ class LivedoorBlogExtractor(LivedoorExtractor):
     example = "http://blog.livedoor.jp/USER/"
 
     def posts(self):
-        url = "{}/{}".format(self.root, self.user)
+        url = f"{self.root}/{self.user}"
         while url:
             extr = text.extract_from(self.request(url).text)
             while True:
@@ -108,11 +107,10 @@ class LivedoorPostExtractor(LivedoorExtractor):
 
     def __init__(self, match):
         LivedoorExtractor.__init__(self, match)
-        self.post_id = match.group(2)
+        self.post_id = match[2]
 
     def posts(self):
-        url = "{}/{}/archives/{}.html".format(
-            self.root, self.user, self.post_id)
+        url = f"{self.root}/{self.user}/archives/{self.post_id}.html"
         extr = text.extract_from(self.request(url).text)
         data = extr('<rdf:RDF', '</rdf:RDF>')
         body = extr('class="article-body-inner">', 'class="article-footer">')