[ao3] match URLs with 'com' and 'net' TLDs and 'ao3.org' (#6013)

gallery_dl/extractor/ao3.py

@@ -11,7 +11,8 @@
 from .common import Extractor, Message
 from .. import text, util
 
-BASE_PATTERN = r"(?:https?://)?(?:www\.)?archiveofourown.org"
+BASE_PATTERN = (r"(?:https?://)?(?:www\.)?"
+                r"a(?:rchiveofourown|o3)\.(?:org|com|net)")
 
 
 class Ao3Extractor(Extractor):
@@ -188,7 +189,6 @@ class Ao3UserSeriesExtractor(Ao3Extractor):
             yield Message.Queue, base + series_id, data
 
     def series(self):
-        path, user, pseud, query = self.groups
         return self._pagination(self.groups[0], '<li id="series_')
 
 

test/results/ao3.py

@@ -139,6 +139,21 @@ __tests__ = (
         "https://archiveofourown.org/users/Fyrelass/series",
     ),
 },
+{
+    "#url"     : "https://archiveofourown.com/users/Fyrelass",
+    "#category": ("", "ao3", "user"),
+    "#class"   : ao3.Ao3UserExtractor,
+},
+{
+    "#url"     : "https://archiveofourown.net/users/Fyrelass",
+    "#category": ("", "ao3", "user"),
+    "#class"   : ao3.Ao3UserExtractor,
+},
+{
+    "#url"     : "https://ao3.org/users/Fyrelass",
+    "#category": ("", "ao3", "user"),
+    "#class"   : ao3.Ao3UserExtractor,
+},
 
 {
     "#url"     : "https://archiveofourown.org/users/Fyrelass/profile",