nowfocus 0.4.0__py3-none-any.whl → 0.4.4__py3-none-any.whl

nowfocus/__main__.py

@@ -29,8 +29,6 @@ except Exception as e:
     gi.require_version('AppIndicator3', '0.1')
     from gi.repository import AppIndicator3 as appindicator 
 
-# from dbus_idle import IdleMonitor
-
 # Set working dir to file location 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 
@@ -57,85 +55,64 @@ 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.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.
+        try:
         
-        # 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.window = None
 
-        self.is_running = False
-        self.session = default_session()
+            self.is_running = False
+            self.device_in_use = True
+            self.UserIdleTime = UserIdleTime()
+            self.last_user_idle_check_time = None
+            self.session = default_session()
 
-        self.menu_tasks = {}
-        self.list_menus = {}
+            self.menu = Gtk.Menu()
+            self.menu_tasks = {}
+            self.list_menus = {}
 
-        self.indicator = appindicator.Indicator.new(conf.app_name, os.path.abspath('icon/icon-1.svg'), appindicator.IndicatorCategory.APPLICATION_STATUS)
+            self.indicator = appindicator.Indicator.new(conf.app_name, os.path.abspath('icon/icon-1.svg'), appindicator.IndicatorCategory.APPLICATION_STATUS)
+            self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
+            self.indicator.set_menu(self.menu)
 
-        self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
+            if conf.is_first_load:
+                import install
+                install.run_first_load_actions()
 
-        self.menu = Gtk.Menu()
-        # menu.set_reserve_toggle_size(False) # skip menu left padding,  doesn't work 
+            utils.db_schema_update()
 
-        utils.db_init()
-        utils.db_schema_update()
+            self.async_refresh()
 
+            # utils.db_cleanup()
 
-        # self.update_menu()
-        self.async_refresh()
+            main_tick_timer = GLib.timeout_add_seconds(1, self.tick)
 
-        # utils.db_cleanup()
+            self.resume_session_from_db()
 
-        self.indicator.set_menu(self.menu)
+            self.start_pipe()
+            self.open_task_window()
 
-        main_tick_timer = GLib.timeout_add_seconds(1, self.tick)
+            # Testing
+            # time.sleep(3)
+            # self.open_session_options_dialog('test_param')
+            # self.open_settings_window() #for testing
+            # self.open_new_task_dialog() #for testing
+            # self.print_time_totals()
 
-        try:
-            db_session = db_query("SELECT value FROM system WHERE field = 'session'")
+            signal.signal(signal.SIGINT, self.quit)
+            signal.signal(signal.SIGUSR1, self.signal_handler)
+            signal.signal(signal.SIGUSR2, self.signal_handler)
 
-            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')
-                self.session = s
-                self.is_running = True
-                dbg("resuming session",s['label'],l=2, s='session')
+            Gtk.main()
         except Exception as e:
-            dbg("Error resuming session",e,l=1)
-
-        self.UserIdleTime = UserIdleTime()
-
-        self.pipethread = threading.Thread(target=self.check_pipe)
-        self.pipethread.daemon = True
-        self.pipethread.start()
-
-        # Testing
-        # time.sleep(3)
-        # self.open_session_options_dialog('test_param')
-
-        # self.open_settings_window() #for testing
-        # self.open_task_window() #for testing
-
-        # time.sleep(2)
-        # self.open_new_task_dialog() #for testing
-
-        # time.sleep(2)
-        # self.print_time_totals()
-
-        # signal.signal(signal.SIGINT, signal.SIG_DFL)
-        signal.signal(signal.SIGINT, self.quit)
-        signal.signal(signal.SIGUSR1, self.signal_handler)
-        signal.signal(signal.SIGUSR2, self.signal_handler)
-
-        Gtk.main()
-
-
+            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__)
+            self.quit()
 
 
     def print_time_totals(self = None, widget = None):
@@ -176,25 +153,13 @@ class Application(Gtk.Application):
         exit()
 
 
