nowfocus 0.4.4__tar.gz → 0.5.0__tar.gz

{nowfocus-0.4.4/src/nowfocus.egg-info → nowfocus-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.4.4
+Version: 0.5.0
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org

{nowfocus-0.4.4 → nowfocus-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nowfocus"
-version = "0.4.4"
+version = "0.5.0"
 authors = [
   { name="AltruistEnterprises" },
 ]

{nowfocus-0.4.4 → nowfocus-0.5.0}/src/nowfocus/__main__.py

@@ -437,7 +437,7 @@ class Application(Gtk.Application):
         self.task_running_menu_additions()
 
         self.menu.show_all()
-        print("task data",task_data['data'])
+        dbg("Starting",task_data['extended_label'])
 
         if task_data['id'] in conf.user['task_commands']:
             command_data = conf.user['task_commands'][task_data['id']]

{nowfocus-0.4.4 → nowfocus-0.5.0}/src/nowfocus/conf.py

@@ -162,8 +162,8 @@ for key, val in prototype_settings.items():
 # print(json.dumps(connectors['todolists'], indent=4))
 
 
-with open(settings_file,"w") as settings_file:
-    json.dump(user, settings_file)
+with open(settings_file,"w") as file:
+    json.dump(user, file)
 
 todo_connectors = {}
 timetracker_connectors = {}

{nowfocus-0.4.4 → nowfocus-0.5.0}/src/nowfocus/install.py

@@ -62,11 +62,11 @@ def db_init():
 
         # , tags TEXT
         
-        db_query("CREATE TABLE sessions (start_time TEXT, duration INTEGER, task_id TEXT, parent_id TEXT, todolist TEXT, extended_label TEXT, notes TEXT, timetracker TEXT);")
+        db_query("CREATE TABLE sessions (start_time TEXT, duration INTEGER, task_id TEXT, parent_id TEXT, todolist TEXT, extended_label TEXT, notes TEXT, priority INTEGER DEFAULT 0, timetracker TEXT);")
 
         db_query("CREATE TABLE system (field TEXT PRIMARY KEY NOT NULL, value TEXT);")
 
-        db_query("INSERT INTO system(field, value) VALUES('db_schema_version', '0.4')")
+        db_query("INSERT INTO system(field, value) VALUES('db_schema_version', '0.5')")
      
 
 def copy_desktop_integration_files():

{nowfocus-0.4.4 → nowfocus-0.5.0}/src/nowfocus/task_window.py

@@ -390,7 +390,7 @@ class TaskWindow(Gtk.Window):
             self.r_sidebar.set_size_request(350, -1)
 
             focus_percent_label = Gtk.Label()
-            focus_percent_label.set_markup("<b>Focus: "+str(utils.get_percent_time_focused())+"%</b>")
+            focus_percent_label.set_markup("<b>"+str(utils.get_percent_time_focused())+"% Focused. "+str(utils.get_percent_time_priority())+"% Priority Tasks</b>")
             self.r_sidebar.pack_start(focus_percent_label, False, True, 25)
 
             self.sessions_scrolledwindow = Gtk.ScrolledWindow()

{nowfocus-0.4.4 → nowfocus-0.5.0}/src/nowfocus/utils.py

@@ -30,72 +30,45 @@ notify.init(conf.app_name)
 lists = {}
 
 
-def dbg(*data, **kwargs):
-    ''' Any number of positional args then kwargs 
-    l=level {-1: Default output, 0:Error, 1:Warning, 2:Info, 3:Details}  
-
-    s=system (Debuggable systems: 'taskwindow','signals','todoloading','user_settings', 'targets')
-
-    If the optional 'notify' arg is true, a notification will be generated.
-
-    if the optional 'e' arg is present and an exception object its traceback will be printed
+def dbg(*data, s="", l=2, e=None, notify=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.
+    e (Exception object) traceback will be printed
     
     '''
 
     levels = {-1:'', 0:'Error', 1:'Warning', 2:'Info', 3:'Details'}
 
-    # default system and level
-    system = ''
-    level = 2
-
-    if 's' in kwargs: system = kwargs['s']
+    system = s
+    level = int(l)
 
-    if 'l' in kwargs: level = int(kwargs['l'])
-
-    if 'e' in kwargs and isinstance(kwargs['e'],Exception): 
-        print(data)
-        traceback.print_tb(kwargs['e'].__traceback__)
 
     if "all" in conf.debug_systems or system in conf.debug_systems or level <= conf.debug_level: 
 
-        if 'notify' in kwargs:
-            # Will this cause a segfault if called from a bg thread?
-            notify.Notification.new(conf.app_name+" "+levels[level], str(kwargs['notify']), None).show()
+        if notify:
+            notify.Notification.new(conf.app_name+" "+levels[level], str(notify), None).show()
 
-        # o = "Debug "+system+" "+levels[level], tuple(filter(None,data))
         filter(None,data)
         if len(data) == 1:
             data = data[0]
         if system:
             system = "- "+system
 
-        print(data, system+" "+levels[level])
-
-        # if isinstance(data,str): 
-        #     # print('str dbg data')
-        #     print(data, system+" "+levels[level])
-        # else:
-        #     print('dbg data',type(data),len(data))
-        #     print(data)
-        #     # o = tuple(filter(None,data)), "("+system+" "+levels[level]+")"
-        #     o = data, system+" "+levels[level]
-        #     pretty_print(o)
+        print(json.dumps(data,indent=2), system+" "+levels[level])
 
     # else:
-    #     # debug the debug
-    #     print("Not displaying dbg ")
-    #     # pretty_print(data)
+    #     print("Not displaying dbg s:",system,'conf.debug_systems',conf.debug_systems)
+    #     pretty_print(data)
 
+    if e and isinstance(e,Exception): 
+        traceback.print_tb(e.__traceback__)
 
 def error_notice(title, details = None, e = None):
     print('ERROR',title,details,e)
-
     notify.Notification.new(str(title),str(details), None).show()
 
-# try:
-#     raise FileExistsError("This is not except-able!")
-# except Exception as e:
-#     dbg('test exception',e=e)
 
 def pretty_dict(i, item_sep = ", ", use_indents=True, indent=''):
     o = ''
@@ -128,15 +101,19 @@ def pretty_print(i):
 
 
 def timeit(process=None):
+    # if 'performance' in conf.debug_systems or conf.debug_level >= 2:
     if not process:
         process = inspect.currentframe().f_back.f_code.co_name
 
     if process in conf.timers.keys():
-        print('timeit', process, time.time() - conf.timers[process])
+        timer = time.time() - conf.timers[process]
+        dbg(process, 'took', timer, 'seconds', s='performance',l=2)
         del conf.timers[process]
+        return timer
     else:
-        print('timeit', process, 'started')
+        dbg(process, 'performance timer started',s='performance',l=3)
         conf.timers[process] = time.time()
+        return process
 
 
 def time_to_sec(time=None):
@@ -385,14 +362,12 @@ def db_schema_update():
 
         db_query("ALTER TABLE sessions ADD COLUMN extended_label TEXT")
 
-        # add default values for priority and data 
         # 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")
 
-        # add new columns
         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")
@@ -419,16 +394,31 @@ def db_schema_update():
         print('adding timetracker column to session table')
 
         for todolist_id, todo in conf.user['todolists'].items():
-            print("set timetracker to ",todo['timetracker'], " for sessions from ",todolist_id)
-
             db_query("UPDATE sessions SET timetracker = ? WHERE todolist = ?",(todo['timetracker'],todolist_id) )
 
         db_schema_version = 0.4
 
-    # if 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.5
+    #     db_schema_version = 0.6
 
 
     dbg('db_schema_version', db_schema_version,s='db')
@@ -694,10 +684,10 @@ def db_cleanup(widget = None):
                 print('Relinking',s['task_id'],'to', match['id'])
                 db_query("UPDATE sessions SET task_id = ?, parent_id = ? WHERE task_id = ?",(match['id'],match['parent_id'],s['task_id']))
                 # print(pretty_print(possible_matches))
-            else:
+            # else:
                 # not very good yet...
-                search = db_query("SELECT *, rank FROM taskindex WHERE extended_label MATCH ? ORDER BY rank DESC",(s['extended_label'].replace('>','').replace('?',''),))
-                print('fuzzy search results',(search,))
+                # search = db_query("SELECT *, rank FROM taskindex WHERE extended_label MATCH ? ORDER BY rank DESC",(s['extended_label'].replace('>','').replace('?',''),))
+                # print('fuzzy search results',(search,))
 
     # update extended_labels
     # mismatched_sessions = db_query("SELECT * FROM sessions WHERE extended_label NOT IN (SELECT extended_label FROM tasks)")
@@ -710,7 +700,7 @@ def db_cleanup(widget = None):
 
     # exit()
 
-def db_get_item_by_id(id,table = 'tasks'):
+def db_get_item_by_id(id,table = 'tasks',dgb_error_level_for_failure=0):
 
     if table in ['task','list']:
         table = table+'s'
@@ -724,11 +714,11 @@ def db_get_item_by_id(id,table = 'tasks'):
         if data:
             return proc_db_item(data[0],table)
         else:
-            dbg('db_get_item_by_id from '+table+' failed for id +',id,l=0)
+            dbg('db_get_item_by_id from '+table+' failed for id',id,l=dgb_error_level_for_failure)
             return {}
 
     except Exception as e:
-        dbg('db_get_item_by_id failed',e,l=0)
+        dbg('db_get_item_by_id failed',e,l=dgb_error_level_for_failure)
 
 
 def get_todo_by_id(todo_or_todo_id = None):
@@ -765,6 +755,7 @@ def db_get_todolist(todolist_id):
 
 
 def db_save_session(session):
+    dbg("db_save_session",session)
     prepared_session = {
         'start_time' : str(session['start_time'].strftime("%Y-%m-%d %H:%M:%S")),
         'duration': round(session['duration']),
@@ -774,9 +765,13 @@ def db_save_session(session):
         'extended_label': str(session['extended_label']),
         'timetracker': str(session['timetracker']),
         'notes': str(session['notes']),
+        'priority': "0",
     }
+
+    if 'priority' in session['task']:
+        prepared_session['priority']: str(session['task']['priority'])
     
-    db_query("INSERT INTO sessions(start_time, duration, task_id, parent_id, todolist, extended_label,timetracker, notes) VALUES(:start_time, :duration, :task_id, :parent_id, :todolist, :extended_label, :timetracker, :notes )",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)
 
     reindex(session['task'])
 
@@ -803,6 +798,18 @@ def default_session():
     return o
 
 
+def get_sessions(conditions_sql = None, order_by = 'start_time', limit = 35, use_sessions_timeframe_setting = False):
+
+    conditions = ''
+
+    if conditions_sql:
+        conditions += " AND "+conditions_sql
+
+    if use_sessions_timeframe_setting:
+        conditions += " AND "+sessions_timeframe_sql()
+
+    return db_query(" SELECT * FROM sessions WHERE 1=1 "+conditions+" ORDER BY "+order_by+" DESC LIMIT ? ",(limit,)) 
+
 
 def show_sessions(widget = None, self = None, sessions_box = None, label_text = "Most Recent Sessions", order_by = 'start_time', limit = 35, passed_sessions = None, truncate = None ):
 
@@ -844,6 +851,7 @@ def show_sessions(widget = None, self = None, sessions_box = None, label_text =
 
     sessions_box.show_all()
 
+
 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)
@@ -889,12 +897,24 @@ def get_percent_time_focused():
 
     focus_seconds = db_query("SELECT SUM(duration) as seconds FROM sessions WHERE sessions.task_id != 'Randomness' AND "+ sessions_timeframe_sql())[0]['seconds']
 
-    percent = round(divide(focus_seconds,(focus_seconds + rand_seconds)) * 100, 2)
+    percent = round(divide(focus_seconds,(focus_seconds + rand_seconds)) * 100)
 
     dbg('get_percent_time_focused', str(percent)+"%", 'focus_seconds', focus_seconds, 'rand_seconds', rand_seconds)
 
     return percent
 
+def get_percent_time_priority():
+
+    priority_seconds = db_query("SELECT SUM(duration) as seconds FROM sessions WHERE sessions.task_id = 'Randomness' AND "+ sessions_timeframe_sql())[0]['seconds']
+
+    total_seconds = db_query("SELECT SUM(duration) as seconds FROM sessions WHERE "+ sessions_timeframe_sql())[0]['seconds']
+
+    percent = round(divide(priority_seconds,(total_seconds)) * 100)
+
+    dbg('get_percent_time_focused', str(percent)+"%", 'focus_seconds', priority_seconds, 'rand_seconds', total_seconds)
+
+    return percent
+
 
 def get_recent_tasks(count = 15):
     data = db_query("SELECT DISTINCT tasks.* FROM tasks JOIN sessions ON sessions.task_id = tasks.id WHERE tasks.status = 1 GROUP BY tasks.id ORDER BY MAX(sessions.start_time) DESC LIMIT ?",(count,))
@@ -1067,7 +1087,6 @@ def handle_todo_file_read_error(todo_conf,e):
     dbg(todo_conf['label']+ " Deactivated",e,l=-1,notify=True)
 
 
-
 def get_todolists(use_db_cache = False):
     tasks = {}
     lists = {}  
@@ -1261,7 +1280,7 @@ def add_todos_to_menu(target_menu = None, menu_tasks = None, list_menus = None,
                     list_menus[l['parent_id']].append(list_menu_items[list_id])
             
             except Exception as e:
-                dbg('Error adding list to menu',l,e=e,l=0)
+                dbg('Error adding list to menu',l['extended_label'],e=e,l=0,s='menu')
 
 
 

{nowfocus-0.4.4 → nowfocus-0.5.0/src/nowfocus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.4.4
+Version: 0.5.0
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org