nowfocus 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

nowfocus/__main__.py

@@ -62,7 +62,7 @@ class Application(Gtk.Application):
 
         try:
         
-            self.window = None
+            # self.window = None # Think this is unused
 
             self.is_running = False
             self.device_in_use = True
@@ -83,7 +83,17 @@ class Application(Gtk.Application):
                 import install
                 install.run_first_load_actions()
 
-            utils.db_schema_update()
+            try:
+                self.version = importlib.metadata.version(conf.app_id)
+                print('nowfocus version', self.version)
+            except Exception as e:
+                print(e)
+
+            if get_system_db_value('db_schema_version') != self.version:
+
+                from upgrade import do_upgrades
+                do_upgrades(self)
+
 
             self.async_refresh()
 
@@ -358,11 +368,8 @@ class Application(Gtk.Application):
 
     def resume_session_from_db(self):
         try:
-            db_session = db_query("SELECT value FROM system WHERE field = 'session'")
-
-            if db_session:
-                s = json.loads(db_session[0]['value'])
-                s['start_time'] = datetime.strptime(s['start_time'],'%Y-%m-%d %H:%M:%S.%f')
+            s = get_session_from_system_db()
+            if s:
                 self.session = s
                 self.is_running = True
                 dbg("resuming session",s['label'],l=2, s='session')
@@ -470,7 +477,7 @@ class Application(Gtk.Application):
             process.wait()
         else:
             print("Launching command with subprocess.run", command)
-            subprocess.run(command) 
+            subprocess.run(command,shell=True) 
 
         print("running task command complete:", command)
 
@@ -524,14 +531,17 @@ class Application(Gtk.Application):
 
                 # Get time tracker for this tasks todolist 
                 todolist_conf = conf.user['todolists'][task['todolist']]
-                timetracker_conf = conf.user['timetrackers'][todolist_conf['timetracker']]
-
-                dbg("Save Session to "+ todolist_conf['timetracker'])
-                try:
-                    save_thread = threading.Thread(target=conf.timetracker_connectors[timetracker_conf['type']].save_session, args=(session,timetracker_conf) )
-                    save_thread.start()
-                except Exception as e:
-                    error_notice('Error Saving Time Data'," Recording timetracking for "+ task['label']+"  in "+timetracker_conf['label']+" had a serious failure",e )
+                
+                if 'timetracker' in todolist_conf:
+
+                    dbg("Save Session to "+ todolist_conf['timetracker'])
+                    try:
+
+                        timetracker_conf = conf.user['timetrackers'][todolist_conf['timetracker']]
+                        save_thread = threading.Thread(target=conf.timetracker_connectors[timetracker_conf['type']].save_session, args=(session,timetracker_conf) )
+                        save_thread.start()
+                    except Exception as e:
+                        error_notice('Error Saving Time Data'," Recording timetracking for "+ task['label']+"  in "+timetracker_conf['label']+" had a serious failure",e )
 
                 session['timetracker'] = todolist_conf['timetracker']
 

nowfocus/conf.py

