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

nowfocus/__init__.py

@@ -1,68 +1 @@
-import os
-
-def startup():
-    # print("startup ",sys.argv)
-    
-    ''' if called with no arguments send shutdown to pipe, wait 2 seconds delete pipe file and launch application. if called with arguments send args to pipe if it exist otherwise ''' 
-
-    parser = argparse.ArgumentParser(
-                    # prog='ProgramName',
-                    # description='What the program does',
-                    # epilog='Text at the bottom of help'
-                    )
-
-    parser.add_argument('task',nargs='?')             # optional positional argument
-    parser.add_argument('-s', '--debug_systems', nargs="*", default=[])      # option that takes a value
-    parser.add_argument('-l', '--debug_level', default=1)       # option that takes a value
-    parser.add_argument('-f', '--force', action='store_true', help="Force restart by deleting existing named pipe")  # on/off flag
-    # parser.add_argument('-v', '--verbose', action='store_true')  # on/off flag
-
-    args = parser.parse_args()
-    print(args)
-
-    conf.debug_level = int(args.debug_level)
-    conf.debug_systems = args.debug_systems
-
-    if args.force:
-        print("Lanched with --force flag, forcibly deleting old pipe")
-        try:
-            os.remove(pipe_file)
-        except Exception as e:
-            print(e)
-            
-    try:
-        os.mkfifo(pipe_file)
-
-        signal.signal(signal.SIGUSR1, Application.signal_handler) 
-        app = Application()
-
-        if args.task:
-            print("Writing args.task to pipe", args.task)
-            with open(pipe_file, "w") as pipeout:
-                pipeout.write(args.task)
-                pipeout.close()
-
-
-    except FileExistsError:
-        print("Named pipe exists, application must be running (or improperly shut down.) ")
-
-        # if args: pass to pipe and exit
-        if args.task:
-            pipe_line = args.task
-        else:
-            pipe_line = "open_task_window"
-        
-
-        print("Writing arg ",pipe_line," to pipe")
-
-        with open(pipe_file, "w") as pipeout:
-            pipeout.write(pipe_line)
-            pipeout.close()
-
-        exit()
-
-
-
-    except Exception as e:
-        print(f"Named pipe creation failed: {e}")
 

nowfocus/__main__.py

@@ -50,7 +50,6 @@ from session_options import SessionOptionsDialog
 dbg(conf.user,l=3,s='user_settings')
 
 setproctitle.setproctitle(conf.app_name)
-pipe_file = os.path.dirname(os.path.realpath(__file__))+"/"+conf.app_id+"_pipe"
 
 print(conf.app_name +" running from " + os.path.dirname(os.path.realpath(__file__)))
 
@@ -106,6 +105,8 @@ class Application(Gtk.Application):
         except Exception as e:
             dbg("Error resuming session",e,l=1)
 
+        utils.start_todo_file_watchers()
+
         self.pipethread = threading.Thread(target=self.check_pipe)
         self.pipethread.daemon = True
         self.pipethread.start()
@@ -163,11 +164,11 @@ class Application(Gtk.Application):
             print('Caching active session', self.session['label'])
             db_set_session_cache(self.session)
         try:
-            # print("before os.remove(pipe_file)")
-            os.remove(pipe_file)
+            # print("before os.remove(conf.pipe)")
+            os.remove(conf.pipe)
             print("Pipe removed")
         except Exception as e:
-            print("Error removing pipe_file in quit",e)
+            print("Error removing conf.pipe in quit",e)
 
         notify.uninit()
         Gtk.main_quit()
@@ -217,6 +218,8 @@ class Application(Gtk.Application):
         if (int(time_difference(conf.todo_sync_time)) / 60) > conf.user['todolist_refresh_interval'] * 60 :
             self.async_refresh()
 
+        # TODO: use individual todo_refresh_times
+
         minutes = (int(self.session['duration']) / 60)
         
         if(self.is_running == False):
@@ -320,6 +323,13 @@ class Application(Gtk.Application):
         # 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]))
+
+            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 = {}
         return True
 
 
