black formatting

This commit is contained in:
Scot Hacker 2019-03-24 23:01:56 -07:00
parent 3399bfe98c
commit bd385f1a6d

View file

@ -41,13 +41,10 @@ def message_text(message):
def format_task_title(format_string, message): def format_task_title(format_string, message):
return format_string.format( return format_string.format(subject=message["subject"], author=message["from"])
subject=message["subject"],
author=message["from"],
)
DJANGO_TODO_THREAD = re.compile(r'<thread-(\d+)@django-todo>') DJANGO_TODO_THREAD = re.compile(r"<thread-(\d+)@django-todo>")
def parse_references(task_list, references): def parse_references(task_list, references):
@ -61,10 +58,7 @@ def parse_references(task_list, references):
continue continue
thread_id = int(match.group(1)) thread_id = int(match.group(1))
new_answer_thread = Task.objects.filter( new_answer_thread = Task.objects.filter(task_list=task_list, pk=thread_id).first()
task_list=task_list,
pk=thread_id
).first()
if new_answer_thread is not None: if new_answer_thread is not None:
answer_thread = new_answer_thread answer_thread = new_answer_thread
@ -110,16 +104,13 @@ def insert_message(task_list, message, priority, task_title_format):
message_from = message["from"] message_from = message["from"]
text = message_text(message) text = message_text(message)
related_messages, answer_thread = \ related_messages, answer_thread = parse_references(task_list, message.get("references", ""))
parse_references(task_list, message.get("references", ""))
# find the most relevant task to add a comment on. # find the most relevant task to add a comment on.
# among tasks in the selected task list, find the task having the # among tasks in the selected task list, find the task having the
# most email comments the current message references # most email comments the current message references
best_task = ( best_task = (
Task.objects.filter( Task.objects.filter(task_list=task_list, comment__email_message_id__in=related_messages)
task_list=task_list, comment__email_message_id__in=related_messages
)
.annotate(num_comments=Count("comment")) .annotate(num_comments=Count("comment"))
.order_by("-num_comments") .order_by("-num_comments")
.only("id") .only("id")
@ -136,7 +127,7 @@ def insert_message(task_list, message, priority, task_title_format):
best_task = Task.objects.create( best_task = Task.objects.create(
priority=priority, priority=priority,
title=format_task_title(task_title_format, message), title=format_task_title(task_title_format, message),
task_list=task_list task_list=task_list,
) )
logger.info("using task: %r", best_task) logger.info("using task: %r", best_task)
@ -148,8 +139,9 @@ def insert_message(task_list, message, priority, task_title_format):
logger.info("created comment: %r", comment) logger.info("created comment: %r", comment)
def tracker_consumer(producer, group=None, task_list_slug=None, def tracker_consumer(
priority=1, task_title_format="[MAIL] {subject}"): producer, group=None, task_list_slug=None, priority=1, task_title_format="[MAIL] {subject}"
):
task_list = TaskList.objects.get(group__name=group, slug=task_list_slug) task_list = TaskList.objects.get(group__name=group, slug=task_list_slug)
for message in producer: for message in producer:
try: try: