nowfocus 0.2.13__py3-none-any.whl → 0.4.2__py3-none-any.whl

nowfocus/__main__.py

@@ -13,6 +13,7 @@ from playsound3 import playsound
 import setproctitle
 import psutil
 import argparse 
+import traceback
 
 import gi
 gi.require_version('Gtk', '3.0')
@@ -28,7 +29,7 @@ except Exception as e:
     gi.require_version('AppIndicator3', '0.1')
     from gi.repository import AppIndicator3 as appindicator 
 
-from dbus_idle import IdleMonitor
+# from dbus_idle import IdleMonitor
 
 # Set working dir to file location 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
@@ -39,6 +40,8 @@ sys.path.append(os.path.dirname(__file__))
 # from . import conf # this works in module context but not running as pile-of-files 
 import conf # this works running as pile-of-files but not in module context without sys.path.append 
 
+from user_idle_time import UserIdleTime
+
 import utils
 from utils import *
 
@@ -54,20 +57,24 @@ setproctitle.setproctitle(conf.app_name)
 print(conf.app_name +" running from " + os.path.dirname(os.path.realpath(__file__)))
 
 class Application(Gtk.Application):
+    icon_tick_number = 0
+
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, application_id="org.example.myapp", **kwargs)
+        super().__init__(*args, application_id="org.nowfocus.nowfocus", **kwargs)
+
+        # try:
+        #     # To put everything here... 
+        #     # this doesn't work because as soon as an exception occurs ii jumps to the handler and breaks all the following code.
         
+        # 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 ')
+        #     traceback.print_tb(e.__traceback__)
+        #     return None
+            
         self.window = None
 
         self.is_running = False
-        self.session = {
-            "label":"Randomness",
-            "extended_label": 'Randomness',
-            "start_time":datetime.now(),
-            "duration":0,
-            'task':{},
-            'notes':'',
-        }
+        self.session = default_session()
 
         self.menu_tasks = {}
         self.list_menus = {}
@@ -80,7 +87,7 @@ class Application(Gtk.Application):
         # menu.set_reserve_toggle_size(False) # skip menu left padding,  doesn't work 
 
         utils.db_init()
-        utils.db_update()
+        utils.db_schema_update()
 
 
         # self.update_menu()
@@ -90,7 +97,6 @@ class Application(Gtk.Application):
 
         self.indicator.set_menu(self.menu)
 
-        # main_tick_timer = GLib.timeout_add_seconds(conf.user['tick_interval'], self.tick)
         main_tick_timer = GLib.timeout_add_seconds(1, self.tick)
 
         try:
@@ -105,7 +111,7 @@ class Application(Gtk.Application):
         except Exception as e:
             dbg("Error resuming session",e,l=1)
 
-        utils.start_todo_file_watchers()
+        self.UserIdleTime = UserIdleTime()
 
         self.pipethread = threading.Thread(target=self.check_pipe)
         self.pipethread.daemon = True
@@ -133,7 +139,6 @@ class Application(Gtk.Application):
 
 
 
-
     def print_time_totals(self = None, widget = None):
 
         # SELECT extended_label, (SUM(duration) / 60 ) FROM sessions GROUP BY extended_label
@@ -157,39 +162,40 @@ class Application(Gtk.Application):
 
     def quit(self, widget_or_signal_source=None, condition=None):
         print("Adios ", conf.app_name)
-        # print("widget_or_signal_source ", widget_or_signal_source)
-        # print("condition ", condition)
         
         if self.is_running:
-            print('Caching active session', self.session['label'])
+            dbg('Caching active session', self.session['label'])
             db_set_session_cache(self.session)
+
         try:
-            # print("before os.remove(conf.pipe)")
             os.remove(conf.pipe)
-            print("Pipe removed")
         except Exception as e:
-            print("Error removing conf.pipe in quit",e)
+            dbd("Error removing conf.pipe in quit",e)
 
         notify.uninit()
         Gtk.main_quit()
         exit()
 
 
-    def check_afk_time(self):
+    def seconds_since_user_active(self):
         # returns seconds of inactivity
-        # See https://stackoverflow.com/questions/67083083/how-to-get-idle-time-in-linux  or 
+        # See https://stackoverflow.com/questions/67083083/how-to-get-idle-time-in-linux or 
 
         # Works on x11 but not wayland
         # Requires xprintidle (sudo apt install xprintidle)
         # idle_time = int(int(subprocess.getoutput('xprintidle')) / 1000)
 
-        # Currently using: https://github.com/bkbilly/dbus_idle
+        # Version that works, using: https://github.com/bkbilly/dbus_idle
+        # but has many deps
         # Requires: 
         #   sudo apt install meson libdbus-glib-1-dev patchelf
         #   pip install dbus-idle
 
-        idle_time = int(int(IdleMonitor().get_dbus_idle()) / 1000)
-        return idle_time
+        # idle_time = int(int(IdleMonitor().get_dbus_idle()) / 1000)
+        # return idle_time
+
+        return self.UserIdleTime.get()
+        
 
 
     def toggle_do_not_disturb(self, widget):
@@ -210,7 +216,7 @@ class Application(Gtk.Application):
         if 'do-not-disturb' in self.session:
             return None
 
-        afk_time = self.check_afk_time()
+        afk_time = self.seconds_since_user_active()
         # print("Idle time: "+str(afk_time))
 
         dbg('Last todo todo_sync_time', conf.todo_sync_time, 'Time diff',int(time_difference(conf.todo_sync_time)),'Auto refresh interval * 60', (conf.user['todolist_refresh_interval'] * 60), s="todoloading", l=3 )
@@ -224,7 +230,7 @@ class Application(Gtk.Application):
         
         if(self.is_running == False):
 
-            if float(minutes / conf.user['randomness_interrupt_interval']).is_integer():
+            if num_is_multiple_of(minutes,conf.user['randomness_interrupt_interval']):
                 if afk_time < 30:
                     
                     notify.Notification.new("What Am I doing?","Your randomness timer is at "+str(minutes)+" minutes. ", None).show()
@@ -243,7 +249,6 @@ class Application(Gtk.Application):
                 # only show this once
                 if afk_time < 181:
                     self.open_task_window(None,{'afk_time':afk_time})
-                    # session_options_dialog(None, 'test input_data')
             else:
                 if self.session['label'] in conf.user['custom_pomodoro_intervals']:
                     check = conf.user['custom_pomodoro_intervals'][self.session['label']]
@@ -260,7 +265,7 @@ class Application(Gtk.Application):
                     t = self.session['target']
 
                     t['percent'] = round(( (t['starting_value'] + minutes) / t['value'] ) * 100,1)
-                    print("At ", t['percent'], "% of ", t['scope'],  " target")
+                    print("At", t['percent'], "% of ", t['scope'],  " target")
 
                     if t['type'] == 'max':
                         if t['percent'] >= 100:
@@ -273,66 +278,80 @@ class Application(Gtk.Application):
                         notify.Notification.new("Good job on doing "+self.session['label'],"You've reached your target of "+str(t['value'])+" minutes "+str(t['within_value'])+" "+ t['within_unit'], None).show()
                         
                         playsound('sound/xylophone-chord.mp3',False)
-
                         
-                    # maybe add a target % to the session and show with tick
-
-    icon_tick_number = 0
-
+    
     def tick(self):
-        menu = self.menu    
-        indicator = self.indicator
 
         # check for suspend indicated by gap in tick intervals
-        time_since_last_tick = round(time_difference(self.session['start_time'])  - self.session['duration'])
+        time_since_last_tick = round(time_difference(self.session['start_time']) - self.session['duration'])
         if time_since_last_tick > 10:
-            print(time_since_last_tick, " seconds since last tick. Probably just woke from suspend. ")
-            
+            dbg(time_since_last_tick, " seconds since last tick. Probably just woke from suspend. ")
             if self.is_running:
                 self.open_task_window(None,{'afk_time':time_since_last_tick})
             else:
-                print("resetting randomness timer")
-                self.session['duration'] = 0
                 self.session['start_time'] = now()
 
-        # print("tick!")
-        self.session['duration'] = int(time_difference(self.session['start_time']))
+        duration = self.session['duration'] = int(time_difference(self.session['start_time']))
 
-        if(self.session['duration'] > 2 and (int(self.session['duration']) / 60).is_integer()):
+        if num_is_multiple_of(duration,60):
             self.tock()
 
-        if(self.is_running == True):
-            self.icon_tick_number = self.icon_tick_number + 1
+        if self.is_running == True:
+            self.icon_tick_number += 1
             
             if self.icon_tick_number > 8:
                 self.icon_tick_number = 1    
 
-            label = self.session['label'] + ": " + sec_to_time(self.session['duration'])
+            label = self.session['label'] + ": " + sec_to_time(duration)
+
+            icon = 'icon-'+str(self.icon_tick_number)+'.svg'
 
-            indicator.set_icon_full(os.path.abspath('icon/icon-'+str(self.icon_tick_number)+'.svg'),label) 
-        
         else:
 
-            # label = random.choice(conf.idle_messages) # Cool but makes menu bounce around #Could be paused when the menu opens
-            label = conf.user['default_text']
-            if self.session['duration'] > 60 and self.session['duration'] % 2:
-                indicator.set_icon_full(os.path.abspath('icon/icon-red.svg'),label)
+            label = conf.user['default_text'] +" "+ sec_to_time(duration)
+
+            if duration > 60 and num_is_multiple_of(duration, 2):
+                icon = 'icon-red.svg'
+
             else:
-                indicator.set_icon_full(os.path.abspath('icon/icon-1.svg'),label)
+                icon = 'icon-1.svg'
 
         # https://lazka.github.io/pgi-docs/#AyatanaAppIndicator3-0.1/classes/Indicator.html#AyatanaAppIndicator3.Indicator.set_label
-        indicator.set_label(label, "Wide")
 
-        for todo in conf.todo_sync_required:
-            # print('tick noticed a todo needing refreshment, time since refresh: ',time_difference(conf.todo_sync_times[todo]))
+        self.indicator.set_icon_full(os.path.abspath('icon/'+icon),label)
+        self.indicator.set_label(label,label)
 
-            if time_difference(conf.todo_sync_times[todo]) > 4:
-                # print('tick noticed a todo needing refreshment')
-                self.async_refresh(None,conf.user['todolists'][todo])
-        conf.todo_sync_required = {}
+
+        if num_is_multiple_of(self.icon_tick_number,3):
+            self.refresh_all_changed_todo_files()
+ 
         return True
 
 
+    def refresh_all_changed_todo_files(self):
+        for id, todo_config in conf.user['todolists'].items():
+            if todo_config['status'] and 'watch_file' in todo_config:
+                self.refresh_todo_if_file_changed(todo_config)
+
+
+    def refresh_todo_if_file_changed(self, todo_config):
+
+        try:
+            todo_m_time = round(os.stat(todo_config['file']).st_mtime)
+               
+            if todo_config['id'] not in conf.todo_file_change_times:
+                conf.todo_file_change_times[todo_config['id']] = todo_m_time
+
+            elif todo_m_time != conf.todo_file_change_times[todo_config['id']]:
+                dbg(todo_config['id']+" file was changed!",s='todoloading')
+                self.async_refresh(None,todo_config)
+                conf.todo_file_change_times[todo_config['id']] = todo_m_time
+        
+        except Exception as e:
+            # TODO: consider how to quietly handle errors when refresh is not prompted by the user and temporarily disabling  
+            handle_todo_read_error(todo_config,e)
+
+
     def start_task(self, w = None, task_data_or_id = None, transfer_current_session_time = False):
 
         if isinstance(task_data_or_id, dict):
@@ -356,7 +375,10 @@ class Application(Gtk.Application):
 
             if(self.is_running == True):
                 self.stop_task()
-            
+            elif(self.session['duration'] > 60):
+                # Log randomness session (to internal db only) if longer than one minute
+                utils.db_save_session(self.session)
+  
         
         self.is_running = True
         
@@ -450,26 +472,20 @@ class Application(Gtk.Application):
         try:
 
             done_thread = threading.Thread(target=conf.todo_connectors[todolist_conf['type']].mark_task_done, args=(task,) )
+
             conf.todo_sync_times[todolist_conf['id']] = now() # this is to avoid causing a refresh, perhaps not the best though
             
-            # Other Options: 
-            #   make a custom class extending Thread with callback method that runs del conf.file_watch_ignores[todolist_conf['id']]
-            #       Complicated
-            #   deal with file_watch_ignores in the connector
-            #       poor seperation
-            #   
             done_thread.start()
             
             db_query("UPDATE tasks set status = '0' WHERE id = ? ",(task['id'],) )
             utils.reindex_one(task)
 
-            # print('remove menu item')
             self.menu_tasks[task['id']].destroy()
-                
+
             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 )
+            error_notice('Error Marking Task Done'," Marking "+ task['label']+" as done in "+todolist_conf['label']+" had a serious failure", e=e )
 
 
 
@@ -533,19 +549,12 @@ class Application(Gtk.Application):
                     self.menu.show_all()
 
             self.is_running = False
-            # print(utils.get_times(task))
             if action != 'cancel':
                 notify.Notification.new("Focused on "+session['label']+" for "+sec_to_time(session['duration']),utils.pretty_dict(utils.get_times(task)), None).show()
                 # notify.Notification.new(action.capitalize()+" "+session['label']+" "+sec_to_time(session['duration']),utils.pretty_dict(utils.get_times(task)), None).show()
         
             # Start randomness timer
-            self.session = {
-                "label": 'Randomness',
-                "extended_label": 'Randomness',
-                "start_time": now(),
-                "duration":0,
-                "task":{}
-            }
+            self.session = default_session()
 
             self.tick()
 
@@ -554,9 +563,6 @@ class Application(Gtk.Application):
             self.menu.get_children()[0].destroy()
             self.do_not_disturb_menu_item.set_label("Do Not Disturb")
 
-        else:
-            print('no task running!')
-
 
     def task_running_menu_additions(self):
         
@@ -577,7 +583,7 @@ class Application(Gtk.Application):
 
     def async_refresh(self, w=None, single_todo = None):
 
-        self.indicator.set_label("Refreshing Todolists", "Wide")
+        self.indicator.set_label("Refreshing Todolists", "Refreshing Todolists")
         menu_item = Gtk.MenuItem.new_with_label("Refreshing Todolists")
         self.menu.append(menu_item) 
         self.menu.show_all()

nowfocus/conf.py

@@ -52,20 +52,19 @@ connectors = {
 todo_sync_time = datetime.now() 
 todo_sync_times = {}
 
-todo_sync_required = {}
-file_watchers = {}
-file_watch_ignores = {}
+todo_file_change_times = {}
+timers = {}
 
 prototype_settings = {
         "pomodoro_interval": 40,
         "open_task_window_fullscreen": True,
+        "show_task_window_sidebars": False,
         "randomness_interrupt_interval":5,
         "default_text": "What am I doing?",
         "todolist_refresh_interval":1,
-        "version":0.2,
+        "version":0.4,
         "display_todolist_as_top_level_list":'auto',
         'max_top_level_menu_items':10,
-        # 'tick_interval':1,
         'hours_search_timeframe':'this year',
         'invoice_hourly_rate':0,
 

nowfocus/connectors/todotxt.py

@@ -39,7 +39,6 @@ def add_new_task(user_conf,list,task_label):
 
     todotxt.add(task)
     todotxt.save()
-    # task.add_project
 
     t = {
             'id':task_label,
@@ -87,6 +86,7 @@ def get_todos(user_conf):
             }
         }
 
+    priority_letter_to_number_map = {'A':1,'B':2,'C':3,'D':4}
 
     todotxt = pytodotxt.TodoTxt(user_conf['file'])
     for t in todotxt.parse():
@@ -99,7 +99,6 @@ def get_todos(user_conf):
             'parent_id':user_conf['id'],
             'parent_label':user_conf['label'],
             'status':1,
-            # 'priority':1 max, 5 min, 0 none,
             'todolist':user_conf['id'],
             'data':t.attributes #TODO: add other things like date etc
         }