@@ -431,13 +441,23 @@ class Application(Gtk.Application):
 
     def mark_done(self, w=None, task = None):
         ''' second (task) argument is required and must be a task object '''
-        print("Mark Task done")
-        print(task)
+        
+        print("Mark Task done",task['label'])
+        # print(task)
 
         todolist_conf = conf.user['todolists'][task['todolist']]
 
         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'],) )
@@ -454,7 +474,7 @@ class Application(Gtk.Application):
 
 
     def stop_task(self, w = '', action = 'save', custom_end_time=None):
-        ''' supported actions are save,cancel,mark_done '''
+        ''' supported actions are save, cancel, mark_done '''
 
         list_menus = self.list_menus
         menu_tasks = self.menu_tasks
@@ -490,8 +510,8 @@ class Application(Gtk.Application):
                     # print("add ",utils.extended_label(task)," to recent tasks")
                     i = Gtk.MenuItem.new_with_label(utils.extended_label(task))
                     i.connect('activate',self.start_task,task)
-                    list_menus['recent'].prepend(i)
                     try:
+                        list_menus['recent'].prepend(i)
                         list_menus['recent'].get_children()[11].destroy()
                     except Exception as e:
                         dbg("Exception trying to rotate recent tasks. probably are less than 11",l=2,s="recent")
@@ -543,7 +563,6 @@ class Application(Gtk.Application):
         i = Gtk.ImageMenuItem.new_with_label("Edit Session")
         i.set_image(Gtk.Image.new_from_file(os.path.abspath('icon/edit.svg'))) 
 
-        # i.set_image(Gtk.Image.new_from_file('/usr/share/icons/Yaru/scalable/status/software-installed-symbolic.svg')) 
         i.set_always_show_image(True) 
         i.connect("activate", self.open_session_options_dialog,'from_menu')
         self.menu.insert(i,0)    
@@ -551,33 +570,34 @@ class Application(Gtk.Application):
         i = Gtk.ImageMenuItem.new_with_label("Pause" )
         i.set_image(Gtk.Image.new_from_file(os.path.abspath('icon/pause.svg'))) 
 
-        # i.set_image(Gtk.Image.new_from_file('/usr/share/icons/Yaru/scalable/multimedia/pause-symbolic.svg')) 
         i.set_always_show_image(True) 
         i.connect("activate", self.stop_task)
         self.menu.insert(i,0)
 
 
-    def async_refresh(self, w=None):
+    def async_refresh(self, w=None, single_todo = None):
 
         self.indicator.set_label("Refreshing Todolists", "Wide")
         menu_item = Gtk.MenuItem.new_with_label("Refreshing Todolists")
         self.menu.append(menu_item) 
         self.menu.show_all()
 
-        connectors_thread = threading.Thread(target=self.async_refresh_inner)
+        connectors_thread = threading.Thread(target=self.async_refresh_inner,args=(single_todo,))
         connectors_thread.start()
 
 
-    def async_refresh_inner(self):
+    def async_refresh_inner(self, single_todo = None):
         # dbg("async refresh started",s="todoloading",l=3)
-        utils.get_todolists()
+        if single_todo:
+            utils.refresh_todolist(single_todo)
+            utils.reindex()
+
+        else:
+            utils.get_todolists()
+
         dbg("async refresh complete",s="todoloading",l=3)
         GLib.idle_add(self.update_menu)
         
-        try:
-            GLib.idle_add(self.taskwindow.refresh_search_cache)
-        except Exception:
-            pass
 
 
     def update_menu(self, w = ''):
@@ -727,10 +747,10 @@ class Application(Gtk.Application):
             dbg("no handler for received signal",s='signals',l=3)
 
     def check_pipe(self):
-        # print("Listening to pipe at ",pipe_file)
+        # print("Listening to pipe at ",conf.pipe)
 
         try:
-            with open(pipe_file, "r") as pipe:
+            with open(conf.pipe, "r") as pipe:
                 data = pipe.read().strip()
 
             print("check_pipe ")
@@ -739,10 +759,8 @@ class Application(Gtk.Application):
             pipe.close()
 
             # TODO: add registry of special commands 
