mirrors
/
autodoist
mirror of https://github.com/Hoffelhas/autodoist
1
0
Fork 1
Code Issues Releases Activity

Complete overhaul of label-logic. 

1) Labels are again used as primary markers for cascading the information.
2) API queue only gets filled with items that require an update. This drastically lowers the size of the queue.
3) Removal of legacy code.
pull/15/head
Hoffelhas 2020-05-24 15:55:47 +02:00
parent 9e9567efaf
commit 0c47cfa81c
1 changed files with 181 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
autodoist.py
View File

@ -1,6 +1,9 @@
#!/usr/bin/python3 #!/usr/bin/python3
# Autodoist v1.0.3 # Autodoist v1.0.3
global overview_item_ids
global overview_item_labels
import logging import logging
import argparse import argparse
import requests import requests
@ -10,7 +13,6 @@ from datetime import datetime
from todoist.api import TodoistAPI from todoist.api import TodoistAPI
def main(): def main():
# Version # Version
@ -153,6 +155,7 @@ def main():
try: try:
item_type = item['parent_type'] item_type = item['parent_type']
item_type_changed = 1 item_type_changed = 1
item['item_type'] = item_type
except: except:
item_type, item_type_changed = get_type(item, 'item_type') item_type, item_type_changed = get_type(item, 'item_type')
else: else:
@ -165,14 +168,30 @@ def main():
labels = item['labels'] labels = item['labels']
logging.debug('Updating \'%s\' with label', item['content']) logging.debug('Updating \'%s\' with label', item['content'])
labels.append(label) labels.append(label)
api.items.update(item['id'], labels=labels)
try:
overview_item_ids[str(item['id'])] += 1
except:
overview_item_ids[str(item['id'])] = 1
overview_item_labels[str(item['id'])] = labels
def remove_label(item, label): def remove_label(item, label):
if label in item['labels']: if label in item['labels']:
labels = item['labels'] labels = item['labels']
logging.debug('Removing \'%s\' of its label', item['content']) logging.debug('Removing \'%s\' of its label', item['content'])
labels.remove(label) labels.remove(label)
api.items.update(item['id'], labels=labels)
try:
overview_item_ids[str(item['id'])] -= 1
except:
overview_item_ids[str(item['id'])] = -1
overview_item_labels[str(item['id'])] = labels
def update_labels(label_id):
filtered_overview_ids = [k for k, v in overview_item_ids.items() if v != 0]
for item_id in filtered_overview_ids:
labels = overview_item_labels[item_id]
api.items.update(item_id, labels = labels)
# Check for updates # Check for updates
check_for_update(current_version) check_for_update(current_version)
@ -182,12 +201,16 @@ def main():
# Main loop # Main loop
while True: while True:
overview_item_ids = {}
overview_item_labels = {}
try: try:
api.sync() api.sync()
except Exception as e: except Exception as e:
logging.exception( logging.exception(
'Error trying to sync with Todoist API: %s' % str(e)) 'Error trying to sync with Todoist API: %s' % str(e))
else: quit()
for project in api.projects.all(): for project in api.projects.all():
# Get project type # Get project type
@ -212,12 +235,17 @@ def main():
# If project type has been changed, clean everything for good measure # If project type has been changed, clean everything for good measure
if project_type_changed == 1: if project_type_changed == 1:
# Remove labels
[remove_label(item, label_id) for item in items] [remove_label(item, label_id) for item in items]
# Remove parent types
for item in items:
item['parent_type'] = None
# To determine if a task was found on sequential level # To determine if a sequential task was found
first_found_project = False first_found_project = False
first_found_item = True first_found_item = True
# For all items in this project
for item in items: for item in items:
# Determine which child_items exist, both all and the ones that have not been checked yet # Determine which child_items exist, both all and the ones that have not been checked yet
@ -234,8 +262,10 @@ def main():
# If old label is present, reset it # 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
api.items.update(item['id'])
except Exception as e: except Exception as e:
pass pass
# If option turned on, start recurring logic
else: else:
if item['parent_id'] == 0: if item['parent_id'] == 0:
try: try:
@ -244,7 +274,8 @@ def main():
# Check if the T0 task date has changed # 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['old_date'] = item['due']['date']
api.items.update(item['id'])
# Mark children for action # Mark children for action
for child_item in child_items_all: for child_item in child_items_all:
@ -261,6 +292,7 @@ def main():
'Parent not recurring: %s' % str(e)) 'Parent not recurring: %s' % str(e))
pass pass
if item['parent_id'] != 0:
try: try:
if item['r_tag'] == 1: if item['r_tag'] == 1:
item.update(checked=0) item.update(checked=0)
@ -284,24 +316,23 @@ def main():
logging.debug('Identified \'%s\' as %s type', logging.debug('Identified \'%s\' as %s type',
item['content'], item_type) item['content'], item_type)
if project_type is None and item_type is None and project_type_changed == 1: # Check the item_type of the project or parent
# Clean the item and its children
remove_label(item, label_id)
for child_item in child_items:
child_item['parent_type'] = None
# We can immediately continue
continue
else:
# Define the item_type
if item_type is None: if item_type is None:
if item['parent_id'] == 0:
item_type = project_type item_type = project_type
else: else:
# Reset in case that task is tagged as sequential try:
if item['parent_type'] is None:
item_type = project_type
else:
item_type = item['parent_type']
except:
item_type = project_type
else:
# Reset in case that parentless task is tagged, overrules project
first_found_item = False first_found_item = False
# If it is a parentless task # If it is a parentless task
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_project: if not first_found_project:
@ -310,20 +341,18 @@ def main():
elif not first_found_item: elif not first_found_item:
add_label(item, label_id) add_label(item, label_id)
first_found_item = True first_found_item = True
else: # else:
remove_label(item, label_id) # remove_label(item, label_id)
elif project_type == 'parallel': elif project_type == 'parallel':
add_label(item, label_id) add_label(item, label_id)
else: else:
# If only the item type has been defined # If no project-type has been defined
if item_type: if item_type:
add_label(item, label_id) add_label(item, label_id)
# If there are children, label them instead # If there are children
if len(child_items) > 0: if len(child_items) > 0:
child_first_found = False # Check if item state has changed, if so clean children for good measure
# Check if state has changed, if so clean for good measure
if item_type_changed == 1: if item_type_changed == 1:
[remove_label(child_item, label_id) [remove_label(child_item, label_id)
for child_item in child_items] for child_item in child_items]
@ -331,29 +360,23 @@ def main():
# Process sequential tagged items (item_type can overrule project_type) # 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_project: # Pass item_type down to the children
first_found_project = True
child_first_found = True
add_label(child_item, label_id)
child_item['parent_type'] = item_type child_item['parent_type'] = item_type
elif child_item['checked'] == 0 and not child_first_found and not first_found_item: # Pass label down to the first child
first_found_item = True if child_item['checked'] == 0 and label_id in item['labels']:
child_first_found = True
add_label(child_item, label_id) add_label(child_item, label_id)
child_item['parent_type'] = item_type remove_label(item, label_id)
else: else:
# Clean for good measure
remove_label(child_item, label_id) remove_label(child_item, label_id)
# Process parallel tagged items or untagged parents # Process parallel tagged items or untagged parents
elif item_type == 'parallel': elif item_type == 'parallel':
for child_item in child_items:
if child_item['checked'] == 0:
child_first_found = True
add_label(child_item, label_id)
child_item['parent_type'] = item_type
# Remove the label from the parent (needed for if recurring list is reset)
if item_type and child_first_found:
remove_label(item, label_id) remove_label(item, label_id)
for child_item in child_items:
child_item['parent_type'] = item_type
if child_item['checked'] == 0:
# child_first_found = True
add_label(child_item, label_id)
# If item is too far in the future, remove the next_action tag and skip # If item is too far in the future, remove the next_action tag and skip
if args.hide_future > 0 and 'due_date_utc' in item.data and item['due_date_utc'] is not None: if args.hide_future > 0 and 'due_date_utc' in item.data and item['due_date_utc'] is not None:
@ -364,6 +387,10 @@ 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
# Commit the queue with changes
update_labels(label_id)
if len(api.queue): if len(api.queue):
logging.debug( logging.debug(
'%d changes queued for sync... commiting to Todoist.', len(api.queue)) '%d changes queued for sync... commiting to Todoist.', len(api.queue))