@@ -71,6 +71,7 @@ prototype_settings = {
         'max_top_level_menu_items':10,
         'hours_search_timeframe':'this year',
         'invoice_hourly_rate':0,
+        'default_list_for_new_tasks':'Most recently used list',
 
         "custom_pomodoro_intervals": {
             "email":7  #minutes

nowfocus/connectors/vikunja.py

@@ -18,7 +18,7 @@ def add_new_task(user_conf,parent_list,task_label):
     headers = {'content-type': 'application/json'}
     data = {'title': task_label}
 
-    utils.dbg('add_new_task() parent_list',parent_list, l=-1)
+    utils.dbg('add new task to ',parent_list, l=-1)
 
     response = requests.put(user_conf['url']+"api/v1/projects/"+str(parent_list['data']['id'])+"/tasks",json=data, headers=head)
 
@@ -103,11 +103,17 @@ def get_todos(user_conf):
     
 
     headers = {"Authorization": "Bearer "+user_conf['token']}
-    projects_lists = requests.get(user_conf['url']+"api/v1/projects", headers=headers).json()
-
+    response = requests.get(user_conf['url']+"api/v1/projects", headers=headers)
+    # print("response.headers")
+    # print(response.headers)
+    projects_lists = response.json()
     # print("vikunja projects")
     # print(json.dumps(projects_lists, indent=4))
 
+    if 'message' in projects_lists:
+        # This occurs with an expired token
+        utils.dbg(projects_lists['message'], notification="Vikunja API Error: "+projects_lists['message'], s='vikunja', l=0)
+
     # for i in projects_list:
     for i, itemIter in enumerate(projects_lists):
 
@@ -155,54 +161,6 @@ def get_todos(user_conf):
                 if lists[parent_id]['status'] == -1:
                     lists[id]['status'] = -1
 
-
-
-        # NOTE: Originally tasks where queried per list, however this no longer works well because it requires a 'view' id, which comes wih various un-predictable baked-in filters (like done=true). Using the tasks/all api endpoint avoids this but quickly hits the default maxitemsperpage limit (which could, less obviously, show up in the per list method). 
-
-        # else: print('parent_project_id', p['parent_project_id'], 'not in projects_lists')
-
-        # view_id = p['views'][0]['id']
-        # utils.dbg({'view_id':view_id},'vikunja')
-        
-
-        # Including 'done' tasks (Doesn't seem o includ them actually)'
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/views/"+str(view_id)+"/tasks?sort_by[]=position&order_by[]=asc&equalspage=1", headers=headers).json()
-        
-        # Filtering out done tasks, Works
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/views/"+str(view_id)+"/tasks?sort_by[]=position&order_by[]=asc&filter_by[]=done&filter_value[]=false&filter_comparator[]=equals&filter_comparator[]=equalspage=1", headers=headers).json()
-        
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/tasks", headers=headers).json()
-
-        # print("vikunja projects_tasks")
-        # print(json.dumps(projects_tasks, indent=4))
-        # utils.pretty_print(projects_tasks)
-
-        # for i, itemIter in enumerate(projects_tasks):
-
-        #     t = projects_tasks[i]
-        #     t['id'] = str(t['id'])
-
-        #     tasks[t['id']] = {
-        #         'id':t['id'],
-        #         'label':t['title'],
-        #         'parent_id':p['id'],
-        #         'parent_label':p['title'],
-        #         'todolist':user_conf['id'],
-        #         'data':t
-        #     }
-
-        #     if t['done'] == True:
-        #         tasks[t['id']]['status'] = False
-
-
-        #     # Show favorites in main menu 
-        #     if t['is_favorite'] == True:
-        #         tasks[t['id']]['priority'] = 1
-        #     elif t['priority'] in priorities:
-        #         print("Priority task", t['title'])
-        #         tasks[t['id']]['priority'] = priorities[t['priority']]
-        #         print(tasks[t['id']])
-
     # beware per_page config ( generally in /opt/vikunja/config.yml) maxitemsperpage defaults to 20 so this really won't work on a default setup 
     #   maxitemsperpage: 5000
     # ?per_page=10000

nowfocus/desktop-extras/nowfocus.desktop

@@ -3,7 +3,7 @@ Name=nowfocus
 GenericName=Task, Todo, Timer, timertacker
 Version=1.0
 Comment=Accomplish one worthwhile thing at a time.
-Exec=nowfocus -f
+Exec=nowfocus
 Icon=nowfocus
 Terminal=false
 Type=Application

nowfocus/install.py

@@ -80,7 +80,6 @@ def copy_desktop_integration_files():
         (home+'/.config/autostart/','nowfocus.desktop')
     )
 
-
     for file in files:
         try:
             Path(file[0]).mkdir(parents=True, exist_ok=True)

nowfocus/new_task_dialog.py

@@ -44,10 +44,9 @@ class NewTaskWDialog(Gtk.Dialog):
         box.add(Gtk.Box(border_width=10)) #spacer
 
         default_list = get_most_recent_list(self.app.session)
-        if default_list:
-            self.selected_list = db_get_item_by_id(default_list,table='lists')
 
-        box.add(choose_from_lists(self.select_list, default_list))
+        box.add(choose_from_lists(self.select_list, default_list['id']))
+        self.selected_list = default_list
 
         box.add(Gtk.Box(border_width=10)) #spacer
         
@@ -80,7 +79,9 @@ class NewTaskWDialog(Gtk.Dialog):
             task_label = self.task_label_entry.get_text().strip()
 
             if not task_label:
-                error_notice("Please Enter a name before saving new task")
+                self.task_label_entry.grab_focus()
+                self.task_label_entry.set_placeholder_text('Please enter a task')
+                # error_notice("Please Enter a name before saving new task")
                 return False
 
             parent_list = self.selected_list

nowfocus/settings.py

@@ -923,7 +923,7 @@ class EditAddConnectorDialog(Gtk.Dialog):
 
 
             if key in ['file']:
-                self.entries[key] = Gtk.FileChooserButton(title="Select Todo File")
+                self.entries[key] = Gtk.FileChooserButton(title="Select "+connector_category+" file")
                 self.entries[key].set_action(Gtk.FileChooserAction.OPEN)
                 
             else:

nowfocus/task_window.py

@@ -399,16 +399,10 @@ class TaskWindow(Gtk.Window):
             self.r_sidebar.pack_start(self.sessions_scrolledwindow, True, True, 0)
 
             self.sessions_box = Gtk.VBox(spacing=5)
-            # self.sessions_box.get_style_context().add_class("subtle")
             self.sessions_scrolledwindow.add(self.sessions_box)
 
-            # self.r_sidebar.add_events(Gdk.EventMask.ENTER_NOTIFY_MASK)
-            # self.r_sidebar.add_events(Gdk.EventMask.LEAVE_NOTIFY_MASK)
-            # self.r_sidebar.connect("enter-notify-event",self.test)
-        #    session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True, deduplicate = False, truncate_labels_to_chars = 100
-
             self.l_sidebar.add(choose_from_lists(
-                self.select_list_callback, 'None', None, accepts_tasks=False, skip_top_level_lists =True, show_todolist_headers=False, deduplicate=True, truncate_labels_to_chars=20))
+                self.select_list_callback, 'None', None, accepts_tasks=False, show_todolist_headers=True, truncate_labels_to_chars=20))
 
             self.SessionEditDialog = SessionEditDialog # passed to show_sessions via self
             sidebar_sessions = get_sessions(use_sessions_timeframe_setting=False)

