From 31c4c263fb9c0e0bfed484b36f4fd469c5c0b7e6 Mon Sep 17 00:00:00 2001 From: Chess Seventh Date: Sun, 10 May 2020 01:38:41 +0200 Subject: [PATCH 1/5] Add taskw library in requirements --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 1cd3f5c..e3284de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,7 @@ ics==0.4 idna==2.8 isort==4.3.21 khal==0.9.10 +kitchen==1.2.6 lazy-object-proxy==1.4.3 mccabe==0.6.1 Pygments==2.3.1 @@ -24,6 +25,7 @@ pyxdg==0.26 requests==2.21.0 six==1.14.0 tasklib==1.3.0 +taskw==1.2.0 typing==3.6.6 tzlocal==2.0.0 urllib3==1.24.2 From 0d9df355c3834d65532dc511d789cad18f10f61f Mon Sep 17 00:00:00 2001 From: Chess Seventh Date: Sun, 10 May 2020 02:17:03 +0200 Subject: [PATCH 2/5] WIP in loading the taskrc configuration --- main.py | 11 ++++++++++- tasks.py | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 39ad890..7cb095f 100644 --- a/main.py +++ b/main.py @@ -19,6 +19,7 @@ # from tasks import scheduled_tasks from tasks import overdue_tasks from tasks import not_date_tasks +from tasks import load_tw_config from logger import logger from helpers import sort_task_urgency @@ -36,6 +37,11 @@ def main(task_config, khal_config): # TODO: Khal logic # TODO: Set khal proper days logger.debug(khal_config) + config = load_tw_config() + + projects = list(config.get('uda.trsw.projects')) + print(projects) + return tasks = load_tasks(task_config) tasks.sort(key=sort_task_urgency, reverse=True) @@ -43,8 +49,11 @@ def main(task_config, khal_config): # tasks_sched = scheduled_tasks(tasks) # events_sched = create_events(tasks_sched) nodates_tasks = overdue_tasks(tasks) + not_date_tasks(tasks) + for task in nodates_tasks: + if "lab" in task['project']: + print(task) - create_events(nodates_tasks, khal_config) + # create_events(nodates_tasks, khal_config) # execute(khal_config, cal_sundays) # execute(khal_config, cal_mondays) diff --git a/tasks.py b/tasks.py index 4e4c6f4..019b9fb 100644 --- a/tasks.py +++ b/tasks.py @@ -9,6 +9,15 @@ import datetime from tasklib import TaskWarrior as TW from helpers import normalize_task_date +from taskw import TaskWarrior as TaskW + + +def load_tw_config(): + """ + Load TaskWarrior configuration to get the UDA. + """ + tw = TaskW() + return tw.load_config() def load_tasks(task_config): From a9ad92f7fb28e1694ec83f6583f4e7f81981ed46 Mon Sep 17 00:00:00 2001 From: Chess Seventh Date: Mon, 11 May 2020 00:32:42 +0200 Subject: [PATCH 3/5] WIP in loading the taskrc configuration --- main.py | 42 +++++++++++++++--------------------------- tasks.py | 1 - 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/main.py b/main.py index 7cb095f..98ed84b 100644 --- a/main.py +++ b/main.py @@ -5,28 +5,20 @@ Github: https://github.com/chess-seventh Description: TaskKhalReschedulWarrior. """ +from taskw import TaskWarrior as TaskW -import configparser - -from constants import CONFIG_FILE -# from constants import DAY - -# from events import next_days from events import create_events -# from events import add_time from tasks import load_tasks -# from tasks import scheduled_tasks from tasks import overdue_tasks from tasks import not_date_tasks -from tasks import load_tw_config + from logger import logger from helpers import sort_task_urgency -# from helpers import execute -def main(task_config, khal_config): +def main(): """TaskKhalReschedulWarrior. :task_config: TaskWarrior configuration. @@ -36,14 +28,20 @@ def main(task_config, khal_config): """ # TODO: Khal logic # TODO: Set khal proper days - logger.debug(khal_config) - config = load_tw_config() - projects = list(config.get('uda.trsw.projects')) - print(projects) + task_war = TaskW() + tw_config = task_war.load_config() + tw_config_location = tw_config['data']['location'] + tw_projects = tw_config['uda.trsw.projects'].split(',') + khal_location = tw_config['uda.calendar.location'] + khal_config = tw_config['uda.khal.config'] + + print(tw_projects) + print(khal_location) + print(khal_config) return - tasks = load_tasks(task_config) + tasks = load_tasks(tw_config_location) tasks.sort(key=sort_task_urgency, reverse=True) # tasks_sched = scheduled_tasks(tasks) @@ -61,14 +59,4 @@ def main(task_config, khal_config): if __name__ == "__main__": - CONFIG = configparser.ConfigParser() - CONFIG.read(CONFIG_FILE) - TASK_CONF = list() - TASK_CONF.append(CONFIG['TaskConfig']['TaskDir']) - TASK_CONF.append(CONFIG['TaskConfig']['TaskProjects'].split(',')) - - KHAL_CONF = list() - # KHAL_CONF.append(CONFIG['KhalConfig']['KhalDir']) - KHAL_CONF.append(CONFIG['KhalConfig']['KhalCalendar']) - - main(task_config=TASK_CONF, khal_config=KHAL_CONF) + main() diff --git a/tasks.py b/tasks.py index 019b9fb..7a0a342 100644 --- a/tasks.py +++ b/tasks.py @@ -9,7 +9,6 @@ import datetime from tasklib import TaskWarrior as TW from helpers import normalize_task_date -from taskw import TaskWarrior as TaskW def load_tw_config(): From 601452027e334e7a97c9cc81e16fc5c0e2d66e71 Mon Sep 17 00:00:00 2001 From: Chess Seventh Date: Sat, 13 Jun 2020 19:38:40 +0200 Subject: [PATCH 4/5] Ignore TaskRC directory for testing --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6d167a3..0d4bcd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +taskrcdir/ *.ics ### Python # Byte-compiled / optimized / DLL files From 48d5da000181e3819b12f2b8d8b976913295a652 Mon Sep 17 00:00:00 2001 From: Chess Seventh Date: Sat, 13 Jun 2020 19:38:55 +0200 Subject: [PATCH 5/5] Set default task config to testing directory --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 98ed84b..a64e5c4 100644 --- a/main.py +++ b/main.py @@ -29,7 +29,7 @@ def main(): # TODO: Khal logic # TODO: Set khal proper days - task_war = TaskW() + task_war = TaskW(config_filename="./taskrcdir") tw_config = task_war.load_config() tw_config_location = tw_config['data']['location'] tw_projects = tw_config['uda.trsw.projects'].split(',')