-    def seconds_since_user_active(self):
-        # returns seconds of inactivity
-        # 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)
-
-        # 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
+    def get_seconds_since_user_active(self):
+       
+        if self.last_user_idle_check_time != now().replace(microsecond=0):
+            self.last_user_idle_check_time = now().replace(microsecond=0)
+            self.seconds_since_user_active = self.UserIdleTime.get()
 
-        # idle_time = int(int(IdleMonitor().get_dbus_idle()) / 1000)
-        # return idle_time
-
-        return self.UserIdleTime.get()
-        
+        return self.seconds_since_user_active
 
 
     def toggle_do_not_disturb(self, widget):
@@ -212,84 +177,106 @@ class Application(Gtk.Application):
 
     def tock(self):
 
-        if 'do-not-disturb' in self.session:
-            return None
-
-        afk_time = self.seconds_since_user_active()
-        # print("Idle time: "+str(afk_time))
+        user_inactive_time = self.get_seconds_since_user_active()
+        # print("user_inactive_time: "+str(user_inactive_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 )
 
-        if (int(time_difference(conf.todo_sync_time)) / 60) > conf.user['todolist_refresh_interval'] * 60 :
+        if (int(time_difference(conf.todo_sync_time)) / 60) > conf.user['todolist_refresh_interval'] * 60:
+            # TODO: use individual todo_refresh_times
             self.async_refresh()
 
-        # TODO: use individual todo_refresh_times
-
         minutes = (int(self.session['duration']) / 60)
         
-        if(self.is_running == False):
+        if self.check_device_became_inactive():
+            self.handle_device_became_inactive()
+        
+        elif self.device_in_use == False or 'do-not-disturb' in self.session:
+            # Do nothing
+            dbg("Do not disturb is active")
+
+        elif self.is_running:
+
+            if self.session['label'] in conf.user['custom_pomodoro_intervals']:
+                check = conf.user['custom_pomodoro_intervals'][self.session['label']]
+            else:
+                check = conf.user['pomodoro_interval']
+            
+            if float(minutes / check ).is_integer():
+                notify.Notification.new("Time for a Break?","You've been working on "+self.session['label']+" for "+str(minutes)+" minutes. ", None).show()
+
+                playsound('sound/bell-xylophone-g.mp3',False)
+
 
-            if num_is_multiple_of(minutes,conf.user['randomness_interrupt_interval']):
-                if afk_time < 30:
+            if 'target' in self.session:
+                t = self.session['target']
+
+                t['percent'] = round(( (t['starting_value'] + minutes) / t['value'] ) * 100,1)
+                print("At", t['percent'], "% of ", t['scope'],  " target")
+
+                if t['type'] == 'max':
+                    if t['percent'] >= 100:
+
+                        notify.Notification.new("Time is up for this "+t['scope'],"You'r at "+str(round(t['percent']))+"% of your "+str(t['value'])+" minutes in the last "+str(t['within_value'])+" "+ t['within_unit'], None).show()
+
+                        playsound('sound/dinner-bell.mp3',False)
+
+                elif t['type'] == 'min' and round(t['starting_value'] + minutes) == t['value']:
+                    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()
                     
-                    notify.Notification.new("What Am I doing?","Your randomness timer is at "+str(minutes)+" minutes. ", None).show()
+                    playsound('sound/xylophone-chord.mp3',False)
 
-                    self.open_task_window()
-                        
-                    playsound('sound/dinner-bell.mp3',False)
+        elif num_is_multiple_of(minutes,conf.user['randomness_interrupt_interval']):
+                    
+            notify.Notification.new("What Am I doing?","Your randomness timer is at "+str(minutes)+" minutes. ", None).show()
+
+            self.open_task_window()
+                
+            playsound('sound/dinner-bell.mp3',False)
 
-                elif afk_time > 120:
-                    self.session['duration'] = 0
-                    self.session['start_time'] = now()
-                    print("Idle time reset. afk:",  afk_time, self.session)
 
+    def check_device_became_inactive(self):
+        if self.get_seconds_since_user_active() > (conf.user['device_not_in_use_threshold'] * 60):
+            if self.device_in_use == True:
+                self.device_in_use = False
+                return True
         else:
-            if afk_time > 120:
-                # only show this once
-                if afk_time < 181:
-                    self.open_task_window(None,{'afk_time':afk_time})
-            else:
-                if self.session['label'] in conf.user['custom_pomodoro_intervals']:
-                    check = conf.user['custom_pomodoro_intervals'][self.session['label']]
-                else:
-                    check = conf.user['pomodoro_interval']
-                
-                if float(minutes / check ).is_integer():
-                    notify.Notification.new("Time for a Break?","You've been working on "+self.session['label']+" for "+str(minutes)+" minutes. ", None).show()
+            self.device_in_use = True
+        return False
 
-                    playsound('sound/bell-xylophone-g.mp3',False)
 
+    def handle_device_became_inactive(self):
+        self.user_last_inactive = now()
 
-                if 'target' in self.session:
-                    t = self.session['target']
+        user_inactive_time = self.get_seconds_since_user_active()
+        dbg('device_became_inactive ',l=-1)
 
-                    t['percent'] = round(( (t['starting_value'] + minutes) / t['value'] ) * 100,1)
-                    print("At", t['percent'], "% of ", t['scope'],  " target")
+        if self.is_running and 'do-not-disturb' not in self.session:
 
-                    if t['type'] == 'max':
-                        if t['percent'] >= 100:
+            self.open_task_window(None,{'user_inactive_time':user_inactive_time})
 
-                            notify.Notification.new("Time is up for this "+t['scope'],"You'r at "+str(round(t['percent']))+"% of your "+str(t['value'])+" minutes in the last "+str(t['within_value'])+" "+ t['within_unit'], None).show()
+        else:
+            self.session['duration'] = self.session['duration'] - user_inactive_time
+            if self.session['duration'] > 60:
+                utils.db_save_session(self.session) 
 
-                            playsound('sound/dinner-bell.mp3',False)
+                self.session['duration'] = 0
+                self.session['start_time'] = now()
+                dbg("Recording:", user_inactive_time, self.session)
 
-                    elif t['type'] == 'min' and round(t['starting_value'] + minutes) == t['value']:
-                        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)
+                if 'do-not-disturb' not in self.session and conf.user['randomness_interrupt_interval'] > 0:
+                    self.open_task_window(None)
 
-                        
 
-    icon_tick_number = 0
-    
     def tick(self):
 
         # check for suspend indicated by gap in tick intervals
         time_since_last_tick = round(time_difference(self.session['start_time']) - self.session['duration'])
         if time_since_last_tick > 10:
+
             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})
+                self.open_task_window(None,{'user_inactive_time':time_since_last_tick})
             else:
                 self.session['start_time'] = now()
 
@@ -306,25 +293,44 @@ class Application(Gtk.Application):
 
             label = self.session['label'] + ": " + sec_to_time(duration)
 
-            self.indicator.set_icon_full(os.path.abspath('icon/icon-'+str(self.icon_tick_number)+'.svg'),label) 
-        
+            icon = 'icon-'+str(self.icon_tick_number)+'.svg'
+
         else:
 
-            label = conf.user['default_text']
-            if duration > 60 and duration % 2:
-                self.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:
-                self.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
+
+        self.indicator.set_icon_full(os.path.abspath('icon/'+icon),label)
         self.indicator.set_label(label,label)
 
-        if num_is_multiple_of(self.icon_tick_number,3):
-            self.refresh_all_changed_todo_files()
- 
+        if num_is_multiple_of(duration,5): # check every 5 seconds 
+            if self.device_in_use:
+                self.refresh_all_changed_todo_files()
+            elif self.get_seconds_since_user_active() < 60:
+                self.device_in_use = True
+                self.handle_device_became_active()
+            else:
+                # TODO: incriment a user away timer
+                dbg("User is still away")
+
         return True
 
 
+    def handle_device_became_active(self):
+        dbg('device_became_active! ',l=-1)
+        self.user_last_active = now()
+
+        if self.is_running == False:
+            self.session['start_time'] = now()
+            self.session['duration'] = 0
+
+
     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:
@@ -349,6 +355,20 @@ class Application(Gtk.Application):
             handle_todo_read_error(todo_config,e)
 
 
+    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')
+                self.session = s
+                self.is_running = True
+                dbg("resuming session",s['label'],l=2, s='session')
+        except Exception as e:
+            dbg("Error resuming session",e,l=1)
+
+
     def start_task(self, w = None, task_data_or_id = None, transfer_current_session_time = False):
 
         if isinstance(task_data_or_id, dict):
@@ -428,7 +448,7 @@ class Application(Gtk.Application):
 
 
     def run_task_command(self,command):
-        print("running task command:", command)
+        dbg("running task command:", command,l=-1)
 
         self.running_command_task_label = copy.copy(self.session['label'])
 
@@ -580,7 +600,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()
@@ -733,24 +753,20 @@ class Application(Gtk.Application):
         dbg('Signal received',sig,s='signals')
 
         if sig == signal.SIGUSR1:
-            # try:
-            #     print('TaskWindow._instance',TaskWindow._instance)
-            #     if TaskWindow._instance:
-            #         self.taskwindow.destroy()
-            #     else:
-            #         self.open_task_window()
-
-            # except AttributeError:
             self.open_task_window()
-
         elif sig == signal.SIGUSR2:
             self.open_session_options_dialog()
-
         else: 
             dbg("no handler for received signal",s='signals',l=3)
 
+
+    def start_pipe(self):
+        self.pipethread = threading.Thread(target=self.check_pipe)
+        self.pipethread.daemon = True
+        self.pipethread.start()
+
+
     def check_pipe(self):
-        # print("Listening to pipe at ",conf.pipe)
 
         try:
             with open(conf.pipe, "r") as pipe:
@@ -820,7 +836,6 @@ def startup():
         except Exception as e:
             print(e)
 
-            
     try:
         os.mkfifo(conf.pipe)
         dbg("Named pipe created successfully!", s="cli")
@@ -836,7 +851,7 @@ def startup():
 
 
     except FileExistsError:
-        dbg("Named pipe exists, application must be running (or improperly shut down.) ",s="cli")
+        print("Named pipe exists, application must be running (or improperly shut down.) ")
 
         # if args: pass to pipe and exit
         if args.task:

nowfocus/conf.py

@@ -18,11 +18,14 @@ user_data_dir = GLib.get_user_data_dir()+"/"+app_id
 Path(user_data_dir).mkdir(parents=True, exist_ok=True)
 
 user_settings_dir = GLib.get_user_config_dir()+"/"+app_id
-Path(user_settings_dir).mkdir(parents=True, exist_ok=True)
+''' Depreciated. use user_data_dir instead '''
 
+db_file = user_data_dir+"/data.db"
+settings_file = user_data_dir+"/nowfocus-settings.json"
 debug_level = 1 # dev value 
 debug_systems = []
