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

nowfocus/__main__.py

@@ -5,6 +5,7 @@ import json
 import time
 from datetime import datetime, timezone, timedelta
 import importlib
+from importlib.metadata import version
 from urllib.request import urlopen
 import requests
 import threading
@@ -63,7 +64,7 @@ class Application(Gtk.Application):
         try:
         
             # self.window = None # Think this is unused
-
+            
             self.is_running = False
             self.device_in_use = True
             self.UserIdleTime = UserIdleTime()
@@ -84,10 +85,10 @@ class Application(Gtk.Application):
                 install.run_first_load_actions()
 
             try:
-                self.version = importlib.metadata.version(conf.app_id)
+                self.version = version(conf.app_id)
                 print('nowfocus version', self.version)
             except Exception as e:
-                print(e)
+                dbg(e=e,l=0)
 
             if get_system_db_value('db_schema_version') != self.version:
 
@@ -106,24 +107,35 @@ class Application(Gtk.Application):
             self.start_pipe()
             self.open_task_window()
 
+
+            # Have an error
+            # 1/0 
+
             # Testing
             # TODO: enable these automatically with dbg system
             # self.open_session_options_dialog('test_param')
-            # self.open_settings_window() #for testing
+            self.open_settings_window(page_number=3) #for testing
             # self.open_new_task_dialog() #for testing
             # self.print_time_totals()
             # self.new_task_dialog()
 
+            # error_dialog_inst = ErrorDialog(None,"test\n TEst")
+            # error_dialog_inst.show_all()
+
             signal.signal(signal.SIGINT, self.quit)
             signal.signal(signal.SIGUSR1, self.signal_handler)
             signal.signal(signal.SIGUSR2, self.signal_handler)
 
             Gtk.main()
+
         except Exception as e:
-            print(conf.app_name +' had a pretty bad error. Please submit the following trace as an issue on the git repo or email it to the developers ')
-            print(e)
-            traceback.print_tb(e.__traceback__)
-            self.quit()
+
+            dbg(notification='Total error happened', e=e, l=0)
+            pass
+            # print(conf.app_name +' had a pretty bad error. Please submit the following trace as an issue on the git repo or email it to the developers ')
+            # print(e)
+            # traceback.print_tb(e.__traceback__)
+            # self.quit()
 
 
     def print_time_totals(self = None, widget = None):
@@ -157,7 +169,7 @@ class Application(Gtk.Application):
         try:
             os.remove(conf.pipe)
         except Exception as e:
-            dbd("Error removing conf.pipe in quit",e)
+            dbg("Error removing conf.pipe in quit",e=e)
 
         notify.uninit()
         Gtk.main_quit()
@@ -374,7 +386,7 @@ class Application(Gtk.Application):
                 self.is_running = True
                 dbg("resuming session",s['label'],l=2, s='session')
         except Exception as e:
-            dbg("Error resuming session",e,l=1)
+            dbg("Error resuming session",e=e ,l=1)
 
 
     def start_task(self, w = None, task_data_or_id = None, transfer_current_session_time = False):
@@ -445,7 +457,8 @@ class Application(Gtk.Application):
         self.task_running_menu_additions()
 
         self.menu.show_all()
-        dbg("Starting",task_data['extended_label'])
+        dbg("Starting",task_data['extended_label'],l=-1)
+        dbg("new session task priority:", s['task']['priority'], l=-1)
 
         if task_data['id'] in conf.user['task_commands']:
             command_data = conf.user['task_commands'][task_data['id']]
@@ -464,7 +477,7 @@ class Application(Gtk.Application):
         process = None
         for proc in psutil.process_iter():
             pinfo = proc.as_dict(attrs=['pid', 'name'])
-            print("Check process", pinfo['name'])
+            dbg("Check process", pinfo['name'], s='commands', l=3)
             if pinfo['name'] == command:
                 process = proc
                 break
@@ -472,16 +485,18 @@ class Application(Gtk.Application):
                 continue
                 
         if process:
-            print("waiting for already running command with psutils", command)
+            dbg("waiting for already running command with psutils", command, s='commands')
             # subprocess.run('wmctrl', '-a', command) # Doesn't work on wayland
             process.wait()
         else:
-            print("Launching command with subprocess.run", command)
+            dbg("Launching command with subprocess.run", command, s='commands')
             subprocess.run(command,shell=True) 
 
-        print("running task command complete:", command)
+        dbg("running task command complete:", command, s='commands')
+
+        # stop timer on command completion if duration is more an 3 seconds and session is still the same task
 
