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

Fix noncritical and anoncritical decorators

Browse Source 
I must've forgot to update the anoncritical decorator when I last changed the
noncritical decorator. Also, every exception should make the crawler not
error_free, not just CrawlErrors.
This commit is contained in:
Joscha 2021-05-23 13:23:28 +02:00
parent 7e0bb06259
commit b44b49476d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PFERD/crawler.py
View File

@ -28,8 +28,11 @@ Wrapped = TypeVar("Wrapped", bound=Callable[..., None])
def noncritical(f: Wrapped) -> Wrapped: def noncritical(f: Wrapped) -> Wrapped:
""" """
Catches all exceptions occuring during the function call. If an exception Catches and logs a few noncritical exceptions occurring during the function
occurs, the crawler's error_free variable is set to False. call, mainly CrawlWarning.
If any exception occurs during the function call, the crawler's error_free
variable is set to False. This includes noncritical exceptions.
Warning: Must only be applied to member functions of the Crawler class! Warning: Must only be applied to member functions of the Crawler class!
""" """
@ -45,7 +48,7 @@ def noncritical(f: Wrapped) -> Wrapped:
except (CrawlWarning, OutputDirError, MarkDuplicateError, MarkConflictError) as e: except (CrawlWarning, OutputDirError, MarkDuplicateError, MarkConflictError) as e:
log.warn(str(e)) log.warn(str(e))
crawler.error_free = False crawler.error_free = False
except CrawlError: except: # noqa: E722 do not use bare 'except'
crawler.error_free = False crawler.error_free = False
raise raise
@ -59,8 +62,11 @@ def anoncritical(f: AWrapped) -> AWrapped:
""" """
An async version of @noncritical. An async version of @noncritical.
Catches all exceptions occuring during the function call. If an exception Catches and logs a few noncritical exceptions occurring during the function
occurs, the crawler's error_free variable is set to False. call, mainly CrawlWarning.
If any exception occurs during the function call, the crawler's error_free
variable is set to False. This includes noncritical exceptions.
Warning: Must only be applied to member functions of the Crawler class! Warning: Must only be applied to member functions of the Crawler class!
""" """
@ -73,11 +79,10 @@ def anoncritical(f: AWrapped) -> AWrapped:
try: try:
await f(*args, **kwargs) await f(*args, **kwargs)
except CrawlWarning as e: except (CrawlWarning, OutputDirError, MarkDuplicateError, MarkConflictError) as e:
log.print(f"[bold bright_red]Warning[/] {escape(str(e))}") log.warn(str(e))
crawler.error_free = False crawler.error_free = False
except CrawlError as e: except: # noqa: E722 do not use bare 'except'
log.print(f"[bold bright_red]Error[/] [red]{escape(str(e))}")
crawler.error_free = False crawler.error_free = False
raise raise