From 2d1c295c54225319bf43778d5b4d2e96bfdbd85c Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 18 Jan 2023 16:42:43 -0500 Subject: [PATCH 1/3] 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..2784e7f 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/***REMOVED*** 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..3ffaff1 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/***REMOVED*** From 7eab55b90fd3b2d0f336e17bb366afa7d8a9345f Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 18 Jan 2023 16:53:39 -0500 Subject: [PATCH 2/3] update to current version that is running (even though not using bash) --- dot_bashrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dot_bashrc b/dot_bashrc index ad4581e..bd7221a 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -25,3 +25,7 @@ if [ -d ~/.bashrc.d ]; then fi unset rc + +# Hishtory Config: +export PATH="$PATH:/home/kellya/.hishtory" +source /home/kellya/.hishtory/config.sh From 4810faaed1d30933fa621a8a947983ebf53633d9 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 18 Jan 2023 16:54:06 -0500 Subject: [PATCH 3/3] templatize the taskrc configs --- .../task/hooks/disabled/DISABLED-on-add.jrnl | 12 --- .../task/hooks/executable_on-modify.jrnl | 70 ------------ .../hooks/executable_on-modify.timewarrior | 102 ------------------ 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 => intheam.tmpl} | 2 +- dot_config/task/{wingtask => wingtask.tmpl} | 2 +- 9 files changed, 2 insertions(+), 360 deletions(-) delete mode 100755 dot_config/task/hooks/disabled/DISABLED-on-add.jrnl delete mode 100755 dot_config/task/hooks/executable_on-modify.jrnl delete mode 100755 dot_config/task/hooks/executable_on-modify.timewarrior delete mode 120000 dot_config/task/hooks/on-add.due-eod delete mode 120000 dot_config/task/hooks/on-modify.due-eod delete mode 100755 dot_config/task/hooks/on-modify.jrnl delete mode 100755 dot_config/task/hooks/on-modify.timewarrior rename dot_config/task/{intheam => intheam.tmpl} (74%) rename dot_config/task/{wingtask => wingtask.tmpl} (73%) diff --git a/dot_config/task/hooks/disabled/DISABLED-on-add.jrnl b/dot_config/task/hooks/disabled/DISABLED-on-add.jrnl deleted file mode 100755 index 2346f86..0000000 --- a/dot_config/task/hooks/disabled/DISABLED-on-add.jrnl +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python3 -import sys -import json -import subprocess - -for line in sys.stdin: - if '{' in line: - entry = json.loads(line.strip()) - print(line) - -message = f"Added: \"{entry['description']}\" to: {entry['project']}" -subprocess.call(['jrnl', message]) diff --git a/dot_config/task/hooks/executable_on-modify.jrnl b/dot_config/task/hooks/executable_on-modify.jrnl deleted file mode 100755 index 71b1929..0000000 --- a/dot_config/task/hooks/executable_on-modify.jrnl +++ /dev/null @@ -1,70 +0,0 @@ -#!/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/executable_on-modify.timewarrior b/dot_config/task/hooks/executable_on-modify.timewarrior deleted file mode 100755 index 46d82a9..0000000 --- a/dot_config/task/hooks/executable_on-modify.timewarrior +++ /dev/null @@ -1,102 +0,0 @@ -#!/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/hooks/on-add.due-eod b/dot_config/task/hooks/on-add.due-eod deleted file mode 120000 index 68e032f..0000000 --- a/dot_config/task/hooks/on-add.due-eod +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 68e032f..0000000 --- a/dot_config/task/hooks/on-modify.due-eod +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 100755 index 71b1929..0000000 --- a/dot_config/task/hooks/on-modify.jrnl +++ /dev/null @@ -1,70 +0,0 @@ -#!/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 deleted file mode 100755 index 46d82a9..0000000 --- a/dot_config/task/hooks/on-modify.timewarrior +++ /dev/null @@ -1,102 +0,0 @@ -#!/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.tmpl similarity index 74% rename from dot_config/task/intheam rename to dot_config/task/intheam.tmpl index 2784e7f..e7a07a3 100644 --- a/dot_config/task/intheam +++ b/dot_config/task/intheam.tmpl @@ -2,5 +2,5 @@ taskd.certificate=/home/kellya/.config/task/intheam_certs/private.certificate.pe 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/***REMOVED*** +taskd.credentials=inthe_am/kellya/{{ (index (lastpass "intheam_token") 0).password }} taskd.trust=strict diff --git a/dot_config/task/wingtask b/dot_config/task/wingtask.tmpl similarity index 73% rename from dot_config/task/wingtask rename to dot_config/task/wingtask.tmpl index 3ffaff1..31e24fd 100644 --- a/dot_config/task/wingtask +++ b/dot_config/task/wingtask.tmpl @@ -2,4 +2,4 @@ taskd.server=app.wingtask.com:53589 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/***REMOVED*** +teaskd.credentials=WingTask/alex.kelly@arachnitech.com/{{ (index (lastpass "wingtask_token") 0).password }}