diff --git a/.gitignore b/.gitignore index fb78f4f..9a2e4a0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ __pycache__/ *.py[cod] __pycache__ .mypy_cache +config diff --git a/agenda/__init__.py b/agenda/__init__.py index 2fd6817..9a2e183 100644 --- a/agenda/__init__.py +++ b/agenda/__init__.py @@ -52,16 +52,15 @@ now = datetime.now() today = now.date() now_str = now.strftime("%Y-%m-%d_%H:%M") now_utc = datetime.now(timezone.utc) -data_dir = "/home/edward/lib/data" -do_refresh = len(sys.argv) > 1 and sys.argv[1] == "--refresh" next_us_presidential_election = date(2024, 11, 5) next_uk_general_election = date(2024, 5, 2) config = configparser.ConfigParser() -config.read(os.path.join(os.path.dirname(__file__), "config")) +config.read(os.path.join(os.path.dirname(__file__), "..", "config")) access_key = config.get("exchangerate", "access_key") +data_dir = config.get("data", "dir") def get_next_timezone_transition(tz_name: str) -> datetime: @@ -105,7 +104,7 @@ def get_gbpusd() -> Decimal: recent = datetime.strptime(recent_filename, "%Y-%m-%d_%H:%M_GBPUSD.json") delta = now - recent - if not do_refresh and existing and delta < timedelta(hours=6): + if existing and delta < timedelta(hours=6): full = os.path.join(fx_dir, recent_filename) data = json.load(open(full), parse_float=Decimal) if "quotes" in data and "USDGBP" in data["quotes"]: