New upstream version 1.26.9.upstream/1.26.9

1 files changed, 10 insertions, 6 deletions

diff --git a/gallery_dl/extractor/warosu.py b/gallery_dl/extractor/warosu.py
index 3bb635d..e91f45f 100644
--- a/gallery_dl/extractor/warosu.py
+++ b/gallery_dl/extractor/warosu.py
@@ -50,7 +50,7 @@ class WarosuThreadExtractor(Extractor):
         title = text.unescape(text.extr(page, "class=filetitle>", "<"))
         return {
             "board"     : self.board,
-            "board_name": boardname.rpartition(" - ")[2],
+            "board_name": boardname.split(" - ")[1],
             "thread"    : self.thread,
             "title"     : title,
         }
@@ -64,8 +64,7 @@ class WarosuThreadExtractor(Extractor):
     def parse(self, post):
         """Build post object by extracting data from an HTML post"""
         data = self._extract_post(post)
-        if "<span> File:" in post:
-            self._extract_image(post, data)
+        if "<span> File:" in post and self._extract_image(post, data):
             part = data["image"].rpartition("/")[2]
             data["tim"], _, data["extension"] = part.partition(".")
             data["ext"] = "." + data["extension"]
@@ -91,6 +90,11 @@ class WarosuThreadExtractor(Extractor):
             "", "<").rstrip().rpartition(".")[0])
         extr("<br>", "")
 
-        data["image"] = url = extr("<a href=", ">")
-        if url[0] == "/":
-            data["image"] = self.root + url
+        url = extr("<a href=", ">")
+        if url:
+            if url[0] == "/":
+                data["image"] = self.root + url
+            else:
+                data["image"] = url
+            return True
+        return False