nowfocus/upgrade.py

@@ -0,0 +1,99 @@
+import conf
+from utils import * 
+# from pkg_resources import parse_version
+
+
+def do_upgrades(app):
+    db_schema_version = get_system_db_value('db_schema_version')
+
+    if db_schema_version == '0.2':
+                
+        db_query("ALTER TABLE lists DROP COLUMN status")
+        db_query("ALTER TABLE tasks DROP COLUMN status")
+
+        db_query("ALTER TABLE lists ADD COLUMN status INTEGER DEFAULT 1")
+        db_query("ALTER TABLE tasks ADD COLUMN status INTEGER DEFAULT 1")
+
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.3')")
+    
+        db_schema_version = '0.3'
+
+
+    if db_schema_version == '0.3':
+        db_query("ALTER TABLE sessions ADD COLUMN timetracker TEXT")
+        db_query("ALTER TABLE sessions ADD COLUMN notes TEXT")
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.4')")
+        print('adding timetracker column to session table')
+
+        for todolist_id, todo in conf.user['todolists'].items():
+            db_query("UPDATE sessions SET timetracker = ? WHERE todolist = ?",(todo['timetracker'],todolist_id) )
+
+        db_schema_version = '0.4'
+
+    if db_schema_version == '0.4':
+        dbg('Schema Update from', db_schema_version, 'to 0.5',l=-1)
+
+        print('Adding priority column to session table')
+
+        db_query("ALTER TABLE sessions ADD COLUMN priority INTEGER DEFAULT 0")
+
+        for session in db_query("SELECT DISTINCT task_id, extended_label FROM sessions"):
+            t = db_get_item_by_id(session['task_id'],dgb_error_level_for_failure=3)
+            if t and t['priority'] > 0:
+                print("setting",session['extended_label']," session priority to ",t['priority'] )
+
+                db_query("UPDATE sessions SET priority = ? WHERE task_id = ?",(t['priority'],session['task_id']))
+
+        print("Total hours priority sessions",round(divide(db_query("SELECT SUM(duration) as total FROM sessions WHERE priority > 0")[0]['total'],3600),2))
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
+
+        db_schema_version = '0.5'
+
+    if db_schema_version == '0.5':
+        dbg('Schema Update from', db_schema_version, 'to 0.5.6',l=-1)
+
+        from install import copy_desktop_integration_files
+        copy_desktop_integration_files()
+
+        db_schema_version = "0.5.6"
+        set_system_db_value("db_schema_version",db_schema_version)
+
+    # if db_schema_version == 0.5:
+    #     db_query("ALTER TABLE tasks ADD COLUMN tags TEXT DEFAULT '{}'")
+    #     db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
+    #     db_schema_version = 0.6
+
+
+    dbg('db_schema_version updated to', db_schema_version,s='db')
+
+
+
+
+
+
+
+
+
+
+
+
+
+# update time_target format 
+# for id, tt in user['time_targets']['lists'].items():
+#     if 'within_value' not in tt:
+#         print("Updating time target to new format ",tt)
+#         tt['within_value'] = tt['num_days']
+#         tt['within_unit'] = 'days'
+#         print(tt)
+#     if 'status' not in tt:
+#         tt['status'] = True
+
+        
+# for id, tt in user['time_targets']['tasks'].items():
+#     if 'within_value' not in tt:
+#         print("Updating time target to new format ",tt)
+#         tt['within_value'] = tt['num_days']
+#         tt['within_unit'] = 'days'
+#         print(tt)
+#     if 'status' not in tt:
+#         tt['status'] = True

nowfocus/utils.py

@@ -7,7 +7,6 @@ from datetime import datetime, timezone, timedelta
 from dateutil.relativedelta import relativedelta
 import copy
 import threading
-
 import sqlite3 
 from contextlib import closing
 from pathlib import Path
@@ -30,11 +29,11 @@ notify.init(conf.app_name)
 lists = {}
 
 
-def dbg(*data, s="", l=2, e=None, notify=None):
+def dbg(*data, s="", l=2, e=None, notification=None):
     ''' Any number of positional args optionally
     l: level {-1: Default output, 0:Error, 1:Warning, 2:Info, 3:Details}  
     s: system (Debuggable systems: 'taskwindow','signals','todoloading','user_settings', 'targets', 'performance')
-    notify: Show a notification with the content of notify.
+    notification: Show a notification with the content of notification.
     e (Exception object) traceback will be printed
     
     '''
@@ -47,8 +46,8 @@ def dbg(*data, s="", l=2, e=None, notify=None):
 
     if "all" in conf.debug_systems or system in conf.debug_systems or level <= conf.debug_level: 
 
-        if notify:
-            notify.Notification.new(conf.app_name+" "+levels[level], str(notify), None).show()
+        if notification:
+            notify.Notification.new(conf.app_name+" "+levels[level], str(notification), None).show()
 
         filter(None,data)
         if len(data) == 1:
@@ -68,7 +67,7 @@ def dbg(*data, s="", l=2, e=None, notify=None):
 
     if e and isinstance(e,Exception): 
         traceback.print_tb(e.__traceback__)