@@ -107,6 +106,12 @@ def get_todos(user_conf):
         if t.is_completed:
             tasks[id]['status'] = 0
 
+        if t.priority:
+            try:
+                tasks[id]['priority'] = priority_letter_to_number_map[t.priority]
+            except: 
+                tasks[id]['priority'] = 5
+            
 
         if t.projects:
             l = t.projects[0]
@@ -137,5 +142,5 @@ def get_todos(user_conf):
 def launch(user_conf, item = None, category = None):
     ''' Open todolist '''
 
-    # It would b very nice to open a the right line number but xdg-open doesn't support that...
+    # It would b very nice to open the right line number but xdg-open doesn't support that...
     utils.open_external(user_conf['file'])

nowfocus/connectors/txt.py

@@ -108,7 +108,7 @@ def mark_task_done(task):
             if data[line_no].strip().startswith('[ ]'):
                 data[line_no] = data[line_no].replace('[ ]', '[x]')
             else:
-                data[line_no] = data[line_no].replace(data[line_no].lstrip(), '[x] '+ data[line_no].lstrip() ) 
+                data[line_no] = data[line_no].replace(data[line_no].lstrip(), '[x]'+ data[line_no].lstrip() ) 
 
             # write everything back
             with open(file_uri, 'w') as file:
@@ -176,7 +176,18 @@ def get_todos(user_conf):
                 status = 0
 
             label = label.removeprefix('[ ]').removeprefix('[]').strip()
-            #TODO: use markdown title syntax as list name in addition to indentation 
+            #TODO: use markdown title syntax as list name in addition to indentation? 
+
+            # tags = ''
+            # # hashtag tagging
+            # if label.split("#").len() > 1:
+            #     parts = label.split("#")
+            #     print("label has hashtag",parts)
+
+            #     label = parts[0].strip()
+            #     del parts[0]
+            #     tags = ",".join(parts)
+
 
             indent = len(line) - len(line.lstrip())
             indent_str = line[0:indent]
@@ -229,6 +240,7 @@ def get_todos(user_conf):
                     'todolist':user_conf['id'],
                     'status': status,
                     'priority': priority,
+                    # 'tags':tags,
                     'data':{
                         'line_no':line_no,
                         'original_line':line,

nowfocus/connectors/vikunja.py

@@ -9,8 +9,6 @@ import requests
 import conf
 import utils
 
-# UPDATE sessions SET task_id = "Vikunja_t" || task_id WHERE todolist = 'Vikunja';
-# UPDATE sessions SET parent_id = "Vikunja_l" || parent_id WHERE todolist = 'Vikunja';
 
 def vikunja_item_id(id, item_type, user_conf):
     return user_conf['id'] +'_'+ item_type[0] + str(id)
@@ -20,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=0)
+    utils.dbg('add_new_task() parent_list',parent_list, l=-1)
 
     response = requests.put(user_conf['url']+"api/v1/projects/"+str(parent_list['data']['id'])+"/tasks",json=data, headers=head)
 
@@ -104,7 +102,6 @@ def get_todos(user_conf):
         }
     
 
-    priorities = {'DO NOW':1,'Urgent':2,'high':3}
     headers = {"Authorization": "Bearer "+user_conf['token']}
     projects_lists = requests.get(user_conf['url']+"api/v1/projects", headers=headers).json()
 
