mirror of
https://github.com/Garmelon/PFERD.git
synced 2023-12-21 10:23:01 +01:00
Let crawlers obtain authenticators
This commit is contained in:
parent
c3ce6bb31c
commit
0acdee15a0
@ -4,10 +4,11 @@ from datetime import datetime
|
|||||||
from pathlib import Path, PurePath
|
from pathlib import Path, PurePath
|
||||||
# TODO In Python 3.9 and above, AsyncContextManager is deprecated
|
# TODO In Python 3.9 and above, AsyncContextManager is deprecated
|
||||||
from typing import (Any, AsyncContextManager, AsyncIterator, Awaitable,
|
from typing import (Any, AsyncContextManager, AsyncIterator, Awaitable,
|
||||||
Callable, Optional, TypeVar)
|
Callable, Dict, Optional, TypeVar)
|
||||||
|
|
||||||
from rich.markup import escape
|
from rich.markup import escape
|
||||||
|
|
||||||
|
from .authenticator import Authenticator
|
||||||
from .conductor import ProgressBar, TerminalConductor
|
from .conductor import ProgressBar, TerminalConductor
|
||||||
from .config import Config, Section
|
from .config import Config, Section
|
||||||
from .limiter import Limiter
|
from .limiter import Limiter
|
||||||
@ -136,6 +137,15 @@ class CrawlerSection(Section):
|
|||||||
def transform(self) -> str:
|
def transform(self) -> str:
|
||||||
return self.s.get("transform", "")
|
return self.s.get("transform", "")
|
||||||
|
|
||||||
|
def auth(self, authenticators: Dict[str, Authenticator]) -> Authenticator:
|
||||||
|
value = self.s.get("auth")
|
||||||
|
if value is None:
|
||||||
|
self.missing_value("auth")
|
||||||
|
auth = authenticators.get(f"auth:{value}")
|
||||||
|
if auth is None:
|
||||||
|
self.invalid_value("auth", value)
|
||||||
|
return auth
|
||||||
|
|
||||||
|
|
||||||
class Crawler(ABC):
|
class Crawler(ABC):
|
||||||
def __init__(
|
def __init__(
|
||||||
|
@ -1,19 +1,21 @@
|
|||||||
from configparser import SectionProxy
|
from configparser import SectionProxy
|
||||||
from typing import Callable, Dict
|
from typing import Callable, Dict
|
||||||
|
|
||||||
|
from ..authenticator import Authenticator
|
||||||
from ..conductor import TerminalConductor
|
from ..conductor import TerminalConductor
|
||||||
from ..config import Config
|
from ..config import Config
|
||||||
from ..crawler import Crawler
|
from ..crawler import Crawler
|
||||||
from .local import LocalCrawler, LocalCrawlerSection
|
from .local import LocalCrawler, LocalCrawlerSection
|
||||||
|
|
||||||
CrawlerConstructor = Callable[[
|
CrawlerConstructor = Callable[[
|
||||||
str, # Name (without the "crawl:" prefix)
|
str, # Name (without the "crawl:" prefix)
|
||||||
SectionProxy, # Crawler's section of global config
|
SectionProxy, # Crawler's section of global config
|
||||||
Config, # Global config
|
Config, # Global config
|
||||||
TerminalConductor, # Global conductor instance
|
TerminalConductor, # Global conductor instance
|
||||||
|
Dict[str, Authenticator], # Loaded authenticators by name
|
||||||
], Crawler]
|
], Crawler]
|
||||||
|
|
||||||
CRAWLERS: Dict[str, CrawlerConstructor] = {
|
CRAWLERS: Dict[str, CrawlerConstructor] = {
|
||||||
"local": lambda n, s, c, t:
|
"local": lambda n, s, c, t, a:
|
||||||
LocalCrawler(n, LocalCrawlerSection(s), c, t),
|
LocalCrawler(n, LocalCrawlerSection(s), c, t),
|
||||||
}
|
}
|
||||||
|
@ -62,6 +62,7 @@ class Pferd:
|
|||||||
section,
|
section,
|
||||||
self._config,
|
self._config,
|
||||||
self._conductor,
|
self._conductor,
|
||||||
|
self._authenticators,
|
||||||
)
|
)
|
||||||
self._crawlers[name] = crawler
|
self._crawlers[name] = crawler
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user