-        print(e)
+        print(e,"\n")
 
 def error_notice(title, details = None, e = None):
     print('ERROR',title,details,e)
@@ -268,20 +267,20 @@ def extended_label(i):
     return o
 
 # TODO cleanup this
-def lists_cache(new_lists = None):
-    '''Set or get a dict of (all) lists. This is useful but very gimpy. If new_lists is supplied it will exclusively use that (until it is replaced or the global lists var is emptied)'''
+def lists_cache(new_lists = None, reset = False):
+    '''Set or get a dict of (all) lists. If new_lists is supplied it will exclusively use that (until it is replaced or the global lists var is emptied) This is useful (because it can be used wih input when the values are not yet available in the databse) but wonky. '''
+
     global lists
     
     if(new_lists):
         lists = new_lists
-        # TODO: add this to the existing rather than overwriting...
+        # TODO: add a param to append to the existing lists rather than overwriting...
     
-    elif(lists == {}):
-        lists = db_query('SELECT * FROM lists WHERE status = 1 ORDER BY extended_label DESC',None, 'id') # TODO: limit to active todolists
+    elif reset or lists == {}:
+        lists = db_query('SELECT * FROM lists WHERE status = 1 ORDER BY extended_label DESC',None, 'id') 
 
-        # print('list_cache l',lists)
-        for l in lists.items():
-            lists[l['id']]['data'] = json.loads(l['data'])
+        for id, l in lists.items():
+            lists[l['id']] = proc_db_item(l,'lists')
 
     return lists 
 
@@ -336,7 +335,7 @@ def db_query(sql,parameters=None,key=None,error_handling=1):
         return result
 
     except Exception as e:
-        dbg(e,"sql",sql,'parameters',parameters,s="db",l=0)
+        dbg("sql",sql,'parameters',parameters,s="db",l=0,e=e)
         if error_handling > 0:
             error_notice("database error",str(e))
             if error_handling > 1:
@@ -347,88 +346,6 @@ def db_query(sql,parameters=None,key=None,error_handling=1):
             return []
 
 
-def db_schema_update():
-
-    try:
-        db_schema_version = float(db_query("SELECT field, value FROM system WHERE field = 'db_schema_version' ",error_handling=2)[0]['value'])
-    except Exception as e:
-        print("Updating db_schema_version to 0.2")
-
-        db_query("CREATE TABLE system (field TEXT PRIMARY KEY NOT NULL, value TEXT)")
-        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.2')")
-
-        db_schema_version = float(db_query("SELECT field, value FROM system WHERE field = 'db_schema_version' ")[0]['value'])
-
-        db_query("ALTER TABLE lists ADD COLUMN status INTEGER DEFAULT 1")
-        db_query("ALTER TABLE tasks ADD COLUMN status INTEGER DEFAULT 1")
-
-        db_query("ALTER TABLE lists ADD COLUMN extended_label TEXT")
-        db_query("ALTER TABLE tasks ADD COLUMN extended_label TEXT")
-
-        db_query("ALTER TABLE sessions ADD COLUMN extended_label TEXT")
-
-        # Since these column are just a cache, replace instead of copying columns
-        db_query("ALTER TABLE tasks DROP COLUMN priority")
-        db_query("ALTER TABLE tasks DROP COLUMN data")
-        db_query("ALTER TABLE lists DROP COLUMN priority")
-        db_query("ALTER TABLE lists DROP COLUMN data")
-
-        db_query("ALTER TABLE lists ADD COLUMN priority INTEGER DEFAULT 0")
-        db_query("ALTER TABLE lists ADD COLUMN data TEXT DEFAULT '{}'")
-        db_query("ALTER TABLE tasks ADD COLUMN priority INTEGER DEFAULT 0")
-        db_query("ALTER TABLE tasks ADD COLUMN data TEXT DEFAULT '{}'")
-
-
-    if db_schema_version == 0.2:
-                
-        db_query("ALTER TABLE lists DROP COLUMN status")
-        db_query("ALTER TABLE tasks DROP COLUMN status")
-
-        db_query("ALTER TABLE lists ADD COLUMN status INTEGER DEFAULT 1")
-        db_query("ALTER TABLE tasks ADD COLUMN status INTEGER DEFAULT 1")
-
-        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.3')")
-    
-        db_schema_version = 0.3
-
-
-    if db_schema_version == 0.3:
-        db_query("ALTER TABLE sessions ADD COLUMN timetracker TEXT")
-        db_query("ALTER TABLE sessions ADD COLUMN notes TEXT")
-        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.4')")
-        print('adding timetracker column to session table')
-
-        for todolist_id, todo in conf.user['todolists'].items():
-            db_query("UPDATE sessions SET timetracker = ? WHERE todolist = ?",(todo['timetracker'],todolist_id) )
-
-        db_schema_version = 0.4
-
-    if db_schema_version == 0.4:
-        print('Adding priority column to session table')
-
-        db_query("ALTER TABLE sessions ADD COLUMN priority INTEGER DEFAULT 0")
-
-        for session in db_query("SELECT DISTINCT task_id, extended_label FROM sessions"):
-            t = db_get_item_by_id(session['task_id'],dgb_error_level_for_failure=3)
-            if t and t['priority'] > 0:
-                print("setting",session['extended_label']," session priority to ",t['priority'] )
-
-                db_query("UPDATE sessions SET priority = ? WHERE task_id = ?",(t['priority'],session['task_id']))
-
-        print("Total hours priority sessions",round(divide(db_query("SELECT SUM(duration) as total FROM sessions WHERE priority > 0")[0]['total'],3600),2))
-        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
-
-        db_schema_version = 0.5
-
-    # if db_schema_version == 0.5:
-    #     db_query("ALTER TABLE tasks ADD COLUMN tags TEXT DEFAULT '{}'")
-    #     db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
-    #     db_schema_version = 0.6
-
-
-    dbg('db_schema_version', db_schema_version,s='db')
-
-
 def reindex(t=None):
     if t:
         thread = threading.Thread(target=reindex_one,args=(t,))
