Save work. It works, kinda.

Author: programmerPhysicist

source/main.py

@@ -15,7 +15,7 @@
 import configparser
 
 from datetime import datetime
-#from dateutil import parser
+from dateutil import parser
 import re
 
 
@@ -269,7 +269,7 @@ def get_uniqs(matchDict,tod_tasks,hab_tasks):
 
     for tod in tod_tasks:
         tid = tod.id
-        if tod.is_completed:
+        if tod.complete:
             if tid not in matchDict.keys():
                 tod_uniq.append(tod)
 
@@ -279,6 +279,21 @@ def get_uniqs(matchDict,tod_tasks,hab_tasks):
             hab_uniq.append(hab)
 
     return tod_uniq, hab_uniq
+
+def getNewTodoTasks(matchDict,tod_tasks,hab_tasks):
+    tod_uniq = []
+    hab_uniq = []
+
+    for todo in tod_tasks:
+        tid = todo.id
+        if tid not in matchDict.keys():
+            tod_uniq.append(todo)
+    for hab in hab_tasks:
+        tid = hab.id
+        if tid not in matchDict.keys():
+            hab_uniq.append(hab)
+
+    return tod_uniq, hab_uniq
 '''
 def make_daily_from_tod(tod):
     import re
@@ -346,7 +361,7 @@ def make_daily_from_tod(tod):
         
     finished_hab = HabTask(new_hab)
     return finished_hab
-
+'''
 def make_hab_from_tod(tod_task):
     new_hab = {'type':'todo'}
     new_hab['text'] = tod_task.name
@@ -369,6 +384,7 @@ def make_hab_from_tod(tod_task):
     finished = HabTask(new_hab)
     return finished
 
+'''
 def make_tod_from_hab(hab):
     project_id = tod_projects[0].data['id']
     tod = {}

source/oneWaySync.py

@@ -16,7 +16,7 @@
 import random
 import json
 #from hab_task import HabTask
-#from todo_task import TodTask
+from todo_task import TodTask
 from datetime import datetime
 from datetime import timedelta
 # from dateutil import parser
@@ -46,7 +46,11 @@ def get_tasks(token):
 todoToken = config.getTodoistToken('auth.cfg')
 
 #Okay, now I need a list of todoist tasks.
-todoTasks, todoApi = get_tasks(todoToken)
+todoist_tasks, todoApi = get_tasks(todoToken) # todoist_tasks used to be tod_tasks
+
+tod_tasks = []
+for i in range(0, len(todoist_tasks)):
+    tod_tasks.append(TodTask(todoist_tasks[i]))
 
 # date stuff
 today = datetime.now()
@@ -55,38 +59,26 @@ def get_tasks(token):
 yesterday = datetime.now() - one_day
 yesterday_str = yesterday.strftime("%Y-%m-%d")
 
-overdue_tasks = [] # overdue_tasks used to be tod_tasklist
-todoist_tasks = []   # todoist_tasks used to be tod_tasks
-other_tasks = []
-for task in todoTasks:
-    if task.due != None and not task.is_completed:
-        # filter by due date
-        if task.due.datetime == None and task.due.date != None:
-            dateStr = task.due.date
-            if dateStr == today_str:
-                todoist_tasks.append(task)
-                overdue_tasks.append(task)
-            elif dateStr == yesterday_str:
-                overdue_tasks.append(task)
-            else:
-                other_tasks.append(task)
-
 """
 Okay, I want to write a little script that checks whether or not a task is there or not and, if not, ports it. 	
 """
 matchDict = main.openMatchDict()
 
 #Also, update lists of tasks with matchDict file...
-matchDict = main.update_tod_matchDict(todoist_tasks, matchDict)
+matchDict = main.update_tod_matchDict(tod_tasks, matchDict)
 matchDict = main.update_hab_matchDict(hab_tasks, matchDict)
 
 #We'll want to just... pull all the unmatched completed tasks out of our lists of tasks. Yeah? 
-tod_uniq, hab_uniq = main.get_uniqs(matchDict, todoist_tasks, hab_tasks)
+tod_uniq, hab_uniq = main.get_uniqs(matchDict, tod_tasks, hab_tasks)
 
 #Okay, so what if there are two matched tasks in the two uniq lists that really should be paired?
 matchDict = main.check_newMatches(matchDict,tod_uniq,hab_uniq)
 
 #Here anything new in todoist gets added to habitica
+tod_uniq = []
+hab_uniq = []
+tod_uniq, hab_uniq = main.getNewTodoTasks(matchDict, tod_tasks, hab_tasks)
+
 for tod in tod_uniq:
     tid = tod.id
     if tod.recurring == "Yes":

source/todo_task.py

@@ -20,17 +20,19 @@
 """
 
 class TodTask(object):
-    def __init__(self, task_dict=None):
+    def __init__(self, task=None):
         """ Initialise the task.
 
         Args:
             task_dict (dict): the Todoist task dictionary, as released by task_all.
         """
         super().__init__()
 
-        if not task_dict:
+        if not task:
             task_dict = {'text': 'scriptabit todo'}
 
+        task_dict = task.to_dict()
+
         if not isinstance(task_dict, dict):
             raise TypeError(type(task_dict))
 
@@ -104,7 +106,7 @@ def hardness(self):
     @property
     #is task complete? 0 for no, 1 for yes
     def complete(self):
-        return self.__task_dict['checked']
+        return self.__task_dict['is_completed']
 
     @complete.setter
     def complete(self, status):