-pipe = "/tmp/"+app_id+"-pipe" # Will that work?
+pipe = "/tmp/"+app_id+"-pipe"
+is_first_load = False
 
 # key and type must be the same, (Seems redundant but it's is quite helpful) 
 connectors = {
@@ -59,9 +62,10 @@ prototype_settings = {
         "pomodoro_interval": 40,
         "open_task_window_fullscreen": True,
         "show_task_window_sidebars": False,
-        "randomness_interrupt_interval":5,
+        "randomness_interrupt_interval":7, #minutes
+        "device_not_in_use_threshold":3.5, #minutes
         "default_text": "What am I doing?",
-        "todolist_refresh_interval":1,
+        "todolist_refresh_interval":1,    #hours
         "version":0.4,
         "display_todolist_as_top_level_list":'auto',
         'max_top_level_menu_items':10,
@@ -69,7 +73,7 @@ prototype_settings = {
         'invoice_hourly_rate':0,
 
         "custom_pomodoro_intervals": {
-            "email":7
+            "email":7  #minutes
         },
 
         'prompts':'What am I doing?\nWhy am I here?\nWhat could I do?\nWhat do I wish to accomplish?\nWhat is my aim?\nWhat\'s next',
@@ -84,11 +88,11 @@ prototype_settings = {
         },
 
         "todolists": {
-            "Example Todo":{
-                "id":"Example Todo",
+            "Nowfocus Todo":{
+                "id":"Nowfocus Todo",
                 "type": "txt",
-                "label": "Example Todo",
-                "file": "example-todo.txt",
+                "label": "Nowfocus Todo",
+                "file": user_data_dir+'/nowfocus-todo.txt',
                 "timetracker":"Example CSV",
                 "status":True
             }
@@ -98,36 +102,43 @@ prototype_settings = {
                 "id": "Example CSV",
                 "label": "Example CSV",
                 "type":"csv",
-                "file":"sessions.csv",
+                "file":user_data_dir+'/nowfocus-timetracking-spreadsheet.csv',
                 "status":True
             }
         }
     }
 
-if os.path.isfile(user_settings_dir+"/user_settings.json"):
+if os.path.isfile(settings_file):
+    with open(settings_file, "r") as file:
+        settings = json.load(file)
+
+# Backward compatibility, check in old settings dir 
+elif os.path.isfile(user_settings_dir+"/user_settings.json"):
     with open(user_settings_dir+"/user_settings.json", "r") as file:
-        settings_file = json.load(file)
+        settings = json.load(file)
 else:
+
     print("Setting up initial settings file")
-    settings_file = {}
+    is_first_load = True
+    settings = {}
 
 
 user = {}
 
-# Merge user_settings.json with prototype settings
+# Merge settings with prototype settings
 for key, val in prototype_settings.items():
 
-    if settings_file and key in connectors:
+    if settings and key in connectors:
         user[key] = {}
 
         # merge and validate todolist and timetracker settings against connector prototypes 
-        for c_key, c_val in settings_file[key].items():
+        for c_key, c_val in settings[key].items():
             
             if c_val['type'] in connectors[key]:
                 proto = copy.copy(connectors[key][c_val['type']])
                 user[key][c_key] = proto
             else:
-                print('ERROR: no connector for type '+c_val['type']+' in user_settings.json','skipping that connector',c_val)
+                print('ERROR: no connector for type '+c_val['type']+' in settings_file','skipping that connector',c_val)
                 continue
 
             # print('validate user_settings connector against prototype.','user',c_val,'proto',proto)
@@ -142,46 +153,28 @@ for key, val in prototype_settings.items():
                 else:
                     print("Adding missing: connection field "+p_field+")") 
 
-    elif key in settings_file and type(settings_file[key]) == type(val):
-        user[key] = settings_file[key]
+    elif key in settings and type(settings[key]) == type(val):
+        user[key] = settings[key]
     else:
         user[key] = val
         
 # print(json.dumps(user, indent=4))
 # print(json.dumps(connectors['todolists'], indent=4))
 
-# 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():
-    tt
-    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
-    
-
-with open(user_settings_dir+"/user_settings.json","w") as settings_file:
+with open(settings_file,"w") as settings_file:
     json.dump(user, settings_file)
 
-
 todo_connectors = {}
 timetracker_connectors = {}
 
-# Load used connector modules
-for id, todolist in user['todolists'].items(): 
-    todo_connectors[todolist['type']] = importlib.import_module('connectors.'+todolist['type'])
-    
-for id, timetracker in user['timetrackers'].items(): 
-    timetracker_connectors[timetracker['type']] = importlib.import_module('connectors.'+timetracker['type'])
+try:
+
+    for id, todolist in user['todolists'].items(): 
+        todo_connectors[todolist['type']] = importlib.import_module('connectors.'+todolist['type'])
+        
+    for id, timetracker in user['timetrackers'].items(): 
+        timetracker_connectors[timetracker['type']] = importlib.import_module('connectors.'+timetracker['type'])
+except Exception as e:
+    print("error loading connector")
+    print(e)