@@ -139,6 +136,9 @@ def get_todos(user_conf):
         
         lists[id]['data']['accepts_tasks'] = True
 
+        # print(p['title']+' is_archived:',p['is_archived'])
+        # BUG: archived list aren't provided (But used to be ?) so sublists end up orphaned and dangerous... 
+
         if p['is_archived']: 
             lists[id]['status'] = -1
         else:
@@ -152,6 +152,10 @@ def get_todos(user_conf):
             if parent_id in lists:
                 lists[id]['parent_label'] = lists[parent_id]['label']
 
+                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). 
 
@@ -204,7 +208,6 @@ def get_todos(user_conf):
     # ?per_page=10000
 
 
-
     response = requests.get(user_conf['url']+"api/v1/tasks/all", headers=headers)
     all_tasks = response.json()
 
@@ -218,8 +221,6 @@ def get_todos(user_conf):
     # print(json.dumps(all_tasks, indent=4))
     utils.dbg("Got ",len(all_tasks),"Vikunja tasks", s='vikunja', l=2 )
 
-    utils.dbg("Got ",len(all_tasks),"Vikunja tasks", s='vikunja', l=2 )
-
     for i, itemIter in enumerate(all_tasks):
 
         t = all_tasks[i]
@@ -228,7 +229,7 @@ def get_todos(user_conf):
 
         # utils.dbg(t, s='vikunja', l=3)
 
-        # Limit to asks assigned, created by, or favorated by user
+        # Limit to tasks assigned, created by, or favorated by user
         if user_conf["username"]:
             if t['is_favorite'] != True:
 
@@ -264,13 +265,12 @@ def get_todos(user_conf):
                 tasks[id]['status'] = -1
 
         except Exception as e:
-            print("No list found for", t['title']," list_id",list_id)
+            utils.dbg("No list found for", t['title']," list_id",list_id, s='vikunja')
             # raise e
 
         if t['done'] == True:
             tasks[id]['status'] = 0
 
-        # Prioritize if "due_date" is soon or passed (and not: "0001-01-01T00:00:00Z")
         if 'due_date' in t and t['due_date'] != "0001-01-01T00:00:00Z":
 
             due_date = datetime.strptime(t['due_date'],'%Y-%m-%dT%H:%M:%SZ')
@@ -282,14 +282,13 @@ def get_todos(user_conf):
             if due_seconds > -86400:
                 tasks[id]['priority'] = 2
 
-        # prioritize favorites
-        if t['is_favorite'] == True:
+        if t['priority'] and t['priority'] > 1:
+            # Vikunja priority is 1 = lowest, 5 = highest
+            #   
+            tasks[id]['priority'] = utils.invert_number_scale(utils.clamp(utils.force_number(t['priority']),0,5))
+        elif t['is_favorite'] == True:
             tasks[id]['priority'] = 2
-        elif t['priority'] in priorities:
-            print("Priority task", t['title'])
-            tasks[id]['priority'] = priorities[t['priority']]
-            # print(tasks[id])
-
+       
     todos = {'lists':lists,'tasks':tasks}
     return todos
 

nowfocus/new_task_dialog.py

@@ -87,9 +87,9 @@ class NewTaskWDialog(Gtk.Dialog):
             todolist_conf = conf.user['todolists'][parent_list['todolist']]
             try:
 
-                conf.file_watch_ignores[todolist_conf['id']] = True
                 task = conf.todo_connectors[todolist_conf['type']].add_new_task(todolist_conf,parent_list,task_label)
-                del conf.file_watch_ignores[todolist_conf['id']]
+                
+                clear_todo_file_change_time(todolist_conf)
 
                 dbg('connector add task response',task)
 
@@ -121,9 +121,8 @@ 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 )
+                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 
 
-            
 
         elif response == Gtk.ResponseType.CANCEL:
             print("Cancel button clicked")