X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=persistent.py;h=d62dd6754eeffc78c1c09adea7c82e778f8450b3;hb=822454f580c1ff9eb207b8da46cdfae24e30cde1;hp=83e6900cc18471ae44503a14f3184a2827420190;hpb=55a3172e37855f388b9ba0dfc91641a6c9ad1376;p=python_utils.git diff --git a/persistent.py b/persistent.py index 83e6900..d62dd67 100644 --- a/persistent.py +++ b/persistent.py @@ -7,7 +7,6 @@ import enum import functools import logging from typing import Any -import warnings import file_utils @@ -21,6 +20,7 @@ class Persistent(ABC): and implement their save() and load() methods. """ + @abstractmethod def save(self) -> bool: """ @@ -65,16 +65,12 @@ def was_file_written_today(filename: str) -> bool: mtime = file_utils.get_file_mtime_as_datetime(filename) now = datetime.datetime.now() - return ( - mtime.month == now.month and - mtime.day == now.day and - mtime.year == now.year - ) + return mtime.month == now.month and mtime.day == now.day and mtime.year == now.year def was_file_written_within_n_seconds( - filename: str, - limit_seconds: int, + filename: str, + limit_seconds: int, ) -> bool: """Returns True if filename was written within the pas limit_seconds seconds. @@ -94,9 +90,10 @@ class PersistAtShutdown(enum.Enum): to disk. See details below. """ - NEVER = 0, - IF_NOT_LOADED = 1, - ALWAYS = 2, + + NEVER = (0,) + IF_NOT_LOADED = (1,) + ALWAYS = (2,) class persistent_autoloaded_singleton(object): @@ -119,10 +116,12 @@ class persistent_autoloaded_singleton(object): implementation. """ + def __init__( - self, - *, - persist_at_shutdown: PersistAtShutdown = PersistAtShutdown.IF_NOT_LOADED): + self, + *, + persist_at_shutdown: PersistAtShutdown = PersistAtShutdown.IF_NOT_LOADED, + ): self.persist_at_shutdown = persist_at_shutdown self.instance = None @@ -146,23 +145,24 @@ class persistent_autoloaded_singleton(object): if not self.instance: msg = 'Loading from cache failed.' logger.warning(msg) - warnings.warn(msg, stacklevel=2) logger.debug(f'Attempting to instantiate {cls.__name__} directly.') self.instance = cls(*args, **kwargs) else: - logger.debug(f'Class {cls.__name__} was loaded from persisted state successfully.') + logger.debug( + f'Class {cls.__name__} was loaded from persisted state successfully.' + ) was_loaded = True assert self.instance is not None - if ( - self.persist_at_shutdown is PersistAtShutdown.ALWAYS or - ( - not was_loaded and - self.persist_at_shutdown is PersistAtShutdown.IF_NOT_LOADED - ) + if self.persist_at_shutdown is PersistAtShutdown.ALWAYS or ( + not was_loaded + and self.persist_at_shutdown is PersistAtShutdown.IF_NOT_LOADED ): - logger.debug('Scheduling a deferred called to save at process shutdown time.') + logger.debug( + 'Scheduling a deferred called to save at process shutdown time.' + ) atexit.register(self.instance.save) return self.instance + return _load