Tidy up file storage location

custom_components/o365/__init__.py

@@ -47,6 +47,7 @@
     build_minimum_permissions,
     build_requested_permissions,
     build_token_filename,
+    check_file_location,
     validate_permissions,
 )
 
@@ -79,6 +80,7 @@ async def _async_setup_account(hass, account_conf, conf_type):
 
     token_path = build_config_file_path(hass, DEFAULT_CACHE_PATH)
     token_file = build_token_filename(account_conf, conf_type)
+    check_file_location(hass, DEFAULT_CACHE_PATH, token_path)
     token_backend = await hass.async_add_executor_job(
         ft.partial(
             FileSystemTokenBackend, token_path=token_path, token_filename=token_file

custom_components/o365/calendar.py

@@ -51,6 +51,7 @@
     build_config_file_path,
     build_token_filename,
     build_yaml_filename,
+    check_file_location,
     clean_html,
     format_event_data,
     get_permissions,
@@ -84,7 +85,9 @@ async def async_setup_platform(
 
 def _setup_add_entities(hass, account, add_entities, conf):
     yaml_filename = build_yaml_filename(conf)
-    calendars = load_calendars(build_config_file_path(hass, yaml_filename))
+    yaml_filepath = build_config_file_path(hass, yaml_filename)
+    check_file_location(hass, yaml_filename, yaml_filepath)
+    calendars = load_calendars(yaml_filepath)
     cal_ids = {}
 
     for cal_id, calendar in calendars.items():

custom_components/o365/const.py

@@ -109,6 +109,7 @@ class EventResponse(Enum):
 DOMAIN = "o365"
 ICON = "mdi:office"
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
+O365_STORAGE = "o365_storage"
 DEFAULT_OFFSET = "!!"
 PERM_CALENDARS_READ = "Calendars.Read"
 PERM_CALENDARS_READ_SHARED = "Calendars.Read.Shared"

custom_components/o365/utils.py

@@ -2,6 +2,7 @@
 import json
 import logging
 import os
+import shutil
 import zipfile
 from datetime import datetime
 from pathlib import Path
@@ -33,6 +34,7 @@
     DATETIME_FORMAT,
     DEFAULT_CACHE_PATH,
     DOMAIN,
+    O365_STORAGE,
     PERM_CALENDARS_READ,
     PERM_CALENDARS_READWRITE,
     PERM_CHAT_READ,
@@ -331,11 +333,11 @@ def update_calendar_file(path, calendar, hass, track_new_devices):
         out.close()
 
 
-def build_config_file_path(hass, filename):
-    """Create filename in config path."""
+def build_config_file_path(hass, filepath):
+    """Create config path."""
     root = hass.config.config_dir
 
-    return os.path.join(root, filename)
+    return os.path.join(root, O365_STORAGE, filepath)
 
 
 def build_token_filename(conf, conf_type):
@@ -357,3 +359,14 @@ def build_yaml_filename(conf, conf_type=None):
             else ""
         )
     return YAML_CALENDARS.format(DOMAIN, config_file)
+
+
+def check_file_location(hass, filepath, newpath):
+    """Check if file has been moved. If not move it. This function to be removed 2023/05/30."""
+    root = hass.config.config_dir
+    oldpath = os.path.join(
+        root,
+        filepath,
+    )
+    if os.path.exists(oldpath):
+        shutil.move(oldpath, newpath)