From fc937563e1f592d839f30afa5025794ef6bea013 Mon Sep 17 00:00:00 2001
From: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Date: Sat, 8 Oct 2022 21:14:02 +0100
Subject: [PATCH] fix/update logs dir (#2)

* fix/update logs dir

new XDG default location + old location monitoring

* dont overthink it
---
 ovos_cli_client/__main__.py | 19 +++++++++++++++++--
 setup.py                    |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ovos_cli_client/__main__.py b/ovos_cli_client/__main__.py
index 618abb0..b8863f5 100644
--- a/ovos_cli_client/__main__.py
+++ b/ovos_cli_client/__main__.py
@@ -17,14 +17,17 @@
 import os.path
 import signal
 import sys
+from os.path import exists
 from ovos_config import Configuration
 from ovos_utils.signal import get_ipc_directory
-
+from ovos_utils.log import LOG
 from ovos_cli_client.text_client import (
     load_settings, save_settings, simple_cli, gui_main,
     start_log_monitor, start_mic_monitor, connect_to_mycroft,
     ctrl_c_handler
 )
+from ovos_config.meta import get_xdg_base
+from ovos_utils.xdg_utils import xdg_state_home
 
 sys.stdout = io.StringIO()
 sys.stderr = io.StringIO()
@@ -44,8 +47,10 @@ def main():
     # Monitor system logs
     config = Configuration()
 
+    legacy_path = "/var/log/mycroft"
+
     if 'log_dir' not in config:
-        config["log_dir"] = "/var/log/mycroft"
+        config["log_dir"] = f"{xdg_state_home()}/{get_xdg_base()}/logs"
 
     log_dir = os.path.expanduser(config['log_dir'])
     for f in os.listdir(log_dir):
@@ -53,6 +58,16 @@ def main():
             continue
         start_log_monitor(os.path.join(log_dir, f))
 
+    # also monitor legacy path for compat
+    if log_dir != legacy_path and exists(legacy_path):
+        LOG.warning(
+            f"this installation seems to also contain logs in the legacy directory {legacy_path}, "
+            f"please start using {log_dir}")
+        for f in os.listdir(legacy_path):
+            if not f.endswith(".log"):
+                continue
+            start_log_monitor(os.path.join(legacy_path, f))
+
     # Monitor IPC file containing microphone level info
     start_mic_monitor(os.path.join(get_ipc_directory(), "mic_level"))
 
diff --git a/setup.py b/setup.py
index 0f842dc..c0c015b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def package_files(directory):
     version="0.0.1",
     packages=['ovos_cli_client'],
     url='https://github.com/OpenVoiceOS/ovos_cli_client',
-    install_requires=["ovos_utils"],
+    install_requires=["ovos_utils>=0.0.25a8"],
     package_data={'': package_files('ovos_cli_client')},
     include_package_data=True,
     license='Apache',