Merge branch 'alpha'

Author: programmerPhysicist

README.md

@@ -13,10 +13,14 @@ That means that if you create a task in Todoist and then check it off, right now
 
 ## INSTALLATION
 
-There are two dependencies you'll need to install, and the commands to install them are as follows:
+There are a number dependencies you'll need to install, and the commands to install them are as follows:
 ```
 pip install todoist-python
 pip install requests
+pip install scriptabit
+pip install tzlocal
+pip install iso8601
+pip install python-dateutil
 ```
 Finally, you need to add your API tokens to the `Habitica-Plus-Todoist/source/auth.cfg.example` file. You can find your Habitica API User ID and API key by visiting https://habitica.com/user/settings/api while logged in, and your Todoist API token can be found by visiting https://todoist.com/prefs/integrations while logged in. Once you've added these tokens, you should rename the file to `Habitica-Plus-Todoist/source/auth.cfg` (remove the '.example' at the end).
 
@@ -35,7 +39,7 @@ If you'd like to change how the sync interprets difficulty or priority, please e
 
 ## USAGE
 
-Try running `python source/oneWaySync.py` in your terminal.
+Try running `python oneWaySync.py` in your terminal. (You have to run the command from the same directory that auth.cfg exists in).
 
 ## Credit
 

dist/habitica-todo-1.2.tar.gz

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: Habitica-Plus-Todoist
-Version: 1.2.0.1
+Version: 2.0.1
 Summary: An API app for syncing todoist and habitica tasks
-Home-page: https://github.com/eringiglio/Habitica-Plus-Todoist
+Home-page: https://github.com/programmerPhysicist/Habitica-Plus-Todoist
 Author: UNKNOWN
 Author-email: UNKNOWN
 License: UNKNOWN

dist/habitica-todo-1.3.tar.gz

@@ -0,0 +1,8 @@
+#!/bin/sh
+# Run habiticaTodo, avoid proxy.
+unset http_proxy
+unset https_proxy
+
+pwd
+cd source
+python3.9 oneWaySync.py

dist/habiticaTodo-1.2.0.tar.gz

@@ -4,8 +4,8 @@
 
 setup(
     name='Habitica-Plus-Todoist',
-    version='1.2.0.1',
-    url='https://github.com/eringiglio/Habitica-Plus-Todoist',
+    version='2.0.1',
+    url='https://github.com/programmerPhysicist/Habitica-Plus-Todoist',
     description='An API app for syncing todoist and habitica tasks',
     packages=['Habitica-Plus-Todoist'],
     zip_safe=False)

dist/habitica_todo-1.2.0.tar.gz

@@ -0,0 +1,66 @@
+'''This file deals with config related functions'''
+import logging
+import configparser
+
+def getTodoistToken(configfile):
+    logging.debug('Loading todoist auth data from %s' % configfile)
+
+    try:
+        cf = open(configfile)
+    except IOError:
+        logging.error("Unable to find '%s'." % configfile)
+        exit(1)
+
+    config = configparser.SafeConfigParser()
+    config.readfp(cf)
+
+    cf.close()
+
+    # Get data from config
+    try:
+        tt = config.get('Todoist', 'api-token')
+
+    except configparser.NoSectionError:
+        logging.error("No 'Todoist' section in '%s'" % configfile)
+        exit(1)
+
+    except configparser.NoOptionError as e:
+        logging.error("Missing option in auth file '%s': %s" % (configfile, e.message))
+        exit(1)
+
+    return tt
+
+def get_started(configfile):
+    """Get Habitica authentication data from the AUTH_CONF file."""
+
+    logging.debug('Loading habitica auth data from %s' % configfile)
+
+    try:
+        cf = open(configfile)
+    except IOError:
+        logging.error("Unable to find '%s'." % configfile)
+        exit(1)
+
+    config = configparser.SafeConfigParser()
+    config.readfp(cf)
+
+    cf.close()
+
+    # Get data from config
+    rv = {}
+    try:
+        rv = {'url': config.get('Habitica', 'url'),
+              'x-api-user': config.get('Habitica', 'login'),
+              'x-api-key': config.get('Habitica', 'password')}
+
+    except configparser.NoSectionError:
+        logging.error("No 'Habitica' section in '%s'" % configfile)
+        exit(1)
+
+    except configparser.NoOptionError as e:
+        logging.error("Missing option in auth file '%s': %s"
+                      % (configfile, e.message))
+        exit(1)
+
+    # Return auth data as a dictionnary
+    return rv

habiticaPlusTodoist.egg-info/PKG-INFO

@@ -0,0 +1,24 @@
+'''Habitica related functions'''
+import requests
+from hab_task import HabTask
+
+def get_all_habtasks(auth):
+    #Todoist tasks are, I think, classes. Let's make Habitica tasks classes, too.
+    url = 'https://habitica.com/api/v3/tasks/user/'
+    response = requests.get(url,headers=auth)
+    hab_raw = response.json()
+    hab_tasklist = hab_raw['data'] #FINALLY getting something I can work with... this will be a list of dicts I want to turn into a list of objects with class hab_tasks. Hrm. Weeeelll, if I make a class elsewhere....
+    
+    #keeping records of all our tasks
+    hab_tasks = [] 
+    
+    #No habits right now, I'm afraid, in hab_tasks--Todoist gets upset. So we're going to make a list of dailies and todos instead...
+    for task in hab_tasklist: 
+        item = HabTask(task)
+        if item.category == 'reward':
+            pass
+        elif item.category == 'habit': 
+            pass
+        else:
+            hab_tasks.append(item)
+    return(hab_tasks, response)