nowfocus 0.5.6__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
@@ -62,8 +63,8 @@ class Application(Gtk.Application):
 
         try:
         
-            self.window = None
-
+            # self.window = None # Think this is unused
+            
             self.is_running = False
             self.device_in_use = True
             self.UserIdleTime = UserIdleTime()
@@ -83,7 +84,17 @@ class Application(Gtk.Application):
                 import install
                 install.run_first_load_actions()
 
-            utils.db_schema_update()
+            try:
+                self.version = version(conf.app_id)
+                print('nowfocus version', self.version)
+            except Exception as e:
+                dbg(e=e,l=0)
+
+            if get_system_db_value('db_schema_version') != self.version:
+
+                from upgrade import do_upgrades
+                do_upgrades(self)
+
 
             self.async_refresh()
 
@@ -96,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):
@@ -147,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()
@@ -358,16 +380,13 @@ class Application(Gtk.Application):
 
     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')
+            s = get_session_from_system_db()
+            if s:
                 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)
+            dbg("Error resuming session",e=e ,l=1)
 
 
     def start_task(self, w = None, task_data_or_id = None, transfer_current_session_time = False):
@@ -438,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']]
@@ -457,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
@@ -465,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)
-            subprocess.run(command) 
+            dbg("Launching command with subprocess.run", command, s='commands')
+            subprocess.run(command,shell=True) 
+
+        dbg("running task command complete:", command, s='commands')
 
-        print("running task command complete:", command)
+        # 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)
 
@@ -503,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 )
 
 
 
@@ -524,14 +546,17 @@ class Application(Gtk.Application):
 
                 # Get time tracker for this tasks todolist 
                 todolist_conf = conf.user['todolists'][task['todolist']]
-                timetracker_conf = conf.user['timetrackers'][todolist_conf['timetracker']]
+                
+                if todolist_conf['timetracker']:
+
+                    dbg("Save Session to "+ str(todolist_conf['timetracker']))
+                    try:
 
-                dbg("Save Session to "+ todolist_conf['timetracker'])
-                try:
-                    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 )
+                        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:
+                        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']
 
@@ -655,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())
 
 
@@ -728,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()
 
 
@@ -801,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()
@@ -873,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,6 +72,7 @@ prototype_settings = {
         'max_top_level_menu_items':10,
         'hours_search_timeframe':'this year',
         'invoice_hourly_rate':0,
+        'default_list_for_new_tasks':'List that was last added to',
 
         "custom_pomodoro_intervals": {
             "email":7  #minutes
@@ -161,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/connectors/vikunja.py

@@ -18,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=-1)
+    utils.dbg('add new task to ',parent_list, l=-1)
 
     response = requests.put(user_conf['url']+"api/v1/projects/"+str(parent_list['data']['id'])+"/tasks",json=data, headers=head)
 
@@ -103,11 +103,17 @@ def get_todos(user_conf):
     
 
     headers = {"Authorization": "Bearer "+user_conf['token']}
-    projects_lists = requests.get(user_conf['url']+"api/v1/projects", headers=headers).json()
-
+    response = requests.get(user_conf['url']+"api/v1/projects", headers=headers)
+    # print("response.headers")
+    # print(response.headers)
+    projects_lists = response.json()
     # print("vikunja projects")
     # print(json.dumps(projects_lists, indent=4))
 
+    if 'message' in projects_lists:
+        # This occurs with an expired token
+        utils.dbg(projects_lists['message'], notification="Vikunja API Error: "+projects_lists['message'], s='vikunja', l=0)
+
     # for i in projects_list:
     for i, itemIter in enumerate(projects_lists):
 
@@ -155,54 +161,6 @@ def get_todos(user_conf):
                 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). 
-
-        # else: print('parent_project_id', p['parent_project_id'], 'not in projects_lists')
-
-        # view_id = p['views'][0]['id']
-        # utils.dbg({'view_id':view_id},'vikunja')
-        
-
-        # Including 'done' tasks (Doesn't seem o includ them actually)'
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/views/"+str(view_id)+"/tasks?sort_by[]=position&order_by[]=asc&equalspage=1", headers=headers).json()
-        
-        # Filtering out done tasks, Works
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/views/"+str(view_id)+"/tasks?sort_by[]=position&order_by[]=asc&filter_by[]=done&filter_value[]=false&filter_comparator[]=equals&filter_comparator[]=equalspage=1", headers=headers).json()
-        
-        # projects_tasks = requests.get(user_conf['url']+"api/v1/projects/"+str(p['id'])+"/tasks", headers=headers).json()
-
-        # print("vikunja projects_tasks")
-        # print(json.dumps(projects_tasks, indent=4))
-        # utils.pretty_print(projects_tasks)
-
-        # for i, itemIter in enumerate(projects_tasks):
-
-        #     t = projects_tasks[i]
-        #     t['id'] = str(t['id'])
-
-        #     tasks[t['id']] = {
-        #         'id':t['id'],
-        #         'label':t['title'],
-        #         'parent_id':p['id'],
-        #         'parent_label':p['title'],
-        #         'todolist':user_conf['id'],
-        #         'data':t
-        #     }
-
-        #     if t['done'] == True:
-        #         tasks[t['id']]['status'] = False
-
-
-        #     # Show favorites in main menu 
-        #     if t['is_favorite'] == True:
-        #         tasks[t['id']]['priority'] = 1
-        #     elif t['priority'] in priorities:
-        #         print("Priority task", t['title'])
-        #         tasks[t['id']]['priority'] = priorities[t['priority']]
-        #         print(tasks[t['id']])
-
     # beware per_page config ( generally in /opt/vikunja/config.yml) maxitemsperpage defaults to 20 so this really won't work on a default setup 
     #   maxitemsperpage: 5000
     # ?per_page=10000

nowfocus/desktop-extras/nowfocus.desktop

@@ -3,7 +3,7 @@ Name=nowfocus
 GenericName=Task, Todo, Timer, timertacker
 Version=1.0
 Comment=Accomplish one worthwhile thing at a time.
-Exec=nowfocus -f
+Exec=nowfocus
 Icon=nowfocus
 Terminal=false
 Type=Application

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/install.py

@@ -80,7 +80,6 @@ def copy_desktop_integration_files():
         (home+'/.config/autostart/','nowfocus.desktop')
     )
 
-
     for file in files:
         try:
             Path(file[0]).mkdir(parents=True, exist_ok=True)

nowfocus/new_task_dialog.py

@@ -43,11 +43,10 @@ class NewTaskWDialog(Gtk.Dialog):
 
         box.add(Gtk.Box(border_width=10)) #spacer
 
-        default_list = get_most_recent_list(self.app.session)
-        if default_list:
-            self.selected_list = db_get_item_by_id(default_list,table='lists')
+        default_list = get_default_list_for_new_tasks()
 
-        box.add(choose_from_lists(self.select_list, default_list))
+        box.add(choose_from_lists(self.select_list, default_list['id']))
+        self.selected_list = default_list
 
         box.add(Gtk.Box(border_width=10)) #spacer
         
@@ -80,7 +79,9 @@ class NewTaskWDialog(Gtk.Dialog):
             task_label = self.task_label_entry.get_text().strip()
 
             if not task_label:
-                error_notice("Please Enter a name before saving new task")
+                self.task_label_entry.grab_focus()
+                self.task_label_entry.set_placeholder_text('Please enter a task')
+                # error_notice("Please Enter a name before saving new task")
                 return False
 
             parent_list = self.selected_list
@@ -96,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)
@@ -121,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():