Merge branch 'api-conf'

hamstertools/__init__.py

@@ -1,16 +1,21 @@
 #!/usr/bin/env python3.7
+import os
 import csv
 import logging
 from datetime import datetime
 from itertools import chain
 from pathlib import Path
 import sys
+import tomllib
 
 import click
 import requests
 from peewee import fn, JOIN
 from textual.logging import TextualHandler
 
+from xdg.BaseDirectory import xdg_config_home
+
+
 from .db import (
     KimaiTag,
     db,
@@ -22,19 +27,31 @@ from .db import (
     KimaiActivity,
     HamsterActivityKimaiMapping,
     HamsterFactKimaiImport,
+    HamsterFactTag,
 )
 from .kimaiapi import KimaiAPI, Timesheet
 from .sync import sync
 
+CONFIG_FILE = Path(xdg_config_home) / "hamstertools.toml"
+
 HAMSTER_DIR = Path.home() / ".local/share/hamster"
 HAMSTER_FILE = HAMSTER_DIR / "hamster.db"
 
 db.init(HAMSTER_FILE)
 
 
-@click.group()
+@click.group(context_settings={"auto_envvar_prefix": "HAMSTERTOOL"})
 @click.option("-d", "--debug", is_flag=True)
-def cli(debug):
+@click.option("--config", default=CONFIG_FILE, type=click.Path())
+@click.option("--kimai-api-url", envvar="KIMAI_API_URL")
+@click.option("--kimai-username", envvar="KIMAI_USERNAME")
+@click.option("--kimai-api-key", envvar="KIMAI_API_KEY")
+@click.pass_context
+def cli(ctx, config, debug, kimai_api_url=None, kimai_username=None, kimai_api_key=None):
+    file_config = {}
+    if os.path.exists(config):
+        with open(config, "rb") as f:
+            file_config = tomllib.load(f)
     if debug:
         logging.basicConfig()
         logging.getLogger().setLevel(logging.DEBUG)
@@ -47,6 +64,12 @@ def cli(debug):
         requests_log.setLevel(logging.DEBUG)
         requests_log.propagate = True
 
+    ctx.obj = KimaiAPI(
+        kimai_username if kimai_username is not None else file_config.get("kimai_username"), 
+        kimai_api_key if kimai_api_key is not None else file_config.get("kimai_api_key"), 
+        kimai_api_url if kimai_api_url is not None else file_config.get("kimai_api_url"), 
+    )
+
 
 @cli.group()
 def categories():
@@ -355,7 +378,6 @@ def _get_kimai_mapping_file(path, category_search=None):
     multiple=True,
 )
 @click.argument("username")
-@click.argument("api_key", envvar="KIMAI_API_KEY")
 @click.option("--just-errors", "just_errors", is_flag=True, help="Only display errors")
 @click.option("--ignore-activities", is_flag=True, help="Ignore missing activities")
 def check(username, api_key, just_errors, ignore_activities, mapping_path=None):
@@ -644,7 +666,7 @@ def _csv(
 @click.argument("after")
 @click.argument("before")
 def _import(search, after, before):
-    api = KimaiAPI()
+    api = KimaiAPI(username=KIMAI_USERNAME, api_key=KIMAI_API_KEY)
 
     SEARCH = "auto"
 
@@ -652,6 +674,8 @@ def _import(search, after, before):
         HamsterFact.select(HamsterFact, HamsterActivity, HamsterCategory)
         .join(HamsterActivity, JOIN.LEFT_OUTER)
         .join(HamsterCategory, JOIN.LEFT_OUTER)
+        .switch(HamsterFact)
+        .join(HamsterFactTag, JOIN.LEFT_OUTER)
         .where(
             (HamsterFact.start_time > datetime.strptime(after, "%Y-%m-%d"))
             & (HamsterFact.start_time < datetime.strptime(before, "%Y-%m-%d"))
@@ -729,9 +753,6 @@ def _import(search, after, before):
         if r.get("code", 200) != 200:
             print(r)
             print(f"{f.id} ({f.activity.category.name} » {f.activity.name})")
-            from pdb import set_trace
-
-            set_trace()
 
         else:
             HamsterFactKimaiImport.create(hamster_fact=f, kimai_id=r["id"]).save()
@@ -763,8 +784,11 @@ def reset():
 
 
 @db_.command("sync")
-def kimai_db_sync():
-    sync()
+@click.pass_obj
+def kimai_db_sync(api):
+    sync(
+        api
+    )
 
 
 @db_.command()
@@ -805,10 +829,13 @@ def mapping2db(mapping_path=None, global_=False):
 
 
 @cli.command()
-def app():
+@click.pass_obj
+def app(kimai_api):
     from .app import HamsterToolsApp
 
-    app = HamsterToolsApp()
+    app = HamsterToolsApp(
+        kimai_api
+    )
     app.run()