+            # How to handle function arguments? (for example refresh a todolist with it's id)
             # if data in ['quit','open_task_window']:
-                # TODO: how to all dynamic function name here?
-                # GLib.idle_add(self.open_task_window)
-
 
             if data == 'quit':
                 GLib.idle_add(self.quit)
@@ -795,13 +813,13 @@ def startup():
     if args.force:
         print("Lanched with --force flag, forcibly deleting old pipe")
         try:
-            os.remove(pipe_file)
+            os.remove(conf.pipe)
         except Exception as e:
             print(e)
 
             
     try:
-        os.mkfifo(pipe_file)
+        os.mkfifo(conf.pipe)
         dbg("Named pipe created successfully!", s="cli")
 
         signal.signal(signal.SIGUSR1, Application.signal_handler) 
@@ -809,7 +827,7 @@ def startup():
 
         if args.task:
             print("Writing args.task to pipe", args.task)
-            with open(pipe_file, "w") as pipeout:
+            with open(conf.pipe, "w") as pipeout:
                 pipeout.write(args.task)
                 pipeout.close()
 
@@ -827,7 +845,7 @@ def startup():
 
         dbg("Writing arg to pipe ",pipe_line, s="cli")
 
-        with open(pipe_file, "w") as pipeout:
+        with open(conf.pipe, "w") as pipeout:
             pipeout.write(pipe_line)
             pipeout.close()
 

nowfocus/conf.py

@@ -22,20 +22,24 @@ Path(user_settings_dir).mkdir(parents=True, exist_ok=True)
 
 debug_level = 1 # dev value 
 debug_systems = []
