From 5b2546a67e9c90344255e36867765653c59dc639 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 18 Jan 2023 16:42:43 -0500 Subject: [PATCH] update task to current-running version --- dot_config/task/hooks/on-add.due-eod | 1 + dot_config/task/hooks/on-modify.due-eod | 1 + dot_config/task/hooks/on-modify.jrnl | 70 ++++++++++++++ dot_config/task/hooks/on-modify.timewarrior | 102 ++++++++++++++++++++ dot_config/task/intheam | 8 +- dot_config/task/taskrc | 24 ++--- dot_config/task/wingtask | 9 +- 7 files changed, 194 insertions(+), 21 deletions(-) create mode 120000 dot_config/task/hooks/on-add.due-eod create mode 120000 dot_config/task/hooks/on-modify.due-eod create mode 100755 dot_config/task/hooks/on-modify.jrnl create mode 100755 dot_config/task/hooks/on-modify.timewarrior diff --git a/dot_config/task/hooks/on-add.due-eod b/dot_config/task/hooks/on-add.due-eod new file mode 120000 index 0000000..68e032f --- /dev/null +++ b/dot_config/task/hooks/on-add.due-eod @@ -0,0 +1 @@ +/home/kellya/projects/public/taskwarrior_hooks/due-eod.py \ No newline at end of file diff --git a/dot_config/task/hooks/on-modify.due-eod b/dot_config/task/hooks/on-modify.due-eod new file mode 120000 index 0000000..68e032f --- /dev/null +++ b/dot_config/task/hooks/on-modify.due-eod @@ -0,0 +1 @@ +/home/kellya/projects/public/taskwarrior_hooks/due-eod.py \ No newline at end of file diff --git a/dot_config/task/hooks/on-modify.jrnl b/dot_config/task/hooks/on-modify.jrnl new file mode 100755 index 0000000..71b1929 --- /dev/null +++ b/dot_config/task/hooks/on-modify.jrnl @@ -0,0 +1,70 @@ +#!/usr/bin/env python +############################################################################### +# +# Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# http://www.opensource.org/licenses/mit-license.php +# +############################################################################### + +import sys +import json +import os + +# Hook should extract all of the following for use as Timewarrior tags: +# UUID +# Project +# Tags +# Description +# UDAs + +# Make no changes to the task, simply observe. +old = json.loads(sys.stdin.readline()) +new = json.loads(sys.stdin.readline()) +print(json.dumps(new)) + +# Extract attributes for use as tags. +tags = [new['description']] + +if 'project' in new: + project = new['project'] + tags.append(project) + if '.' in project: + tags.extend([tag for tag in project.split('.')]) + +if 'tags' in new: + tags.extend(new['tags']) + +combined = ' +'.join(['"%s"' % tag for tag in tags]).encode('utf-8').strip() +# Started task. +if 'start' in new and not 'start' in old: + os.system('echo Started: ' + combined.decode() + ' @task|jj') + +elif new['status'] == 'completed': + os.system('echo Completed: ' + combined.decode() + ' @task|jj') +# Stopped task. +elif not 'start' in new and 'start' in old: + os.system('echo Stopped: ' + combined.decode() + ' @task|jj') + +# Any task that is active, with a non-pending status should not be tracked. +elif 'start' in new and new['status'] != 'pending': + os.system('echo ' + combined.decode() + ' @task|jj') + diff --git a/dot_config/task/hooks/on-modify.timewarrior b/dot_config/task/hooks/on-modify.timewarrior new file mode 100755 index 0000000..46d82a9 --- /dev/null +++ b/dot_config/task/hooks/on-modify.timewarrior @@ -0,0 +1,102 @@ +#!/usr/bin/env python3 + +############################################################################### +# +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# https://www.opensource.org/licenses/mit-license.php +# +############################################################################### + +from __future__ import print_function + +import json +import subprocess +import sys + +# Hook should extract all of the following for use as Timewarrior tags: +# UUID +# Project +# Tags +# Description +# UDAs + +try: + input_stream = sys.stdin.buffer +except AttributeError: + input_stream = sys.stdin + +# Make no changes to the task, simply observe. +old = json.loads(input_stream.readline().decode("utf-8", errors="replace")) +new = json.loads(input_stream.readline().decode("utf-8", errors="replace")) +print(json.dumps(new)) + + +def extract_tags_from(json_obj): + # Extract attributes for use as tags. + tags = [json_obj['description']] + + if 'project' in json_obj: + tags.append(json_obj['project']) + + if 'tags' in json_obj: + tags.extend(json_obj['tags']) + + return tags + + +def extract_annotation_from(json_obj): + + if 'annotations' not in json_obj: + return '\'\'' + + return json_obj['annotations'][0]['description'] + + +start_or_stop = '' + +# Started task. +if 'start' in new and 'start' not in old: + start_or_stop = 'start' + +# Stopped task. +elif ('start' not in new or 'end' in new) and 'start' in old: + start_or_stop = 'stop' + +if start_or_stop: + tags = extract_tags_from(new) + + subprocess.call(['timew', start_or_stop] + tags + [':yes']) + +# Modifications to task other than start/stop +elif 'start' in new and 'start' in old: + old_tags = extract_tags_from(old) + new_tags = extract_tags_from(new) + + if old_tags != new_tags: + subprocess.call(['timew', 'untag', '@1'] + old_tags + [':yes']) + subprocess.call(['timew', 'tag', '@1'] + new_tags + [':yes']) + + old_annotation = extract_annotation_from(old) + new_annotation = extract_annotation_from(new) + + if old_annotation != new_annotation: + subprocess.call(['timew', 'annotate', '@1', new_annotation]) diff --git a/dot_config/task/intheam b/dot_config/task/intheam index 6c5d747..7be1071 100644 --- a/dot_config/task/intheam +++ b/dot_config/task/intheam @@ -1,6 +1,6 @@ -taskd.certificate=/home/kellya/.local/share/task/private.certificate.pem -taskd.key=/home/kellya/.local/share/task/private.key.pem -taskd.ca=/home/kellya/.local/share/task/ca.cert.pem +taskd.certificate=/home/kellya/.config/task/intheam_certs/private.certificate.pem +taskd.key=/home/kellya/.config/task/intheam_certs/private.key.pem +taskd.ca=/home/kellya/.config/task/intheam_certs/ca.cert.pem taskd.server=inthe.am:53589 -taskd.credentials=inthe_am/kellya/610917c8-9119-4b59-b87e-d886c2e08bf0 +taskd.credentials=inthe_am/kellya/fb02db8d-025f-41be-baf8-1a199a6ef132 taskd.trust=strict diff --git a/dot_config/task/taskrc b/dot_config/task/taskrc index b2a7fcf..04ca59f 100644 --- a/dot_config/task/taskrc +++ b/dot_config/task/taskrc @@ -39,8 +39,6 @@ hooks.location=~/.config/task/hooks/ #include /usr/share/task/no-color.theme include ~/.config/task/gtd -#include ~/.config/task/wingtask -include ~/.config/task/intheam include ~/projects/arachnitech/tw-spaceduck/spaceduck.theme # General config @@ -50,7 +48,6 @@ recurrence.indicator=♺ nag= dateformat=Y-M-DTH:N verbose=no -context=work news.version=2.6.0 #Reports @@ -83,17 +80,20 @@ uda.status_report.label=status_report uda.status_report.values=display,hide uda.status_report.default=display +uda.delegated.type=string +uda.delegated.label=Delegated to +report.ready.filter=+READY delegated: +report.delegated.description=Tasks delegated to others +report.delegated.columns=id,project,description,delegated +report.delegated.sort=delegated+,project+,description+ +report.delegated.filter=delegated.not: +PENDING + #Context filters context.work.read=+work -home or -TAGGED context.work.write=+work - -context.home.read=+home -work or -TAGGED +context.home.read=-work +home or -TAGGED context.home.write=+home -# Taskd -taskd.certificate=/home/kellya/.local/share/task/private.certificate.pem -taskd.key=/home/kellya/.local/share/task/private.key.pem -taskd.ca=/home/kellya/.local/share/task/ca.cert.pem -taskd.server=inthe.am:53589 -taskd.credentials=inthe_am/kellya/610917c8-9119-4b59-b87e-d886c2e08bf0 -taskd.trust=strict +include ~/.config/task/intheam +#include ~/.config/task/wingtask +context=work diff --git a/dot_config/task/wingtask b/dot_config/task/wingtask index 9cc58ab..dfad743 100644 --- a/dot_config/task/wingtask +++ b/dot_config/task/wingtask @@ -1,6 +1,5 @@ -#WingTask sync server taskd.server=app.wingtask.com:53589 -taskd.key=~/.wingtask_certs/kellya@arachnitech.com.key.pem -taskd.ca=~/.wingtask_certs/letsencrypt_root_cert.pem -taskd.certificate=~/.wingtask_certs/kellya@arachnitech.com.cert.pem -taskd.credentials=WingTask/kellya@arachnitech.com/df7a90d6-94b3-4406-9f34-066c9149db2b +taskd.key=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.key.pem +taskd.ca=/home/kellya/.config/task/wingtask_certs/letsencrypt_root_cert.pem +taskd.certificate=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.cert.pem +taskd.credentials=WingTask/alex.kelly@arachnitech.com/8095c0b9-7fed-4f4e-9054-076b2d4ed307