@@ -447,7 +364,9 @@ def reindex_all():
     for tid, t in get_timetarget_priority_tasks().items():
         db_query("UPDATE taskindex set priority = ? WHERE id = ?",(t['priority'],t['id']))
 
-    db_query("REPLACE INTO system(field, value) VALUES(?,?)",('taskindex_update_time',now().strftime("%Y-%m-%d %H:%M:%S")))
+    
+    set_system_db_value('taskindex_update_time', now().strftime("%Y-%m-%d %H:%M:%S"))
+    # db_query("REPLACE INTO system(field, value) VALUES(?,?)",('taskindex_update_time',now().strftime("%Y-%m-%d %H:%M:%S")))
     # print('reindex done')
     timeit()
 
@@ -464,14 +383,18 @@ def reindex_one(t):
 
     db_query("INSERT INTO taskindex(id, extended_label, priority, status) SELECT id, extended_label, ?, status FROM tasks WHERE id = ? ",(time_target_priority(t),t['id'],))
 
-    print("reindexed",t['label'])
+    dbg("reindexed",t['label'])
     # print(db_query("SELECT * FROM taskindex where id = ?",(t['id'],)))
-    db_query("REPLACE INTO system(field, value) VALUES(?,?)",('taskindex_update_time',now().strftime("%Y-%m-%d %H:%M:%S")))
+    # db_query("REPLACE INTO system(field, value) VALUES(?,?)",('taskindex_update_time',now().strftime("%Y-%m-%d %H:%M:%S")))
+    set_system_db_value('taskindex_update_time', now().strftime("%Y-%m-%d %H:%M:%S"))
+
     return True
 
 
 def taskindex_updated_time():
     ''' returns system db taskindex_update_time string formatted as %Y-%m-%d %H:%M:%S '''
+    get_system_db_value('taskindex_update_time')
+
     update_time = db_query("SELECT value FROM system WHERE field = 'taskindex_update_time'")[0]['value']
     
     # print('taskindex_updated_time',update_time)
@@ -631,7 +554,7 @@ def db_set_todolist(todolist_id,lists,tasks):
         insert_tasks[id] = db_prepare_item(i,'tasks')
 
     # Clear incomplete lists cache
-    lists_cache({})
+    lists_cache(reset=True)
 
     # for testing
     # insert_tasks = {'3':insert_tasks['3'],'294':insert_tasks['294']}
@@ -709,13 +632,17 @@ def db_cleanup(widget = None):
 
     # exit()
 
-def db_get_item_by_id(id,table = 'tasks',dgb_error_level_for_failure=0):
+def db_get_item_by_id(id, table = 'tasks',dgb_error_level_for_failure=0):
 
     if table in ['task','list']:
         table = table+'s'
     if table not in ['tasks','lists']:
         dbg('bad table "'+str(table)+'" passed to db_get_item_by_id',id,l=0)
         return {}
+    
+    # in case an item dict was passed instead of an id
+    if isinstance(id, dict):
+        return id
 
     try:
         data = db_query("SELECT * FROM "+table+" WHERE id = ?",(id,))
@@ -865,7 +792,8 @@ def db_set_session_cache(s):
     ''' Add active session to system db table. Not to be confused with db_save_session '''
     db_session = copy.deepcopy(s)
     db_session['start_time'] = db_session['start_time'].strftime("%Y-%m-%d %H:%M:%S.%f%z")
-    db_query("REPLACE INTO system(field, value) VALUES(:field, :value)", {'field':'session','value':json.dumps(db_session)})
+
+    set_system_db_value('session', json.dumps(db_session))
 
 
 def get_total_time(id, category = 'tasks', start_time = None, end_time = None, get_minutes = None):
@@ -1057,17 +985,17 @@ def refresh_todolist(todo, catch_errors = False):
     ''' Refresh a single todo. runs db_set_todolist and returns todos. Exceptions must be handled my caller '''
 
     try:
-        dbg('Refreshing '+todo['label'],l=-1)
+        dbg('Refreshing '+todo['label'],l=2)
         
         todos = conf.todo_connectors[todo['type']].get_todos(todo)
 
-        dbg('Done Refreshing '+todo['label'],l=-1)
+        dbg('Refreshing '+todo['label'],l=-1)
 
         db_set_todolist(todo['id'],todos['lists'],todos['tasks'])
 
     except Exception as e:
         if catch_errors:
-            error_notice('Error Loading '+todo['label']+' i refresh_todolist',e)
+            dbb(notify='Error Loading '+todo['label']+' i refresh_todolist',e=e)
             todos = {'lists': {}, 'tasks':{}}
 
         else:
@@ -1088,13 +1016,13 @@ def handle_todo_read_error(todo_conf,e):
     if isinstance(e, (FileExistsError, FileNotFoundError, PermissionError)):
         handle_todo_file_access_error(todo_conf,e)
 
-    dbg(todo_conf['label']+ " Access Error",e,l=0,notify=True)
+    dbg(todo_conf['label']+ " Access Error",e,l=0,notification=True)
 
 
 def handle_todo_file_read_error(todo_conf,e):
     conf.user['todolists'][todo_conf['id']]['status'] = False
     save_user_settings()
-    dbg(todo_conf['label']+ " Deactivated",e,l=-1,notify=True)
+    dbg(todo_conf['label']+ " Deactivated",e,l=-1,notification=True)
 
 
 def get_todolists(use_db_cache = False):
@@ -1125,12 +1053,12 @@ def get_todolists(use_db_cache = False):
                 if conf.debug_level == 3 or 'todoloading' in conf.debug_systems or todo['type'] in conf.debug_systems :
                     raise e
 
-                error_notice('Error refreshing '+todo['label'],e)
+                dbg(notification='Error refreshing '+todo['label'],e=e)
                 
                 try:
                     todos = db_get_todolist(todo['id'])
                 except Exception as e:
-                    error_notice('Also Failed to load '+todo['label']+' From cache' ,e)
+                    error_notice('Also Failed to load '+todo['label']+' From cache' ,e=e)
                     todos = {'lists': {}, 'tasks':{}}
 
         tasks.update(todos['tasks'])
@@ -1147,17 +1075,79 @@ def get_todolists(use_db_cache = False):
     return o
 
 
+def get_system_db_value(field, json = False):
+    try:
+        o = db_query("SELECT value FROM system WHERE field = ? ",(field,))
+        if o:
+            o = o[0]['value']
+        else:
+            dbg('no system_db_value for', field, l=1)
+
+        if json:
+            o = json.loads(o)
+        return o
+    except Exception as e:
+        dbg("Error getting",field, 'from system db',e,l=0)
+
+
+def set_system_db_value(field, value, json = False):
+    try:
+        if json:
+            value = json.dumps(value)
+
+        db_query("REPLACE INTO system(field, value) VALUES(:field, :value)", {'field':field,'value':value})
+
+    except Exception as e:
+        dbg("Error setting", field, value, 'in system db',e,l=0)
+
+
+def get_session_from_system_db():
+    try:
+        db_session = db_query("SELECT value FROM system WHERE field = 'session'")
+
+        if db_session:
+            s = json.loads(db_session[0]['value'])
+            s['start_time'] = datetime.strptime(s['start_time'],'%Y-%m-%d %H:%M:%S.%f')
+            return s
+    except Exception as e:
+        dbg("Error in get_session_from_system_db session",e,l=1)
+
+
 def get_most_recent_list(session = None):
+    ''' returns a list object '''
+    lists = lists_cache()
+    # print(lists.keys())
+
+    try:
+        return lists[session['task']['parent_id']]
+
+    except Exception as e:
+        pass
+
+    try:
+        return lists[get_session_from_system_db()['task']['parent_id']]
+        
+    except Exception as e:
+        pass
+
+    try:
+        return lists[db_query("SELECT parent_id FROM sessions WHERE parent_id IN (SELECT id FROM lists WHERE status = 1) ORDER BY sessions.start_time DESC LIMIT 1")[0]['parent_id']]
+
+    except Exception as e:
+        return lists.items()[0]
 
-    if session and 'task' in session and 'parent_id' in session['task']: 
-       return  session['task']['parent_id']
 
-    last_session = db_query("SELECT parent_id FROM sessions WHERE parent_id IN (SELECT id FROM lists WHERE status = 1) ORDER BY sessions.start_time DESC LIMIT 1")
-    if last_session: 
-        return last_session[0]['parent_id']
 
+def get_default_list_for_new_tasks():
+    # if conf.user['default_list_for_new_tasks'] != 'Most recently used list':
+    #     try:
 
-def choose_from_lists(callback, selected_list_id = None, session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True, deduplicate = False, truncate_labels_to_chars = 100):
+    # List that was last added to
+
+    return get_most_recent_list()
+
+
+def choose_from_lists(callback, selected_list_id = None, session = None, accepts_tasks = True, show_todolist_headers = True, truncate_labels_to_chars = 100):
     ''' Returns a Gtk.ScrolledWindow widget with radio buttons'''
 
     # TODO: consider using TreeView https://lazka.github.io/pgi-docs/Gtk-3.0/classes/TreeView.html#Gtk.TreeView 
@@ -1175,28 +1165,20 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
     # scrolled_window.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
     scrolled_window.add(box)
 
