earnestma
/
autodoist
forked from mirrors/autodoist
1
0
Fork 0
Code Issues Pull Requests Releases Activity

- Bugfix: serial tag on task level and project level not working properly 

- Bugfix: Recurring task child_list has to include all children, even if checked. Not relevant for labels. Hence two lists are now created for both purposes.
master
Hoffelhas 2020-05-21 10:00:06 +02:00
parent 1926c2e6a3
commit cbe5cba074
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
autodoist.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
# Autodoist v1.0.3
import logging import logging
import argparse import argparse
@ -12,7 +13,7 @@ from datetime import datetime
def main(): def main():
"""Main process function.""" """Main process function."""
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-a', '--api_key', help='Todoist API Key', default="a") parser.add_argument('-a', '--api_key', help='Todoist API Key')
parser.add_argument('-l', '--label', help='The next action label to use', default='next_action') parser.add_argument('-l', '--label', help='The next action label to use', default='next_action')
parser.add_argument('-d', '--delay', help='Specify the delay in seconds between syncs', default=10, type=int) parser.add_argument('-d', '--delay', help='Specify the delay in seconds between syncs', default=10, type=int)
parser.add_argument('-r', '--recurring', help='Enable re-use of recurring lists', action='store_true') parser.add_argument('-r', '--recurring', help='Enable re-use of recurring lists', action='store_true')
@ -27,6 +28,9 @@ def main():
parser.add_argument('--nocache', help='Disables caching data to disk for quicker syncing', action='store_true') parser.add_argument('--nocache', help='Disables caching data to disk for quicker syncing', action='store_true')
args = parser.parse_args() args = parser.parse_args()
args.api_key = 'b8671dd3f1408956f9d727d9bd94812c835bbfa8'
args.recurring = True
def initialise(args): def initialise(args):
# Set debug # Set debug
if args.debug: if args.debug:
@ -64,7 +68,7 @@ def main():
else: else:
logging.error("Label \'%s\' doesn't exist, please create it or change TODOIST_NEXT_ACTION_LABEL.", args.label) logging.error("Label \'%s\' doesn't exist, please create it or change TODOIST_NEXT_ACTION_LABEL.", args.label)
sys.exit(1) sys.exit(1)
return api, label_id return api, label_id
def get_type(object,key): def get_type(object,key):
@ -165,17 +169,21 @@ def main():
if project_type_changed == 1: if project_type_changed == 1:
[remove_label(item, label_id) for item in items] [remove_label(item, label_id) for item in items]
# To determine if a task was found on sequential level
first_found_project = False
first_found_item = True
for item in items: for item in items:
# To determine if a task was found # Determine which child_items exist, both all and the ones that have not been checked yet
first_found = False
# Determine which child_items exist that have not been checked yet
non_checked_items = list(filter(lambda x: x['checked'] == 0, items)) non_checked_items = list(filter(lambda x: x['checked'] == 0, items))
child_items_all = list(filter(lambda x: x['parent_id'] == item['id'], items))
child_items = list(filter(lambda x: x['parent_id'] == item['id'], non_checked_items)) child_items = list(filter(lambda x: x['parent_id'] == item['id'], non_checked_items))
# Logic for recurring lists
if not args.recurring: if not args.recurring:
try: try:
# If old label is present, reset it
if item['r_tag'] == 1: if item['r_tag'] == 1:
item['r_tag'] = 0 item['r_tag'] = 0
except Exception as e: except Exception as e:
@ -185,14 +193,16 @@ def main():
try: try:
if item['due']['is_recurring']: if item['due']['is_recurring']:
try: try:
# Check if the T0 task date has changed
if item['due']['date'] != item['old_date']: if item['due']['date'] != item['old_date']:
# Save the new date # Save the new date
item['due']['date'] = item['old_date'] item['due']['date'] = item['old_date']
# Mark children for action # Mark children for action
for child_item in child_items: for child_item in child_items_all:
child_item['r_tag'] = 1 child_item['r_tag'] = 1
except Exception as e: except Exception as e:
# If date has never been saved before, create a new entry
logging.debug('New recurring task detected: %s' % str(e)) logging.debug('New recurring task detected: %s' % str(e))
item['old_date'] = item['due']['date'] item['old_date'] = item['due']['date']
api.items.update(item['id']) api.items.update(item['id'])
@ -208,7 +218,7 @@ def main():
item['r_tag'] = 0 item['r_tag'] = 0
api.items.update(item['id']) api.items.update(item['id'])
for child_item in child_items: for child_item in child_items_all:
child_item['r_tag'] = 1 child_item['r_tag'] = 1
except Exception as e: except Exception as e:
logging.debug('Child not recurring: %s' % str(e)) logging.debug('Child not recurring: %s' % str(e))
@ -231,18 +241,23 @@ def main():
# We can immediately continue # We can immediately continue
continue continue
else: else:
# Define item_type if not present # Define the item_type
if item_type is None: if item_type is None:
item_type = project_type item_type = project_type
else:
# Add labels to top items if they have no childern # Reset in case that task is tagged as sequential
# if len(child_items) == 0: first_found_item = False
# If it is a parentless task
if len(child_items) == 0: if len(child_items) == 0:
if item['parent_id'] == 0: if item['parent_id'] == 0:
if project_type == 'sequential': if project_type == 'sequential':
if not first_found: if not first_found_project:
add_label(item, label_id) add_label(item, label_id)
first_found = True first_found_project = True
elif not first_found_item:
add_label(item, label_id)
first_found_item = True
else: else:
remove_label(item, label_id) remove_label(item, label_id)
elif project_type == 'parallel': elif project_type == 'parallel':
@ -260,11 +275,16 @@ def main():
if item_type_changed == 1: if item_type_changed == 1:
[remove_label(child_item, label_id) for child_item in child_items] [remove_label(child_item, label_id) for child_item in child_items]
# Process sequential tagged items # Process sequential tagged items (item_type can overrule project_type)
if item_type == 'sequential': if item_type == 'sequential':
for child_item in child_items: for child_item in child_items:
if child_item['checked'] == 0 and not child_first_found and not first_found: if child_item['checked'] == 0 and not child_first_found and not first_found_project:
first_found = True first_found_project = True
child_first_found = True
add_label(child_item, label_id)
child_item['parent_type'] = item_type
elif child_item['checked'] == 0 and not child_first_found and not first_found_item:
first_found_item = True
child_first_found = True child_first_found = True
add_label(child_item, label_id) add_label(child_item, label_id)
child_item['parent_type'] = item_type child_item['parent_type'] = item_type
@ -277,8 +297,8 @@ def main():
child_first_found = True child_first_found = True
add_label(child_item, label_id) add_label(child_item, label_id)
child_item['parent_type'] = item_type child_item['parent_type'] = item_type
# Remove the label from the parent # Remove the label from the parent (needed for if recurring list is reset)
if item_type and child_first_found: if item_type and child_first_found:
remove_label(item, label_id) remove_label(item, label_id)
@ -289,7 +309,6 @@ def main():
if future_diff >= (args.hide_future * 86400): if future_diff >= (args.hide_future * 86400):
remove_label(item, label_id) remove_label(item, label_id)
continue continue
if len(api.queue): if len(api.queue):
logging.debug('%d changes queued for sync... commiting to Todoist.', len(api.queue)) logging.debug('%d changes queued for sync... commiting to Todoist.', len(api.queue))
api.commit() api.commit()