mirror of
https://github.com/Garmelon/PFERD.git
synced 2023-12-21 10:23:01 +01:00
Move FatalException to errors.py
This commit is contained in:
parent
19c1e3ac6f
commit
f6faacabb0
@ -5,7 +5,8 @@ from typing import Any, Callable, List, Optional
|
|||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from .logging import FatalException, PrettyLogger
|
from .errors import FatalException
|
||||||
|
from .logging import PrettyLogger
|
||||||
from .organizer import Organizer
|
from .organizer import Organizer
|
||||||
from .tmp_dir import TmpDir
|
from .tmp_dir import TmpDir
|
||||||
from .transform import Transformable
|
from .transform import Transformable
|
||||||
|
@ -7,12 +7,18 @@ from typing import Any, Callable
|
|||||||
|
|
||||||
from rich.console import Console
|
from rich.console import Console
|
||||||
|
|
||||||
from .logging import FatalException, PrettyLogger
|
from .logging import PrettyLogger
|
||||||
|
|
||||||
LOGGER = logging.getLogger(__name__)
|
LOGGER = logging.getLogger(__name__)
|
||||||
PRETTY = PrettyLogger(LOGGER)
|
PRETTY = PrettyLogger(LOGGER)
|
||||||
|
|
||||||
|
|
||||||
|
class FatalException(Exception):
|
||||||
|
"""
|
||||||
|
A fatal exception occurred. Recovery is not possible.
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
def swallow_and_print_errors(function: Callable) -> Callable:
|
def swallow_and_print_errors(function: Callable) -> Callable:
|
||||||
"""
|
"""
|
||||||
Decorates a function, swallows all errors, logs them and returns none if one occurred.
|
Decorates a function, swallows all errors, logs them and returns none if one occurred.
|
||||||
|
@ -14,7 +14,8 @@ from urllib.parse import (parse_qs, urlencode, urljoin, urlparse, urlsplit,
|
|||||||
import bs4
|
import bs4
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from ..logging import FatalException, PrettyLogger
|
from ..errors import FatalException
|
||||||
|
from ..logging import PrettyLogger
|
||||||
from ..utils import soupify
|
from ..utils import soupify
|
||||||
from .authenticators import IliasAuthenticator
|
from .authenticators import IliasAuthenticator
|
||||||
from .date_demangler import demangle_date
|
from .date_demangler import demangle_date
|
||||||
|
@ -32,12 +32,6 @@ def enable_logging(name: str = "PFERD", level: int = logging.INFO) -> None:
|
|||||||
logger.propagate = False
|
logger.propagate = False
|
||||||
|
|
||||||
|
|
||||||
class FatalException(Exception):
|
|
||||||
"""
|
|
||||||
A fatal exception occurred. Recovery is not possible.
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
class RichLoggingHandler(logging.Handler):
|
class RichLoggingHandler(logging.Handler):
|
||||||
"""
|
"""
|
||||||
A logging handler that uses rich for highlighting
|
A logging handler that uses rich for highlighting
|
||||||
|
@ -9,12 +9,12 @@ from typing import List, Optional, Union
|
|||||||
from .cookie_jar import CookieJar
|
from .cookie_jar import CookieJar
|
||||||
from .diva import (DivaDownloader, DivaDownloadStrategy, DivaPlaylistCrawler,
|
from .diva import (DivaDownloader, DivaDownloadStrategy, DivaPlaylistCrawler,
|
||||||
diva_download_new)
|
diva_download_new)
|
||||||
from .errors import swallow_and_print_errors
|
from .errors import FatalException, swallow_and_print_errors
|
||||||
from .ilias import (IliasAuthenticator, IliasCrawler, IliasDirectoryFilter,
|
from .ilias import (IliasAuthenticator, IliasCrawler, IliasDirectoryFilter,
|
||||||
IliasDownloader, IliasDownloadStrategy,
|
IliasDownloader, IliasDownloadStrategy,
|
||||||
KitShibbolethAuthenticator, download_modified_or_new)
|
KitShibbolethAuthenticator, download_modified_or_new)
|
||||||
from .location import Location
|
from .location import Location
|
||||||
from .logging import FatalException, PrettyLogger
|
from .logging import PrettyLogger
|
||||||
from .organizer import Organizer
|
from .organizer import Organizer
|
||||||
from .tmp_dir import TmpDir
|
from .tmp_dir import TmpDir
|
||||||
from .transform import TF, Transform, apply_transform
|
from .transform import TF, Transform, apply_transform
|
||||||
|
Loading…
Reference in New Issue
Block a user