Merge Flowerlark Studios comics into one file

dosagelib/plugins/a.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2020 Tobias Gruetzmacher
+# Copyright (C) 2015-2021 Tobias Gruetzmacher
 # Copyright (C) 2019-2020 Daniel Ring
 from re import compile, escape, MULTILINE
 
@@ -391,12 +391,6 @@ class ArtificialIncident(_WPWebcomic):
     firstStripUrl = stripUrl % 'issue-one-life-changing'
 
 
-class Ashes(_WordPressScraper):
-    url = 'http://www.flowerlarkstudios.com/comicpage/prologue/10232009/'
-    firstStripUrl = url
-    starter = indirectStarter
-
-
 class AstronomyPOTD(_ParserScraper):
     baseUrl = 'http://apod.nasa.gov/apod/'
     url = baseUrl + 'astropix.html'

dosagelib/plugins/e.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2020 Tobias Gruetzmacher
+# Copyright (C) 2015-2021 Tobias Gruetzmacher
 # Copyright (C) 2019-2020 Daniel Ring
 import os
 from re import compile, IGNORECASE
@@ -42,12 +42,6 @@ class EarthsongSaga(_ParserScraper):
         return super().getPrevUrl(url, data)
 
 
-class EasilyAmused(_WordPressScraper):
-    url = 'http://www.flowerlarkstudios.com/comicpage/college-daze/ea01/'
-    firstStripUrl = url
-    starter = indirectStarter
-
-
 class EatLiver(_ParserScraper):
     url = 'http://www.eatliver.com/'
     starter = indirectStarter
@@ -174,12 +168,6 @@ class Erstwhile(_WPNavi):
     endOfLife = True
 
 
-class Eryl(_WordPressScraper):
-    url = 'http://www.flowerlarkstudios.com/comicpage/prologue-migration/page-i/'
-    firstStripUrl = url
-    starter = indirectStarter
-
-
 class Everblue(_ParserScraper):
     url = 'http://www.everblue-comic.com/comic/'
     stripUrl = url + '%s'

dosagelib/plugins/flowerlark.py

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 Tobias Gruetzmacher
+from ..helpers import indirectStarter
+from .common import _WordPressScraper
+
+
+class FlowerlarkStudios(_WordPressScraper):
+    starter = indirectStarter
+
+    def __init__(self, name, sub):
+        super().__init__(name)
+
+        self.url = 'https://www.flowerlarkstudios.com/comic/%s/' % sub
+        self.firstStripUrl = self.url
+
+    @classmethod
+    def getmodules(cls):
+        return (
+            cls('Ashes', 'prologue/vol-1-ashes'),
+            cls('EasilyAmused', 'adulting-is-hard/making-a-splash'),
+            cls('Eryl', 'opening/intro-to-dark-wings'),
+            cls('NoMoreSavePoints', 'no-more-save-points/mushroom-hopping'),
+        )

dosagelib/plugins/l.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2020 Tobias Gruetzmacher
+# Copyright (C) 2015-2021 Tobias Gruetzmacher
 # Copyright (C) 2019-2020 Daniel Ring
 from re import compile
 
@@ -28,12 +28,6 @@ class Lackadaisy(_ParserScraper):
         return 'lackadaisy_%s.%s' % (num, ext)
 
 
-class Laiyu(_WordPressScraper):
-    url = 'http://www.flowerlarkstudios.com/comicpage/preliminary-concepts/welcome/'
-    firstStripUrl = url
-    starter = indirectStarter
-
-
 class LastResort(_WordPressScraper):
     url = 'http://www.lastres0rt.com/'
     stripUrl = url + 'comic/%s/'

dosagelib/plugins/n.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2020 Tobias Gruetzmacher
+# Copyright (C) 2015-2021 Tobias Gruetzmacher
 # Copyright (C) 2019-2020 Daniel Ring
 from re import compile, escape
 
@@ -168,12 +168,6 @@ class NobodyScores(_BasicScraper):
     help = 'Index format: nnn'
 
 
-class NoMoreSavePoints(_WordPressScraper):
-    url = 'http://www.flowerlarkstudios.com/comicpage/no-more-save-points/mushroom-hopping/'
-    firstStripUrl = url
-    starter = indirectStarter
-
-
 class NoNeedForBushido(_ParserScraper):
     url = 'http://nn4b.com/'
     stripUrl = url + 'comic/%s'

dosagelib/plugins/old.py

@@ -651,6 +651,7 @@ class Removed(Scraper):
             cls('GoComics/UncleArtsFunland'),
             cls('GoComics/USAcres'),
             cls('GoComics/WorldOfWonder'),
+            cls('Laiyu', 'brk'),
             cls('SmackJeeves/20TimesKirby'),
             cls('SmackJeeves/2Kingdoms'),
             cls('SmackJeeves/355Days'),