-    todolist = None
-
-    conditions = " "
-
-    if skip_top_level_lists:
-        conditions += " AND parent_label IS NOT NULL "
-
-    if deduplicate:
-        conditions += " GROUP BY extended_label "
-
-    lists = db_query("SELECT lists.*,  (SELECT start_time FROM sessions WHERE todolist = lists.todolist ORDER BY start_time DESC  LIMIT 1 ) as last_session_on_todo FROM lists WHERE status = '1'  "+conditions+" ORDER BY last_session_on_todo DESC, CASE WHEN parent_id IS NULL THEN 1 ELSE 2 END, extended_label ASC ", None, 'id')    
+    lists = db_query("SELECT lists.*, (SELECT start_time FROM sessions WHERE todolist = lists.todolist ORDER BY start_time DESC  LIMIT 1 ) as last_session_on_todo FROM lists WHERE status = '1' ORDER BY last_session_on_todo DESC, CASE WHEN parent_id IS NULL THEN 1 ELSE 2 END, extended_label ASC ", None, 'id')    
     
     r_button = None
     todolist_id = None
 
     for id, l in lists.items():
         try:
-            l['data'] = json.loads(l['data']) 
+            l = proc_db_item(l)
             if len(l['label']) > truncate_labels_to_chars:
                 l['label'] = l['label'][:truncate_labels_to_chars] + '…'
+            
+            nested_list_count = l['extended_label'].count(' > ')
 
-            label = f'{" · " * l['extended_label'].count(' > ')}' + GLib.markup_escape_text(l['label'])
+            label = f'{" · " * nested_list_count}' + GLib.markup_escape_text(l['label'])
 
             if todolist_id != l['todolist']:
                 todolist_id = l['todolist']
@@ -1213,14 +1195,12 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
             
             if accepts_tasks and l['data']['accepts_tasks'] == False:
                 label_widget.set_markup('   '+label)
-
                 box.add(label_widget)
 
             else:
                 r_button = Gtk.RadioButton(group=r_button)
                 r_button.add(label_widget)
 
-
                 if l['id'] == selected_list_id:
                     r_button.set_active(True)
 