+pipe = "/tmp/"+app_id+"-pipe" # Will that work?
 
 # key and type must be the same, (Seems redundant but it's is quite helpful) 
 connectors = {
     "todolists":{
-        'txt':{'id':'txt','type':'txt','label':'','file':'',"status":True,'timetracker':''},
+        'txt':{'id':'txt','type':'txt','label':'','file':'', "watch_file":True, "status":True,'timetracker':''},
 
         'trello':{'id':'trello','type':'trello','label':'Trello','APIKey':'aecf1d7791b4f1a4bb7d6ca5827ba0d3', 'token':'',"status":True,'timetracker':''},
 
         'vikunja':{'id':'vikunja','type':'vikunja','label':'Vikunja','url':'http://localhost:3456/', 'token':'',"username":"","status":True,'timetracker':''},
         
         'caldav':{'id':'caldav','type':'caldav','label':'CalDav Todo','url':'http://localhost:3456/','password': "",'username': '',"status":True,'timetracker':''},
+        
         'psc_timetracker':{'id':'psc_timetracker','type':'psc_timetracker','label':'Timetracker','url':'https://photosynth.ca/timetracker/','key':'',"status":True,'timetracker':'Timetracker'},
+        
         'taskwarrior':{'id':'taskwarrior','type':'taskwarrior','label':'TaskWarrior',"status":True,'timetracker':''},
-        'todotxt':{'id':'todotxt','type':'todotxt','label':'','file':"","status":True,'timetracker':''},
+        
+        'todotxt':{'id':'todotxt','type':'todotxt','label':'','file':"", "watch_file":True, "status":True,'timetracker':''},
     },
     "timetrackers":{
         'csv':{'id':'csv','type':'csv','label':'CSV file','file':'sessions.csv',"status":True}, 
@@ -46,18 +50,21 @@ connectors = {
 }
 
 todo_sync_time = datetime.now() 
+todo_sync_times = {}
 
 todo_sync_required = {}
+file_watchers = {}
+file_watch_ignores = {}
 
 prototype_settings = {
-        "pomodoro_interval": 26,
+        "pomodoro_interval": 40,
         "open_task_window_fullscreen": True,
         "randomness_interrupt_interval":5,
         "default_text": "What am I doing?",
-        "todolist_refresh_interval":6,
+        "todolist_refresh_interval":1,
         "version":0.2,
         "display_todolist_as_top_level_list":'auto',
-        'max_top_level_menu_items':18,
+        'max_top_level_menu_items':10,
         # 'tick_interval':1,
         'hours_search_timeframe':'this year',
         'invoice_hourly_rate':0,

nowfocus/connectors/todotxt.py

@@ -20,24 +20,6 @@ import utils
 #     }
 # }
 
-# def watch(user_conf):
-#     import pyinotify
-
-#     """Watch for modifications of the todo file with pyinotify."""
-#     wm = pyinotify.WatchManager()
-#     notifier = pyinotify.ThreadedNotifier(wm, mark_changed, user_conf)
-#     notifier.start()
-
-#     # wm.add_watch(os.path.dirname(user_conf['file']), pyinotify.IN_MODIFY | pyinotify.IN_MOVED_TO) # Watch whole folder. Perhaps more reliable 
-#     wm.add_watch(user_conf['file'], pyinotify.IN_MODIFY | pyinotify.IN_MOVED_TO) # just the file. Perhaps better 
-
-
-# def mark_changed(event, user_conf):
-#     ''' This is in a thread '''
-#     if event.pathname == user_conf['file']:
-#         conf.todo_sync_required[user_conf['id']] = True
-    
-
 
 def task_id(user_conf, t):
     ''' The task parameter must have at least "label", "todolist" and "parent_id" '''
@@ -71,7 +53,8 @@ def add_new_task(user_conf,list,task_label):
             }
         }
     return t
-            
+
+
 def mark_task_done(task):
     '''Return True on success False on error'''
     

nowfocus/connectors/txt.py

@@ -8,27 +8,36 @@ def add_new_task(user_conf,list,task_label):
 
 
     with open(file_uri, 'r') as file:
-        # read a list of lines into data
         data = file.readlines()
 
         if list['id'] == user_conf['id']:
-            # Top level insert
-            new_line = task_label+"\n"
+            # Top level list, append to bottom 
             line_no = len(data) + 1
         else:
-            # Sub list insert
-            # TODO: Add it at the end of the list rather than the start ...
-            # Yup. rjust(indent + len)
+            line_no = get_line_no(list,data) + 1
+
+        new_line = list['data']['indent']+task_label+"\n"
 
-            indent = len(list['data']['original_line']) - len(list['data']['original_line'].lstrip()) + 4 #BUG: check indent of next line instead of arbitrarily using 4 spaces
+        # # Old version without recorded indent
+        # if list['id'] == user_conf['id']:
+        #     # Top level insert
+        #     new_line = task_label+"\n"
+        #     line_no = len(data) + 1
+        # else:
+        #     Sub list insert
+        #     TODO: Add it at the end of the list rather than the start ...
+        #     Yup. rjust(indent + len)
+
+
+        #     indent = len(list['data']['original_line']) - len(list['data']['original_line'].lstrip()) + 4 #BUG: check indent of next line instead of arbitrarily using 4 spaces
             
-            new_line = task_label+"\n"
-            # I'm sure there's a better way to add a bunch of spaces to to a string
-            while indent > 0:
-                new_line = " " + new_line
-                indent = indent - 1
+        #     new_line = task_label+"\n"
+        #     # I'm sure there's a better way to add a bunch of spaces to to a string
+        #     while indent > 0:
+        #         new_line = " " + new_line
+        #         indent = indent - 1
 
-            line_no = get_line_no(list,data) + 1
+        #     line_no = get_line_no(list,data) + 1
 
         data.insert(line_no,new_line)
         
@@ -64,17 +73,15 @@ def get_line_no(i,lines):
     else:
 
         line_no = 0 #TODO: Improve, (better foreach with key)
-        in_list = False
         
         for line in lines:
 
-            # TODO: Find the list 
+            # TODO: Find the list
             if line == i['data']['original_line']:
                 return line_no
 
-            line_no = line_no + 1
-
-    throw("Line not found error Ha!")
+            
+    utils.dbg("Line not found error",i,lines,s='txt',l=0)
 
 def task_id(task):
     ''' The task parameter must have at least "label", "todolist" and "parent_id" '''
@@ -120,17 +127,18 @@ def get_todos(user_conf):
     tasks = {}
     lists = {}
     lists[user_conf['id']] = {
-                    'id':user_conf['id'],
-                    'label':user_conf['label'],
-                    'parent_id':'',
-                    'parent_label':'',
-                    'todolist':user_conf['id'],
-                    'data':{
-                        'line_no':0,
-                        'original_line':'',
-                        'accepts_tasks':True
-                    }
-                }
+        'id':user_conf['id'],
+        'label':user_conf['label'],
+        'parent_id':'',
+        'parent_label':'',
+        'todolist':user_conf['id'],
+        'data':{
+            'line_no':0,
+            'original_line':'',
+            'accepts_tasks':True,
+            'indent':'',
+        }
+    }
 
     current_list = []
     current_list_label = []