-        if self.session['label'] == self.running_command_task_label:
+        if self.session['duration'] > 3 and self.session['label'] == self.running_command_task_label:
             GLib.idle_add(self.stop_task)
             GLib.idle_add(self.open_task_window)
 
@@ -510,7 +525,7 @@ class Application(Gtk.Application):
             playsound('sound/xylophone-chord.mp3',False)
 
         except Exception as e:
-            error_notice('Error Marking Task Done'," Marking "+ task['label']+" as done in "+todolist_conf['label']+" had a serious failure", e=e )
+            dbg(notification="Marking "+ task['label']+" as done in "+todolist_conf['label']+" had a serious failure", e=e,l=0 )
 
 
 
@@ -532,16 +547,16 @@ class Application(Gtk.Application):
                 # Get time tracker for this tasks todolist 
                 todolist_conf = conf.user['todolists'][task['todolist']]
                 
-                if 'timetracker' in todolist_conf:
+                if todolist_conf['timetracker']:
 
-                    dbg("Save Session to "+ todolist_conf['timetracker'])
+                    dbg("Save Session to "+ str(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 )
+                        dbg('Error Saving Time Data',notification="Recording timetracking for "+ task['label']+"  in "+timetracker_conf['label']+" had a serious failure",e=e ,l=0 )
 
                 session['timetracker'] = todolist_conf['timetracker']
 
@@ -665,8 +680,9 @@ class Application(Gtk.Application):
                 list_menus['recent'].append(i)
 
             except Exception as e:
+                pass
                 # Because a key error if the task has was completed or todolist removed
-                print('recent_tasks error', e)
+                dbg('recent_tasks error', e=e)
         menu.append(Gtk.SeparatorMenuItem.new())
 
 
@@ -738,12 +754,12 @@ class Application(Gtk.Application):
             self.session_options_dialog.show_all()
 
 
-    def open_settings_window(self, w = None, **kwargs):
+    def open_settings_window(self, w = None, page_number=0, **kwargs):
 
         if hasattr(self, 'settings_window'):
             self.settings_window.present()
         else:
-            self.settings_window = SettingsWindow(self,**kwargs)
+            self.settings_window = SettingsWindow(self, page_number, **kwargs)
             self.settings_window.show_all()
 
 
@@ -811,7 +827,7 @@ class Application(Gtk.Application):
                     error_notice('Commandline Task failed','Could not find a task matching argument '+str(data))
          
         except FileNotFoundError as e:
-            print("Error starting pip listener, CLI will not work",e)
+            dbg(notification="Error starting pip listener, CLI will not work",e=e,l=0)
 
         # keep listening
         self.check_pipe()
@@ -883,7 +899,7 @@ def startup():
 
 
     except Exception as e:
-        print(f"Named pipe creation failed: {e}")
+        dbg("Named pipe creation failed",e=e,l=0)
 
 
 if __name__ == "__main__":

nowfocus/conf.py

@@ -22,6 +22,7 @@ user_settings_dir = GLib.get_user_config_dir()+"/"+app_id
 
 db_file = user_data_dir+"/data.db"
 settings_file = user_data_dir+"/nowfocus-settings.json"
+error_log_file = user_data_dir+"/error.log"
 debug_level = 1 # dev value 
 debug_systems = []
 pipe = "/tmp/"+app_id+"-pipe"
@@ -71,7 +72,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',
+        'default_list_for_new_tasks':'List that was last added to',
 
         "custom_pomodoro_intervals": {
             "email":7  #minutes
@@ -162,7 +163,6 @@ for key, val in prototype_settings.items():
 # print(json.dumps(user, indent=4))
 # print(json.dumps(connectors['todolists'], indent=4))
 
-
 with open(settings_file,"w") as file:
     json.dump(user, file)
 

nowfocus/connectors/taskwarrior.py

@@ -1,6 +1,7 @@
 import os
 import conf
 import utils 
+import subprocess
 from taskw import TaskWarrior
 
 # lists and tasks are each a dicts of dicts with following shape 
@@ -115,5 +116,11 @@ def get_todos(user_conf):
     todos =  {'lists':lists,'tasks':tasks}
     return todos
 
+def launch(user_conf):
+    subprocess.Popen(['x-terminal-emulator'])
+    # subprocess.call(['x-terminal-emulator', '-e', 'task']) # Supposed to work but doesn't
+    # subprocess.call(['gnome-terminal', '-x', 'task']) # Me too!
+    
+
 # testing
 # print(get_todos())

nowfocus/error_dialog.py

@@ -0,0 +1,69 @@
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, GLib, Gdk
+import conf
+import utils
+from utils import *
+
+
+class ErrorDialog(Gtk.Dialog):
+
+    def __init__(self, parent, error_details_str, system = ''):
+
+        super().__init__(title=conf.app_name + " Error ", transient_for=parent, flags=0)
+        self.error_details = str(error_details_str)
+
+        print("error dialog init")
+
+        # self.app = parent.app
+        self.set_default_size(600,400)
+
+        self.set_border_width(15)
+
+        dialog = self.get_content_area()
+
+        dialog.set_spacing(15)
+
+        intro_text = conf.app_name+" "+system+" has hit a bump in the road..."
+
+        intro = Gtk.Label(intro_text)
+
+        dialog.add(intro)
+
+        box = Gtk.Box()
+        error_label = Gtk.Label(self.error_details)
+        box.add(error_label)
+
+        scrolled_window = Gtk.ScrolledWindow()
+        scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        # scrolled_window.set_size_request(-1, 350)
+
+        scrolled_window.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
+        scrolled_window.add(box)
+        
+        dialog.pack_end(scrolled_window,1,1,True)
+
+        # dialog.add(Gtk.Box(border_width=10)) #spacer
+
+        self.add_button("Okay Whatever", 1)
+
+        self.add_button("Send to developers", 2)
+
+        self.set_default_response(2)
+
+        self.show_all()
+        self.connect("response", self.on_response,)
+
+    def on_response(self, widget, response):
+        if response == 2:
+
+            import subprocess
+
+            subprocess.run([
+                "xdg-email",
+                "--subject", conf.app_name+" Error Report",
+                "--body", self.error_details,
+                # "recipient@example.com"
+            ])
+
+        self.destroy()

nowfocus/new_task_dialog.py

@@ -43,7 +43,7 @@ class NewTaskWDialog(Gtk.Dialog):
 
         box.add(Gtk.Box(border_width=10)) #spacer
 
-        default_list = get_most_recent_list(self.app.session)
+        default_list = get_default_list_for_new_tasks()
 
         box.add(choose_from_lists(self.select_list, default_list['id']))
         self.selected_list = default_list
@@ -97,6 +97,9 @@ class NewTaskWDialog(Gtk.Dialog):
                 # add it to the database 
                 db_set_item(task)
 
+                # Add list and last appended to list in system db
+                set_system_db_value('last_added_to_list_id',self.selected_list['id'])
+
                 # add it to the menu 
                 menu_tasks[task['id']] = Gtk.MenuItem.new_with_label(task['label'])
                 menu_tasks[task['id']].connect("activate", self.app.start_task, task)
@@ -122,7 +125,7 @@ class NewTaskWDialog(Gtk.Dialog):
                 if conf.debug_level > 1:
                     raise e
                 
-                error_notice('Error adding tasks',"Adding "+ task_label+" to "+todolist_conf['label']+" had a serious failure",e) # NOTE: e, in the case of a key error, only prints the bad key, not the error type 
+                dbg(notification="Error adding tasks "+str(task_label)+" to "+todolist_conf['label'], e=e,l=0) 
 
 
         elif response == Gtk.ResponseType.CANCEL:

nowfocus/session_edit_dialog.py

@@ -32,9 +32,10 @@ class SessionEditDialog(Gtk.Dialog):
         else:
             error_notice("Error: SessionEditDialog called without session data")
 
-        print(' SessionEditDialog target_session',target_session)
+        dbg('SessionEditDialog target_session',target_session,l=-1)
 
         self.s['task'] = db_get_item_by_id(self.s['task_id'])
+
         # Used to identify and remove old session 
         self.session_id = {
             'extended_label':self.s['extended_label'], 'start_time': self.s['start_time']
@@ -47,7 +48,6 @@ class SessionEditDialog(Gtk.Dialog):
 
         box = self.get_content_area()
 
-
         # label = Gtk.Label()
         # label.set_markup("<b>"+self.s['extended_label']+"</b> ")
         # box.add(label)
@@ -160,8 +160,6 @@ class SessionEditDialog(Gtk.Dialog):
         if response == 2:
             db_query("DELETE FROM sessions WHERE extended_label = ? AND start_time = ? LIMIT 1",(self.session_id['extended_label'],self.session_id['start_time']))
 
-            error_notice('Session Deleted','')
-        
         if response == 3:
 
             if self.notes_text_buffer.get_modified():

nowfocus/settings.py

@@ -94,11 +94,13 @@ class SettingsWindow(Gtk.Window):
 
 
 
-    def __init__(self, parent=None, **kwargs):
+    def __init__(self, parent=None, page_number=0, **kwargs):
         self.app = parent #NOTE: This doesn't look like it will work when called from task_window...
         Gtk.Window.__init__(self, title="Settings")
-        self.set_border_width(15)
+        self.set_border_width(0)
         self.set_position(position=1) 
+        self.set_default_size(-1,800)
+
         self.connect("destroy", self.on_close)
 
         self.notebook = Gtk.Notebook()
@@ -106,15 +108,17 @@ class SettingsWindow(Gtk.Window):
 
 
 
-
-
-        # Settings
+        # Settings page
         row = 0
         grid = Gtk.Grid()
         grid.set_row_spacing(10)
         grid.set_column_spacing(10)
-        self.notebook.append_page(grid,Gtk.Label('Settings'))
+        grid.set_border_width(15)
+        settings_page = Gtk.Box()
+        settings_scroller = self.scroll_box(settings_page)
+        settings_scroller.add(grid)
 
+        self.notebook.append_page(settings_page,Gtk.Label('Settings'))
 
         grid.attach(Gtk.Box(border_width=10),0,(row:=row+1),5,1) # Spacer
 
@@ -129,9 +133,11 @@ class SettingsWindow(Gtk.Window):
 
         grid.attach(self.settings_updater('todolist_refresh_interval', 3, 'SpinButton',"(hours)"),0,(row:=row+1),5,1)
         
-    
         # grid.attach(self.settings_updater('invoice_hourly_rate', 33, 'SpinButton',""),0,(row:=row+1),5,1)
         
+        grid.attach(self.settings_updater('default_list_for_new_tasks', 'List that was last added to', 'ComboBoxText',"", options = ['List that was last added to','Most recently used list']),0,(row:=row+1),5,1)        
+        
+        
         grid.attach(self.settings_updater('hours_search_timeframe', 'auto', 'ComboBoxText',"\nDefault timetracking range for hours shown in main window and invoicing", options = list(hours_search_timeframes().keys())),0,(row:=row+1),5,1)
         
         grid.attach(self.settings_updater('prompts', None, 'TextView',""),0,(row:=row+1),5,1)
@@ -143,13 +149,18 @@ class SettingsWindow(Gtk.Window):
 
 
 
+
+        connectors_page = Gtk.Box()
+        self.notebook.append_page(connectors_page,Gtk.Label('Todolists and Time Trackers'))
+        connectors_scroller = self.scroll_box(connectors_page)
+
+        # TODO: perhaps use a scroller for each connector category instead of one big one
         row = 0
         grid = Gtk.Grid()
+        connectors_scroller.add(grid)
         grid.set_row_spacing(10)
         grid.set_column_spacing(10)
-        grid.set_border_width(10)
-
-        self.notebook.append_page(grid,Gtk.Label('Todolists and Time Trackers'))
+        grid.set_border_width(15)
 
         sub_head = Gtk.Label()
         sub_head.set_markup("<b>Todo Lists</b>")
@@ -227,11 +238,13 @@ class SettingsWindow(Gtk.Window):
 
 
         # Task Commands notebook page  
-        self.task_commands_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        self.notebook.append_page(self.task_commands_box,Gtk.Label('Task Commands'))
+        self.task_commands_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.notebook.append_page(self.task_commands_page,Gtk.Label('Task Commands'))
+
+        self.task_commands_box = self.scroll_box(self.task_commands_page)
+        self.task_commands_box.set_border_width(15)
 
         self.boxes['task_commands_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        # self.boxes['task_commands_outer'] = self.scroll_box()
         self.task_commands_box.add(self.boxes['task_commands_outer'])
 
         # Gets replaced when commands are loaded
@@ -248,19 +261,22 @@ class SettingsWindow(Gtk.Window):
 
 
 
+
+
+
         # Time Targets notebook page 
-        self.targets_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        self.notebook.append_page(self.targets_box, Gtk.Label('Time Targets'))
+        self.targets_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
 
-        self.boxes['lists_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        # self.targets_box.add(self.boxes['lists_time_targets_outer'])
+        self.notebook.append_page(self.targets_page, Gtk.Label('Time Targets'))
 
-        
-        # self.boxes['test'] = self.scroll_box(None ,300) 
-        # self.targets_box.add(self.boxes['test'])
+        self.targets_scroller = self.scroll_box(self.targets_page ,300)
 
-        # self.boxes['lists_time_targets_outer'] = self.scroll_box(None ,300) 
+        self.targets_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.targets_box.set_border_width(15)
+    
+        self.targets_scroller.add(self.targets_box)
 
+        self.boxes['lists_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
         
         self.targets_box.add(self.boxes['lists_time_targets_outer'])
 
@@ -268,13 +284,6 @@ class SettingsWindow(Gtk.Window):
         # Gets replaced when targets are loaded
         self.boxes['lists_time_targets_inner'] = Gtk.Box()
         self.boxes['lists_time_targets_outer'].add(self.boxes['lists_time_targets_inner'])
-
-        # separator = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
-        # self.boxes['lists_time_targets_outer'].pack_start(separator, True, True, 0)   
-
-        # test_button = Gtk.Button(label="test")
-        # self.boxes['lists_time_targets_inner'].add(test_button)
-
         
         self.show_time_targets('lists')
 
@@ -286,6 +295,7 @@ class SettingsWindow(Gtk.Window):
 
         self.boxes['tasks_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
         self.targets_box.add(self.boxes['tasks_time_targets_outer'])
+
         # Gets replaced when targets are loaded
         self.boxes['tasks_time_targets_inner'] = Gtk.Box()
         self.boxes['tasks_time_targets_outer'].add(self.boxes['tasks_time_targets_inner'])
@@ -308,6 +318,7 @@ class SettingsWindow(Gtk.Window):
 
         # Sessions notebook page  
         self.sessions_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.sessions_page.set_border_width(15)
 
         self.notebook.append_page(self.sessions_page,Gtk.Label('Sessions'))
         
@@ -336,8 +347,9 @@ class SettingsWindow(Gtk.Window):
 
         self.SessionEditDialog = SessionEditDialog # passed to show_sessions
 
-
+        print('set_current_page',page_number)
         self.show_all()
+        self.notebook.set_current_page(page_number)
 
         
 
@@ -434,7 +446,7 @@ class SettingsWindow(Gtk.Window):
                 checkbutton.set_label("Error: '"+str(id)+"' didn't match anything " )
             else:     
                 # print('Show time target',item_data)
-                checkbutton.set_label(item_data['label']+": "+str(data['type'])+ " "+str(data['value'])+" minutes per "+str(data['within_value'])+" "+str(data['within_unit']) )
+                checkbutton.set_label(item_data['label']+" \n"+str(data['type'])+ " "+str(data['value'])+" minutes per "+str(data['within_value'])+" "+str(data['within_unit']) )
             checkbutton.set_active(data['status'])
 
             # checkbutton.connect("toggled", print, checkbutton.get_active())
@@ -476,9 +488,9 @@ class SettingsWindow(Gtk.Window):
             
             task_data = db_get_item_by_id(id,"tasks")
             if not task_data:
-                checkbutton.set_label("Error: '"+str(id)+"' task missing "+str(command_data['command']))
+                checkbutton.set_label("Error: '"+str(id)+"' task missing \n"+str(command_data['command']))
             else:     
-                checkbutton.set_label(task_data['extended_label']+" "+str(command_data['command']) )
+                checkbutton.set_label(task_data['extended_label']+" \n"+str(command_data['command']) )
             checkbutton.set_active(command_data['status'])
             
             checkbutton.connect("toggled", update_user_setting, conf.user['task_commands'][id], 'status', checkbutton.get_active)

nowfocus/task_window.py

@@ -36,7 +36,7 @@ class TaskWindow(Gtk.Window):
                 # TaskWindow._instance.present()
                 # return None
             except Exception as e:
-                dbg("TaskWindow._instance exception",e,s='taskwindow')
+                dbg("TaskWindow._instance exception",e=e ,s='taskwindow')
 
         TaskWindow._instance = self
 
@@ -197,7 +197,7 @@ class TaskWindow(Gtk.Window):
                     self.buttons_box.add(openable_button)
 
                 except Exception as e:
-                    dbg("error adding todo connector open() to task window ",e, s='taskwindow')
+                    dbg("error adding todo connector open() to task window ",e=e , s='taskwindow')
 
         self.new_task_button = Gtk.Button(label="New Task")
         self.new_task_button.set_property("tooltip-text","Add a new task (Ctrl + N)")
@@ -521,7 +521,7 @@ class TaskWindow(Gtk.Window):
 
 
         except Exception as e:
-            utils.dbg("Error adding task to list"+ str(t['extended_label']), t, e, l=0, s='taskwindow')
+            utils.dbg("Error adding task to list"+ str(t['extended_label']), t, e=e, l=0, s='taskwindow')
             return False
 
 

nowfocus/upgrade.py

@@ -37,14 +37,7 @@ def do_upgrades(app):
 
         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'
@@ -58,6 +51,20 @@ def do_upgrades(app):
         db_schema_version = "0.5.6"
         set_system_db_value("db_schema_version",db_schema_version)
 
+    if db_schema_version == '0.5.6':
+        dbg('Schema Update from', db_schema_version, 'to 0.5.9',l=-1)
+
+        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_schema_version = "0.5.9"
+        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')")

nowfocus/utils.py

@@ -26,6 +26,8 @@ import traceback
 import conf
 notify.init(conf.app_name)
 
+from error_dialog import ErrorDialog
+
 lists = {}
 
 
@@ -66,8 +68,24 @@ def dbg(*data, s="", l=2, e=None, notification=None):
     #     pretty_print(data)
 
     if e and isinstance(e,Exception): 
-        traceback.print_tb(e.__traceback__)
-        print(e,"\n")
+
+        error_report = str(e) + '\n' + traceback.format_exc()
+
+        print(error_report)
+
+        if data:
+            error_report = json.dumps(data,indent=2) + error_report
+
+        print("show ErrorDialog")
+        error_dialog_inst = ErrorDialog(None, error_report)
+        error_dialog_inst.show_all()
+
+        # if level == 0:
+        #     with open(conf.error_log_file,'a') as error_log:
+        #         error_log.write(str(e))
+        #         error_log.write(traceback.format_exc())
+
+
 
 def error_notice(title, details = None, e = None):
     print('ERROR',title,details,e)
@@ -134,7 +152,7 @@ def sec_to_time(sec):
     try:
         int(sec)
     except Exception as e:
-        print("sec to time error", e)
+        dbg("sec to time error", e=e, l=0)
         sec = 0
 
     time = str("{:02d}".format(int(sec // 3600))) + ':' + str("{:02d}".format(int((sec % 3600) // 60))) + ':' + str("{:02d}".format(int(sec % 60)))
@@ -169,7 +187,7 @@ def validate_start_time_str(start_time_string):
         return datetime.strptime(start_time_string,'%Y-%m-%d %H:%M:%S')
 
     except Exception as e:
-        error_notice('Incorrect Start Time Format', start_time_string+" does no match %Y-%m-%d %H:%M:%S", e)
+        dbg('Incorrect Start Time Format', start_time_string+" does no match %Y-%m-%d %H:%M:%S", e=e, l=0)
         return False
 
 
@@ -185,7 +203,7 @@ def open_todo(w=None, i=None, item_type = 'tasks'):
     
     except Exception as e:
         # error_notice('Bonk', "error with "+ c['type']+ " open function ")
-        dbg('open_todo excption, falling back to get_connector_openable ',e,s=todo['type'],l=1)
+        dbg('open_todo exception, falling back to get_connector_openable ',e=e ,s=todo['type'],l=1)
 
         get_connector_openable(None,todo)
     
@@ -266,7 +284,7 @@ def extended_label(i):
     o = ' > '.join(l)
     return o
 
-# TODO cleanup this
+
 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. '''
 
@@ -366,8 +384,7 @@ def reindex_all():
 
     
     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()
 
     return True
@@ -384,8 +401,7 @@ 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'],))
 
     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")))
+
     set_system_db_value('taskindex_update_time', now().strftime("%Y-%m-%d %H:%M:%S"))
 
     return True
@@ -393,10 +409,10 @@ def reindex_one(t):
 
 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']
     
+    update_time = get_system_db_value('taskindex_update_time')
+
+
     # print('taskindex_updated_time',update_time)
     # return datetime.strptime(update_time,'%Y-%m-%d %H:%M:%S')
     return update_time
@@ -654,7 +670,9 @@ def db_get_item_by_id(id, table = 'tasks',dgb_error_level_for_failure=0):
             return {}
 
     except Exception as e:
-        dbg('db_get_item_by_id failed',e,l=dgb_error_level_for_failure)
+        dbg('db_get_item_by_id failed',e=e ,l=dgb_error_level_for_failure)
+        return {}
+
 
 
 def get_todo_by_id(todo_or_todo_id = None):
@@ -704,8 +722,12 @@ def db_save_session(session):
         'priority': "0",
     }
 
+    # dbg('task in db_save_session', session['task'],l=3)
+
     if 'priority' in session['task']:
-        prepared_session['priority']: str(session['task']['priority'])
+        prepared_session['priority'] = str(session['task']['priority'])
+    
+    dbg('db_save_session data:',prepared_session)
     
     db_query("INSERT INTO sessions(start_time, duration, task_id, parent_id, todolist, extended_label,timetracker, notes, priority) VALUES(:start_time, :duration, :task_id, :parent_id, :todolist, :extended_label, :timetracker, :notes, :priority )",prepared_session)
 
@@ -792,7 +814,6 @@ 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")
-
     set_system_db_value('session', json.dumps(db_session))
 
 
@@ -995,7 +1016,7 @@ def refresh_todolist(todo, catch_errors = False):
 
     except Exception as e:
         if catch_errors:
-            dbb(notify='Error Loading '+todo['label']+' i refresh_todolist',e=e)
+            dbg(notification='Error Loading '+todo['label']+' i refresh_todolist',e=e,l=0)
             todos = {'lists': {}, 'tasks':{}}
 
         else:
@@ -1016,13 +1037,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,notification=True)
+    dbg(notification=todo_conf['label']+ " Access Error",e=e ,l=0)
 
 
 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,notification=True)
+    dbg(notification=todo_conf['label']+ " Deactivated",e=e ,l=-1)
 
 
 def get_todolists(use_db_cache = False):
@@ -1058,7 +1079,7 @@ def get_todolists(use_db_cache = False):
                 try:
                     todos = db_get_todolist(todo['id'])
                 except Exception as e:
-                    error_notice('Also Failed to load '+todo['label']+' From cache' ,e=e)
+                    dbg('Also Failed to load '+todo['label']+' From cache' ,e=e,l=0)
                     todos = {'lists': {}, 'tasks':{}}
 
         tasks.update(todos['tasks'])
@@ -1087,7 +1108,7 @@ def get_system_db_value(field, json = False):
             o = json.loads(o)
         return o
     except Exception as e:
-        dbg("Error getting",field, 'from system db',e,l=0)
+        dbg("Error getting",field, 'from system db',e=e ,l=0)
 
 
 def set_system_db_value(field, value, json = False):
@@ -1098,7 +1119,7 @@ def set_system_db_value(field, value, json = False):
         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)
+        dbg("Error setting", field, value, 'in system db',e=e ,l=0)
 
 
 def get_session_from_system_db():
@@ -1110,7 +1131,7 @@ def get_session_from_system_db():
             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)
+        dbg("Error in get_session_from_system_db session",e=e ,l=1)
 
 
 def get_most_recent_list(session = None):
@@ -1139,11 +1160,14 @@ def get_most_recent_list(session = None):
 
 
 def get_default_list_for_new_tasks():
-    # if conf.user['default_list_for_new_tasks'] != 'Most recently used list':
-    #     try:
 
-    # List that was last added to
+    if conf.user['default_list_for_new_tasks'] == 'List that was last added to':
+
+        id = get_system_db_value('last_added_to_list_id')
+        if id and id in lists_cache():
+            return lists_cache()[id]
 
+    # if conf.user['default_list_for_new_tasks'] == 'Most recently used list':
     return get_most_recent_list()
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.5.7
+Version: 0.5.9
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org
@@ -121,12 +121,7 @@ nowfocus is a clean, keyboard-driven time management dashboard that flexibly con
     ```
     bash -c "echo 'open_task_window' > /tmp/nowfocus-pipe"
     ```
-
-
-3. Add the following command to your startup applications: 
-    ```
-    nowfocus --force
-    ``` 
+ 
 
 
 

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

@@ -1,23 +1,24 @@
 nowfocus/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nowfocus/__main__.py,sha256=1WffOUaxlfw0gc_qWY9K78j35AmoxoDDLePoK3wFlE0,33433
-nowfocus/conf.py,sha256=czmeMU7r5DD5fT1cDi2kjwYa5xQSXJoQoeQYsoFMkzc,6757
+nowfocus/__main__.py,sha256=BDNlrtNuQWY4-PxVHKJE1yIyeMTZDQni0OUnWF9uOuk,34069
+nowfocus/conf.py,sha256=fBKbM57teU4-LGcX-hmgnjH5TaP5hwQ7YhmtugDNx74,6804
+nowfocus/error_dialog.py,sha256=DMMGoaqMmcTD6YZT5X6exocEs4sTveCYu03Qgc9fVP8,1799
 nowfocus/example-todo.txt,sha256=o-ZRNiTlSGFbTK9jpdDIi07qHBrpvP0JhBZSk0VlpQU,246
 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/new_task_dialog.py,sha256=TtN0Cr2x3uZ62NvXrxeE1_oVqjQM5OCUY104-TSb-6A,4474
+nowfocus/session_edit_dialog.py,sha256=7gayBGyZc2JlVMnmibVfHt6HL52CXErSoDDgbnaE6Zs,6858
 nowfocus/session_options.py,sha256=mOnyEM3-usKgVvBhESY0TNBcy4FTG-AHP6ETMgB1fQ4,5071
 nowfocus/sessions.csv,sha256=kYpr06yQg_J86NQ4AiYw4RnQchcw3ouPKVYa1lYDUNo,39
-nowfocus/settings.py,sha256=0d6nZw1t36TjyUr9KQ_wDwuh2SB64gUkZeHEjEV867Y,35169
+nowfocus/settings.py,sha256=rb4kotRJLbNgPSMaN1EfhJzJ0F4xBCI_MZf30SlMazs,35796
 nowfocus/styles.css,sha256=PG1SrLkwSSay8M2VKeRcE0UdK54ndsEDFnRLRkmP-9M,510
-nowfocus/task_window.py,sha256=f6eaxrFwI5POJG2tZX0H3AKFA6dGt_RH42y2ydHqosY,28875
-nowfocus/upgrade.py,sha256=S0nyWmVLnukWY0QhC5873HFQZpcWuZ_XEPU4QTBtX3s,3379
+nowfocus/task_window.py,sha256=zcR1kk2f_vtwXiIm4PY_sKZ5wsfhtEfg9Hl8X9H0TRM,28883
+nowfocus/upgrade.py,sha256=ckCsXnAO8goLNZLvBWmhFQeM0sDJ_bsn5EAV3vsLiwY,3600
 nowfocus/user_idle_time.py,sha256=I44Ip-iGGzWAiHnM2_06jNqhCne9y1SbvcBI-nYBolU,2365
-nowfocus/utils.py,sha256=tVa4rJf0QKhDU5as4-BSIFvuZLMsxGScJkxGRYibtzA,49187
+nowfocus/utils.py,sha256=s187QkyJrD8lrlsFLW1OV9TV0tK9-eOi_gVwvn6W86U,49520
 nowfocus/connectors/activitywatch.py,sha256=QbkOmjIOiVwccWc2xhhePd0Abww5vEiVpCNjeqOyYGg,921
 nowfocus/connectors/caldav.py,sha256=PeM_9yJC8W17L8Y5AyS75o6GfzTrPoMYKIvetND8T78,5089
 nowfocus/connectors/csv.py,sha256=FwMpHM5lPIT90HKBCQUncpaW7zqFjlHjMwKR0-XWg-4,821
 nowfocus/connectors/psc_timetracker.py,sha256=gyx0bQkOC467lkF7tTcoKD451u3WPEEBjAvNeZc6W5s,9767
-nowfocus/connectors/taskwarrior.py,sha256=bs1h5lxPxruNb6Pqf6HP-Do29i6NUdbBVDp_D5s06Ps,3172
+nowfocus/connectors/taskwarrior.py,sha256=hDhbiP7tiIzK1QJCSlcA3msrsSCA6MQtJ6TO1VHsDLM,3423
 nowfocus/connectors/timewarrior.py,sha256=0Hra0GVPYdRqGtG_TbH3gzfUl192hH1DO2_WrDdrACM,698
 nowfocus/connectors/todo_template.py,sha256=R37fA2LXo8_LpWIgqozytI5RqIUjGggFHup25xTykII,1572
 nowfocus/connectors/todotxt.py,sha256=QCZjbIhY4Lm37YD0GsKJQUqbj7s3eYmZGgRwUCndZ5w,3857
@@ -52,9 +53,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.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.9.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
+nowfocus-0.5.9.dist-info/METADATA,sha256=TBWJV37J-P1zGbLQlDAMB_G-ejxuSxsdufG7wupsem8,6707
+nowfocus-0.5.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nowfocus-0.5.9.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
+nowfocus-0.5.9.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
+nowfocus-0.5.9.dist-info/RECORD,,

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

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