remove SequentialExtractor class
This commit is contained in:
@@ -8,19 +8,19 @@
|
|||||||
|
|
||||||
"""Base classes for extractors for danbooru and co"""
|
"""Base classes for extractors for danbooru and co"""
|
||||||
|
|
||||||
from .common import SequentialExtractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import text
|
from .. import text
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
import json
|
import json
|
||||||
import os.path
|
import os.path
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
|
||||||
class BooruExtractor(SequentialExtractor):
|
class BooruExtractor(Extractor):
|
||||||
|
|
||||||
api_url = ""
|
api_url = ""
|
||||||
|
|
||||||
def __init__(self, match, info):
|
def __init__(self, match, info):
|
||||||
SequentialExtractor.__init__(self)
|
Extractor.__init__(self)
|
||||||
self.info = info
|
self.info = info
|
||||||
self.tags = text.unquote(match.group(1))
|
self.tags = text.unquote(match.group(1))
|
||||||
self.page = "page"
|
self.page = "page"
|
||||||
|
|||||||
@@ -8,16 +8,16 @@
|
|||||||
|
|
||||||
"""Base classes for extractors for different Futaba Channel boards"""
|
"""Base classes for extractors for different Futaba Channel boards"""
|
||||||
|
|
||||||
from .common import SequentialExtractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import text
|
from .. import text
|
||||||
|
|
||||||
class ChanExtractor(SequentialExtractor):
|
class ChanExtractor(Extractor):
|
||||||
|
|
||||||
api_url = ""
|
api_url = ""
|
||||||
file_url = ""
|
file_url = ""
|
||||||
|
|
||||||
def __init__(self, category, board, thread):
|
def __init__(self, category, board, thread):
|
||||||
SequentialExtractor.__init__(self)
|
Extractor.__init__(self)
|
||||||
self.metadata = {
|
self.metadata = {
|
||||||
"category": category,
|
"category": category,
|
||||||
"board": board,
|
"board": board,
|
||||||
|
|||||||
@@ -45,12 +45,6 @@ class Extractor():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class SequentialExtractor(Extractor):
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
Extractor.__init__(self)
|
|
||||||
|
|
||||||
|
|
||||||
class AsynchronousExtractor(Extractor):
|
class AsynchronousExtractor(Extractor):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
"""Extract images from albums at http://imgchili.net/"""
|
"""Extract images from albums at http://imgchili.net/"""
|
||||||
|
|
||||||
from .common import SequentialExtractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import text
|
from .. import text
|
||||||
import re
|
import re
|
||||||
|
|
||||||
@@ -22,10 +22,10 @@ info = {
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
class ImgchiliExtractor(SequentialExtractor):
|
class ImgchiliExtractor(Extractor):
|
||||||
|
|
||||||
def __init__(self, match):
|
def __init__(self, match):
|
||||||
SequentialExtractor.__init__(self)
|
Extractor.__init__(self)
|
||||||
self.match = match
|
self.match = match
|
||||||
self.num = 0
|
self.num = 0
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
"""Extract images and ugoira from http://www.pixiv.net/"""
|
"""Extract images and ugoira from http://www.pixiv.net/"""
|
||||||
|
|
||||||
from .common import SequentialExtractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import config, text
|
from .. import config, text
|
||||||
import re
|
import re
|
||||||
import json
|
import json
|
||||||
@@ -24,13 +24,13 @@ info = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class PixivExtractor(SequentialExtractor):
|
class PixivExtractor(Extractor):
|
||||||
|
|
||||||
member_url = "http://www.pixiv.net/member_illust.php"
|
member_url = "http://www.pixiv.net/member_illust.php"
|
||||||
illust_url = "http://www.pixiv.net/member_illust.php?mode=medium"
|
illust_url = "http://www.pixiv.net/member_illust.php?mode=medium"
|
||||||
|
|
||||||
def __init__(self, match):
|
def __init__(self, match):
|
||||||
SequentialExtractor.__init__(self)
|
Extractor.__init__(self)
|
||||||
self.artist_id = match.group(1)
|
self.artist_id = match.group(1)
|
||||||
self.api = PixivAPI(self.session)
|
self.api = PixivAPI(self.session)
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
"""Extract manga pages from http://manga.redhawkscans.com/"""
|
"""Extract manga pages from http://manga.redhawkscans.com/"""
|
||||||
|
|
||||||
from .common import SequentialExtractor, Message
|
from .common import Extractor, Message
|
||||||
from .. import text
|
from .. import text
|
||||||
import os.path
|
import os.path
|
||||||
import json
|
import json
|
||||||
@@ -24,12 +24,12 @@ info = {
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
class RedHawkScansExtractor(SequentialExtractor):
|
class RedHawkScansExtractor(Extractor):
|
||||||
|
|
||||||
url_base = "https://manga.redhawkscans.com/reader/read/"
|
url_base = "https://manga.redhawkscans.com/reader/read/"
|
||||||
|
|
||||||
def __init__(self, match):
|
def __init__(self, match):
|
||||||
SequentialExtractor.__init__(self)
|
Extractor.__init__(self)
|
||||||
self.part = match.group(1)
|
self.part = match.group(1)
|
||||||
|
|
||||||
def items(self):
|
def items(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user