@@ -149,7 +157,7 @@ def get_todos(user_conf):
     # file_uri = "todo.txt"
     line_no = -1
 
-    with open(file_uri) as file:
+    with open(file_uri,"r") as file:
         for line in file:
 
             line_no = line_no + 1
@@ -171,11 +179,13 @@ def get_todos(user_conf):
             #TODO: use markdown title syntax as list name in addition to indentation 
 
             indent = len(line) - len(line.lstrip())
+            indent_str = line[0:indent]
 
             if indent > prev_indent:
-                # prev item is a sub_list header, move it to lists
+                # prev item is a sub_list header, copy it to lists
                 lists[prev_id] = tasks[prev_id]
-                del tasks[prev_id]
+                lists[prev_id]['data']['indent'] = indent_str
+                # del tasks[prev_id]
                 current_list.append(prev_id)
                 current_list_label.append(prev_label)
                 current_indent.append(indent)
@@ -194,6 +204,13 @@ def get_todos(user_conf):
 
                     
             utils.dbg(line.rstrip(),s='txt',l=3)
+
+            # Get prioritized tasks (starting with a number)
+            if label.split()[0].isnumeric():
+                priority = float(label.split()[0])
+                label = label.removeprefix(label.split()[0]).strip()
+            else:
+                priority = '0'
             
             task_id = file_uri+":"+"/".join(current_list_label)+":"+label
 
@@ -211,6 +228,7 @@ def get_todos(user_conf):
                     'parent_label':str(parent_label),
                     'todolist':user_conf['id'],
                     'status': status,
+                    'priority': priority,
                     'data':{
                         'line_no':line_no,
                         'original_line':line,
@@ -218,11 +236,7 @@ def get_todos(user_conf):
                     }
                 }
 
-            # Get prioritized tasks (starting with a number)
-            # if label[0].isdigit()
-            if label.split()[0].isnumeric():
-                tasks[task_id]['priority'] = float(label.split()[0])
-                tasks[task_id]['label'] = label.removeprefix(label.split()[0]).strip()
+
 
             prev_indent = indent
             prev_label = label

nowfocus/connectors/vikunja.py

@@ -294,14 +294,16 @@ def get_todos(user_conf):
     return todos
 
 
-def launch(user_conf, item = None, category = None):
+def launch(user_conf, item = None, category = 'task'):
     ''' Open Vikunja '''
+    utils.dbg("vikunja.py launch","user_conf", user_conf,"item",item,'category',category,l=3, s='vikunja')
+
     url = user_conf['url']
 
-    if item and category:
-        if category == 'list':
+    if item:
+        if category in ('list','lists'):
             url += 'projects/'+str(item['data']['id'])
-        elif category == 'task':
+        else:
             url += 'tasks/'+str(item['data']['id'])
 
     utils.open_external(url)

nowfocus/new_task_dialog.py

@@ -77,7 +77,7 @@ class NewTaskWDialog(Gtk.Dialog):
 
         if response == 1 or response == 2:
 
-            task_label = self.task_label_entry.get_text()
+            task_label = self.task_label_entry.get_text().strip()
 
             if not task_label:
                 error_notice("Please Enter a name before saving new task")
@@ -86,7 +86,10 @@ class NewTaskWDialog(Gtk.Dialog):
             parent_list = self.selected_list
             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']]
 
                 dbg('connector add task response',task)