mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2023-12-21 10:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename and implement IliasDirectoryFilter

Browse Source
This commit is contained in:
I-Al-Istannen
2020-04-23 12:33:38 +02:00
parent ea005517cf
commit bef210ae77
4 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PFERD/pferd.py
View File

@ -2,8 +2,8 @@ from pathlib import Path
from typing import Optional
from .cookie_jar import CookieJar
from .ilias import (IliasAuthenticator, IliasCrawler, IliasDownloader,
IliasFilter, KitShibbolethAuthenticator)
from .ilias import (IliasAuthenticator, IliasCrawler, IliasDirectoryFilter,
IliasDownloader, KitShibbolethAuthenticator)
from .organizer import Organizer
from .tmp_dir import TmpDir
from .transform import Transform, apply_transform
@ -25,7 +25,7 @@ class Pferd(Location):
course_id: str,
authenticator: IliasAuthenticator,
cookies: Optional[Path],
filter_: IliasFilter,
dir_filter: IliasDirectoryFilter,
transform: Transform,
) -> None:
cookie_jar = CookieJar(cookies)
@ -33,7 +33,7 @@ class Pferd(Location):
tmp_dir = self._tmp_dir.new_subdir()
organizer = Organizer(self.resolve(target))
crawler = IliasCrawler(base_url, course_id, session, authenticator, filter_)
crawler = IliasCrawler(base_url, course_id, session, authenticator, dir_filter)
downloader = IliasDownloader(tmp_dir, organizer, session, authenticator)
cookie_jar.load_cookies()
@ -46,7 +46,7 @@ class Pferd(Location):
self,
target: Path,
course_id: str,
filter_: IliasFilter = lambda x: True,
dir_filter: IliasDirectoryFilter = lambda x: True,
transform: Transform = lambda x: x,
cookies: Optional[Path] = None,
username: Optional[str] = None,
@ -60,6 +60,6 @@ class Pferd(Location):
course_id=course_id,
authenticator=authenticator,
cookies=cookies,
filter_=filter_,
dir_filter=dir_filter,
transform=transform,
)