New upstream version 1.26.0.upstream/1.26.0

1 files changed, 5 insertions, 37 deletions

diff --git a/gallery_dl/extractor/pixnet.py b/gallery_dl/extractor/pixnet.py
index 15be563..eb3edc3 100644
--- a/gallery_dl/extractor/pixnet.py
+++ b/gallery_dl/extractor/pixnet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2016-2020 Mike Fährmann
+# Copyright 2016-2023 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
@@ -11,7 +11,6 @@
 from .common import Extractor, Message
 from .. import text, exception
 
-
 BASE_PATTERN = r"(?:https?://)?(?!www\.)([\w-]+)\.pixnet.net"
 
 
@@ -68,11 +67,7 @@ class PixnetImageExtractor(PixnetExtractor):
     filename_fmt = "{id}.{extension}"
     directory_fmt = ("{category}", "{blog}")
     pattern = BASE_PATTERN + r"/album/photo/(\d+)"
-    test = ("https://albertayu773.pixnet.net/album/photo/159443828", {
-        "url": "156564c422138914c9fa5b42191677b45c414af4",
-        "keyword": "19971bcd056dfef5593f4328a723a9602be0f087",
-        "content": "0e097bdf49e76dd9b9d57a016b08b16fa6a33280",
-    })
+    example = "https://USER.pixnet.net/album/photo/12345"
 
     def items(self):
         url = "https://api.pixnet.cc/oembed"
@@ -100,19 +95,7 @@ class PixnetSetExtractor(PixnetExtractor):
     directory_fmt = ("{category}", "{blog}",
                      "{folder_id} {folder_title}", "{set_id} {set_title}")
     pattern = BASE_PATTERN + r"/album/set/(\d+)"
-    test = (
-        ("https://albertayu773.pixnet.net/album/set/15078995", {
-            "url": "6535712801af47af51110542f4938a7cef44557f",
-            "keyword": "bf25d59e5b0959cb1f53e7fd2e2a25f2f67e5925",
-        }),
-        ("https://anrine910070.pixnet.net/album/set/5917493", {
-            "url": "b3eb6431aea0bcf5003432a4a0f3a3232084fc13",
-            "keyword": "bf7004faa1cea18cf9bd856f0955a69be51b1ec6",
-        }),
-        ("https://sky92100.pixnet.net/album/set/17492544", {
-            "count": 0,  # password-protected
-        }),
-    )
+    example = "https://USER.pixnet.net/album/set/12345"
 
     def items(self):
         url = self.url_fmt.format(self.root, self.item_id)
@@ -157,10 +140,7 @@ class PixnetFolderExtractor(PixnetExtractor):
     subcategory = "folder"
     url_fmt = "{}/album/folder/{}"
     pattern = BASE_PATTERN + r"/album/folder/(\d+)"
-    test = ("https://albertayu773.pixnet.net/album/folder/1405768", {
-        "pattern": PixnetSetExtractor.pattern,
-        "count": ">= 15",
-    })
+    example = "https://USER.pixnet.net/album/folder/12345"
 
 
 class PixnetUserExtractor(PixnetExtractor):
@@ -168,16 +148,4 @@ class PixnetUserExtractor(PixnetExtractor):
     subcategory = "user"
     url_fmt = "{}{}/album/list"
     pattern = BASE_PATTERN + r"()(?:/blog|/album(?:/list)?)?/?(?:$|[?#])"
-    test = (
-        ("https://albertayu773.pixnet.net/"),
-        ("https://albertayu773.pixnet.net/blog"),
-        ("https://albertayu773.pixnet.net/album"),
-        ("https://albertayu773.pixnet.net/album/list", {
-            "pattern": PixnetFolderExtractor.pattern,
-            "count": ">= 30",
-        }),
-        ("https://anrine910070.pixnet.net/album/list", {
-            "pattern": PixnetSetExtractor.pattern,
-            "count": ">= 14",
-        }),
-    )
+    example = "https://USER.pixnet.net/"