{nowfocus-0.5.5.dist-info → nowfocus-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.5.5
+Version: 0.5.7
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org
@@ -58,7 +58,7 @@ nowfocus is a clean, keyboard-driven time management dashboard that flexibly con
 - Task prioritization   
 - Infinitely nestable lists  
 - Pomodoro timer  
-- Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though  
+- Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow-through  
 - Randomness interrupt bell (optional) to keep you on track with tracking your time
 - Keyboard-driven interface 
 - Offline to-do list cache 

{nowfocus-0.5.5.dist-info → nowfocus-0.5.7.dist-info}/RECORD

@@ -1,18 +1,18 @@
 nowfocus/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nowfocus/__main__.py,sha256=ow_EHA8LCeC6OG0PW-cMdHQuU6dcGedOyPec68mIb2U,33169
-nowfocus/conf.py,sha256=KV0iouYSSpYUITLlG-lPvmk1sHFVQsykwqmvb9wyTdk,6693
+nowfocus/__main__.py,sha256=1WffOUaxlfw0gc_qWY9K78j35AmoxoDDLePoK3wFlE0,33433
+nowfocus/conf.py,sha256=czmeMU7r5DD5fT1cDi2kjwYa5xQSXJoQoeQYsoFMkzc,6757
 nowfocus/example-todo.txt,sha256=o-ZRNiTlSGFbTK9jpdDIi07qHBrpvP0JhBZSk0VlpQU,246
-nowfocus/install.py,sha256=tcds4l6b492HTC7DfapatafgeMmDWvBfy8nwi1CjFXk,3040
-nowfocus/new_task_dialog.py,sha256=GG49tOAwXiUKAHeaKnCG8Q3SZlL5pJijRZEcSjMwQng,4350
+nowfocus/install.py,sha256=gzjDzqUFYRP1dS_zA_MKrTZWTAB1bYqcxjRw5mBn1aQ,3039
+nowfocus/new_task_dialog.py,sha256=LwvwNlCg_rl0tHwLPro0Jx1p4J_ukMNM2nLQ36vUJPI,4429
 nowfocus/session_edit_dialog.py,sha256=V2QWSdNaxsQHRcG28CJBQM2sa45m5RNcu_suQF26mkM,6912
 nowfocus/session_options.py,sha256=mOnyEM3-usKgVvBhESY0TNBcy4FTG-AHP6ETMgB1fQ4,5071
 nowfocus/sessions.csv,sha256=kYpr06yQg_J86NQ4AiYw4RnQchcw3ouPKVYa1lYDUNo,39
-nowfocus/settings.py,sha256=CZoSpFacxAs99Nq-NXNDKiBqjPSLPwg8bL5hcsi2a6E,35151
+nowfocus/settings.py,sha256=0d6nZw1t36TjyUr9KQ_wDwuh2SB64gUkZeHEjEV867Y,35169
 nowfocus/styles.css,sha256=PG1SrLkwSSay8M2VKeRcE0UdK54ndsEDFnRLRkmP-9M,510
-nowfocus/task_window.py,sha256=UIrHljw3IfnBjdK9idnzgB4cT6QfYY7PChCQhUR_0zI,29373
+nowfocus/task_window.py,sha256=f6eaxrFwI5POJG2tZX0H3AKFA6dGt_RH42y2ydHqosY,28875
+nowfocus/upgrade.py,sha256=S0nyWmVLnukWY0QhC5873HFQZpcWuZ_XEPU4QTBtX3s,3379
 nowfocus/user_idle_time.py,sha256=I44Ip-iGGzWAiHnM2_06jNqhCne9y1SbvcBI-nYBolU,2365
-nowfocus/utils.py,sha256=OyLUTfUqODkMm_QtnQc65ihgCO-cbcMjAWbCKC2uePs,51147
-nowfocus/version_migrator.py,sha256=q8T1C8-DLOwUQUM5IPcMjPbVbsLTO4VsqADlAAXd9gw,628
+nowfocus/utils.py,sha256=tVa4rJf0QKhDU5as4-BSIFvuZLMsxGScJkxGRYibtzA,49187
 nowfocus/connectors/activitywatch.py,sha256=QbkOmjIOiVwccWc2xhhePd0Abww5vEiVpCNjeqOyYGg,921
 nowfocus/connectors/caldav.py,sha256=PeM_9yJC8W17L8Y5AyS75o6GfzTrPoMYKIvetND8T78,5089
 nowfocus/connectors/csv.py,sha256=FwMpHM5lPIT90HKBCQUncpaW7zqFjlHjMwKR0-XWg-4,821
@@ -23,8 +23,8 @@ nowfocus/connectors/todo_template.py,sha256=R37fA2LXo8_LpWIgqozytI5RqIUjGggFHup2
 nowfocus/connectors/todotxt.py,sha256=QCZjbIhY4Lm37YD0GsKJQUqbj7s3eYmZGgRwUCndZ5w,3857
 nowfocus/connectors/trello.py,sha256=VqwnvHGXXcljmdf6kRZcE6sfeBQYhped_KVBEBOzWXM,6072
 nowfocus/connectors/txt.py,sha256=iskJsw3dZnI4bIeEDtZCY-aQfKRKtoGATEJ0k13npxI,8125
-nowfocus/connectors/vikunja.py,sha256=Lg1lgF3C5B606CUf3-U8pVtPt7Cp6IKkT5wFN779V8w,10799
-nowfocus/desktop-extras/nowfocus.desktop,sha256=PyCDMgm-aicRJkG2p1czLjBBp3BJz8vfLG7TjgJjZfY,297
+nowfocus/connectors/vikunja.py,sha256=sutd-loOjYT0njtEIT-E_E_EG9KTdsJfsYd1mHeqNBE,8807
+nowfocus/desktop-extras/nowfocus.desktop,sha256=0kWsx0ZfvPbubGG1uuFSHxxYUw2GV9Ly_rtlboM1mak,294
 nowfocus/desktop-extras/nowfocus.png,sha256=P5rn6-0EAJa2WXf4SJoaNtLRUfiV3LdsOroPKsR6GfA,15148
 nowfocus/desktop-extras/nowfocus.svg,sha256=nps7naZzuhWWuKzQbpvxr9wLyzjmzMPzNHSBQMVetOo,2137
 nowfocus/icon/cancel.png,sha256=Hy9A7KdO13MsXguIgoTI276mECN07rzd6hGbIqxSl7c,506
@@ -52,9 +52,9 @@ nowfocus/icon/settings.svg,sha256=fgkGJouPPtZLxZn2nr_5pEp9MdhRSRaW9mtdxhJHDuQ,39
 nowfocus/sound/bell-xylophone-g.mp3,sha256=1OBcRWvD87AGNcq1uZFR8HqG0nanJykImERfVDVxHD4,53891
 nowfocus/sound/dinner-bell.mp3,sha256=hjjO0xqA4uXpYw9KLwwlBnrVfRhVq1K5OXzwlMXhRn4,113620
 nowfocus/sound/xylophone-chord.mp3,sha256=gwgBSqhMt5PMzT5N03Z6TvDgipQZfnkEz_o81Rq5Z1U,131806
-nowfocus-0.5.5.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
-nowfocus-0.5.5.dist-info/METADATA,sha256=aGBt4lGMum7iyPyQGR283NutEy81KuhT3dpAYt51HuA,6804
-nowfocus-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nowfocus-0.5.5.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
-nowfocus-0.5.5.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
-nowfocus-0.5.5.dist-info/RECORD,,
+nowfocus-0.5.7.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
+nowfocus-0.5.7.dist-info/METADATA,sha256=HpS443Yz3_NPDZB03_G51VF4Yil7UNC4xtl8R1XqttA,6805
+nowfocus-0.5.7.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+nowfocus-0.5.7.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
+nowfocus-0.5.7.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
+nowfocus-0.5.7.dist-info/RECORD,,

{nowfocus-0.5.5.dist-info → nowfocus-0.5.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nowfocus/version_migrator.py

@@ -1,20 +0,0 @@
-
-# update time_target format 
-for id, tt in user['time_targets']['lists'].items():
-    if 'within_value' not in tt:
-        print("Updating time target to new format ",tt)
-        tt['within_value'] = tt['num_days']
-        tt['within_unit'] = 'days'
-        print(tt)
-    if 'status' not in tt:
-        tt['status'] = True
-
-        
-for id, tt in user['time_targets']['tasks'].items():
-    if 'within_value' not in tt:
-        print("Updating time target to new format ",tt)
-        tt['within_value'] = tt['num_days']
-        tt['within_unit'] = 'days'
-        print(tt)
-    if 'status' not in tt:
-        tt['status'] = True