NowFocus 0.2.0__tar.gz → 0.2.3__tar.gz

{nowfocus-0.2.0/src/NowFocus.egg-info → nowfocus-0.2.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: NowFocus
-Version: 0.2.0
+Version: 0.2.3
 Summary: NowFocus: the open source task-tracking self-control panel.
-Author: Altruist Enterprises
-Project-URL: Homepage, https://gitlab.com/GitFr33/what-am-i-doing
+Author: GitFr33
+Project-URL: Homepage, https://gitlab.com/GitFr33/NowFocus
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -44,25 +44,36 @@ Requires-Dist: vobject
 Requires-Dist: x-wr-timezone
 Dynamic: license-file
 
-# NowFocus
+<div align="center"><img src="nowfocus.svg" width="60"  align="center">  
 
-A simple, performance-oriented, activity tracker that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar.
+# *NowFocus* <br> Open-source task timer for linux  
 
+**Avoid multifailing. Master your to-do lists. Track your time.**
 
-## Features
+</div>
+NowFocus is a clean, keyboard-driven project time tracker build with python + GTK that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar. 
 
+## Features
 - Unlimited flexible combinations of to-do lists and time tracking systems  
-- Flexibly nested lists  
+- Infinitely nestable lists  
 - Inactivity detection that automatically pauses time tracking 
 - Pomodoro timer  
 - Task prioritization
 - Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though 
 - Randomness interrupt bell (optional) to keep you on track with tracking your time
-- Fast, keyboard-driven, interface 
+- Keyboard-driven interface 
 - Offline to-do list cache 
-- Tested on Ubuntu and Linux Mint with Xorg and Wayland
+- CLI
+- Run a command (or launch an application) when a task is started
+
+
+<img src="Screenshot-25-09-23-11-42-56.webp" width="500">  
+<img src="Screenshot-25-09-23-11-46-14.webp" width="400">  
+<img src="Screenshot-25-09-23-11-53-22.webp" width="400">  
+
+<br>
 
-### Currently Supported Todo Lists
+### Currently Supported To-do List Backends
 
 - Simple text or markdown file with indentation based sub-lists
 - Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
@@ -70,8 +81,9 @@ A simple, performance-oriented, activity tracker that flexibly connects multiple
 - [TaskWarrior](https://taskwarrior.org/)
 - [Vikunja](https://www.vikunja.io)
 - [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
+- [Trello](https://www.trello.com)
 
-### Currently Supported Time Trackers
+### Currently Supported Time Tracker Backends 
 
 - CSV file  
 - [ActivityWatch](https://www.activitywatch.net)      
@@ -79,53 +91,62 @@ A simple, performance-oriented, activity tracker that flexibly connects multiple
 - [TimeWarrior](https://timewarrior.net)
 
 
+## Installation (using pipx) 
 
-<!-- ## Installation pipx 
-If you don't have pipx install 
+1. Run the following in terminal to install with dependencies:
 ```
-sudo apt install pipx
+sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
 pipx ensurepath
-``` -->
+pipx install NowFocus
+``` 
+2. Now run `nowfocus` and check for errors
 
+3. Set up a keybinding (on Ubuntu or Linux Mint), open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `nowfocus`, and pick whatever key combo you'd like.
 
-## Installation 
+4. Add the following command to your startup applications: `nowfocus --force` 
 
-- Install dependencies:
-```
-sudo apt install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv pip libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
-```
 
-<!-- python3-gi python3-gi-cairo -->
+## Usage
 
-- Set up a python [venv](https://docs.python.org/3/tutorial/venv.html)
-```
-python3 -m venv .venv/nowfocus  
-source .venv/nowfocus/bin/activate 
-```
+#### Set up to-do lists and time trackers
 
-### Install with Pip
-```
-pip install nowfocus
-```
-- Run `python3  -m what-am-doing` and check for errors    
+Open NowFocus **Settings** from the indicator menu or tasks window and connect your to-do lists and time tracker(s) 
+
+#### Task Window Keybindings
+
+- `F11` Toggle fullscreen
+- `Esc` Close task window
+- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Ctrl + P` **Pause** current task
+- `Ctrl + D` Pause current task and mark it **Done**
+- `Ctrl + X` Cancel current task
+- `Ctrl + N` **New** task
+- `Ctrl + R` **Refresh** todolists
+- `Ctrl + L` or `Ctrl + F` **Focus** the task search
 
-- Add the following to your startup applications  `bash -c "source .venv/nowfocus/bin/activate; python3  -m what-am-doing"` 
+#### Commandline Interface
 
+- To raise the task window use simply: `nowfocus`  
+- If NowFocus has crashed or failed to shut down nicely use `nowfocus --force`
+- To start timing a task: add the task name as the first positional argument. `nowfocus "checking email"`
+- To stop timing use `nowfocus stop`
+- Start with verbose logging use: `nowfocus -l 3`
+- Start with targeted verbose logging use: `nowfocus -s trello`
 
-### Install from Source 
 
-- Clone this repo into some out-of-the-way directory (referred to as `YOUR_INSTALL_PATH`) 
-- Change to `YOUR_INSTALL_PATH` directory with `cd /path/to/where/you/cloned/nowfocus`
+## Development
 
-- Install required python modules: `pip install -r requirements.txt`
-- Run `python3 __main__.py` and check for errors    
-- Add the following to your startup applications: `bash -c "source .venv/nowfocus/bin/activate; python3 /YOUR_INSTALL_PATH/src/what-am-doing/__main__.py"` 
+### Install from Source
 
+- Install dependencies from above.  
+- Clone this repo somewhere (referred to as `YOUR_INSTALL_PATH`)  
+- Change to `YOUR_INSTALL_PATH` directory with `cd YOUR_INSTALL_PATH/nowfocus`  
+- build python module with `python3 -m build` (this should be done in a venv and will require some dependecies...)  
+- pipx install -e --force YOUR_INSTALL_PATH/monotask/  
 
-## Usage 
 
-- Open settings and add your to-do list and time tracker details
 
+<!-- 
 ## Build Flatpak
 
 ```
@@ -134,23 +155,7 @@ python3 -m build
 flatpak run org.flatpak.Builder --force-clean --user --install --install-deps-from=flathub --repo=repo builddir APPID.yaml
 flatpak run APPID
 ```
-
-## Keybindings
-
-To set up a keybinding to open your tasks on Ubuntu or Linux Mint, open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `/YOUR_INSTALL_PATH/src/what-am-doing/signal.sh`, and pick whatever key combo you'd like.
-
-### Task Window Keybindings
-
-
-- `F11` Toggle fullscreen
-- `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
-- `Ctrl + P` **Pause** current task
-- `Ctrl + D` Pause current task and mark it **Done**
-- `Ctrl + X` Cancel current task
-- `Ctrl + N` **New** task
-- `Ctrl + R` **Refresh** todolists
-- `Ctrl + L` or `Ctrl + F` **Focus** the task search
+ -->
 
 
 <!-- ## Contributing

nowfocus-0.2.3/README.md

@@ -0,0 +1,117 @@
+<div align="center"><img src="nowfocus.svg" width="60"  align="center">  
+
+# *NowFocus* <br> Open-source task timer for linux  
+
+**Avoid multifailing. Master your to-do lists. Track your time.**
+
+</div>
+NowFocus is a clean, keyboard-driven project time tracker build with python + GTK that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar. 
+
+## Features
+- Unlimited flexible combinations of to-do lists and time tracking systems  
+- Infinitely nestable lists  
+- Inactivity detection that automatically pauses time tracking 
+- Pomodoro timer  
+- Task prioritization
+- Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though 
+- Randomness interrupt bell (optional) to keep you on track with tracking your time
+- Keyboard-driven interface 
+- Offline to-do list cache 
+- CLI
+- Run a command (or launch an application) when a task is started
+
+
+<img src="Screenshot-25-09-23-11-42-56.webp" width="500">  
+<img src="Screenshot-25-09-23-11-46-14.webp" width="400">  
+<img src="Screenshot-25-09-23-11-53-22.webp" width="400">  
+
+<br>
+
+### Currently Supported To-do List Backends
+
+- Simple text or markdown file with indentation based sub-lists
+- Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
+- [todotxt format](http://todotxt.org/)
+- [TaskWarrior](https://taskwarrior.org/)
+- [Vikunja](https://www.vikunja.io)
+- [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
+- [Trello](https://www.trello.com)
+
+### Currently Supported Time Tracker Backends 
+
+- CSV file  
+- [ActivityWatch](https://www.activitywatch.net)      
+- [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
+- [TimeWarrior](https://timewarrior.net)
+
+
+## Installation (using pipx) 
+
+1. Run the following in terminal to install with dependencies:
+```
+sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+pipx ensurepath
+pipx install NowFocus
+``` 
+2. Now run `nowfocus` and check for errors
+
+3. Set up a keybinding (on Ubuntu or Linux Mint), open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `nowfocus`, and pick whatever key combo you'd like.
+
+4. Add the following command to your startup applications: `nowfocus --force` 
+
+
+## Usage
+
+#### Set up to-do lists and time trackers
+
+Open NowFocus **Settings** from the indicator menu or tasks window and connect your to-do lists and time tracker(s) 
+
+#### Task Window Keybindings
+
+- `F11` Toggle fullscreen
+- `Esc` Close task window
+- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Ctrl + P` **Pause** current task
+- `Ctrl + D` Pause current task and mark it **Done**
+- `Ctrl + X` Cancel current task
+- `Ctrl + N` **New** task
+- `Ctrl + R` **Refresh** todolists
+- `Ctrl + L` or `Ctrl + F` **Focus** the task search
+
+#### Commandline Interface
+
+- To raise the task window use simply: `nowfocus`  
+- If NowFocus has crashed or failed to shut down nicely use `nowfocus --force`
+- To start timing a task: add the task name as the first positional argument. `nowfocus "checking email"`
+- To stop timing use `nowfocus stop`
+- Start with verbose logging use: `nowfocus -l 3`
+- Start with targeted verbose logging use: `nowfocus -s trello`
+
+
+## Development
+
+### Install from Source
+
+- Install dependencies from above.  
+- Clone this repo somewhere (referred to as `YOUR_INSTALL_PATH`)  
+- Change to `YOUR_INSTALL_PATH` directory with `cd YOUR_INSTALL_PATH/nowfocus`  
+- build python module with `python3 -m build` (this should be done in a venv and will require some dependecies...)  
+- pipx install -e --force YOUR_INSTALL_PATH/monotask/  
+
+
+
+<!-- 
+## Build Flatpak
+
+```
+python3 -m build
+# python3 flatpak-pip-generator --runtime=org.gnome.Sdk/x86_64/47 PACKAGE # run this for lots of stuff
+flatpak run org.flatpak.Builder --force-clean --user --install --install-deps-from=flathub --repo=repo builddir APPID.yaml
+flatpak run APPID
+```
+ -->
+
+
+<!-- ## Contributing
+Package it for your operating system.
+Write a connector for your favorite to-do list or time tracker -->

{nowfocus-0.2.0 → nowfocus-0.2.3}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "NowFocus"
-version = "0.2.0"
+version = "0.2.3"
 authors = [
-  { name="Altruist Enterprises" },
+  { name="GitFr33" },
 ]
 description = "NowFocus: the open source task-tracking self-control panel."
 readme = "README.md"
@@ -55,7 +55,7 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://gitlab.com/GitFr33/what-am-i-doing"
+Homepage = "https://gitlab.com/GitFr33/NowFocus"
 
 [project.gui-scripts]
 nowfocus = "nowfocus.__main__:startup"

{nowfocus-0.2.0 → nowfocus-0.2.3/src/NowFocus.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: NowFocus
-Version: 0.2.0
+Version: 0.2.3
 Summary: NowFocus: the open source task-tracking self-control panel.
-Author: Altruist Enterprises
-Project-URL: Homepage, https://gitlab.com/GitFr33/what-am-i-doing
+Author: GitFr33
+Project-URL: Homepage, https://gitlab.com/GitFr33/NowFocus
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -44,25 +44,36 @@ Requires-Dist: vobject
 Requires-Dist: x-wr-timezone
 Dynamic: license-file
 
-# NowFocus
+<div align="center"><img src="nowfocus.svg" width="60"  align="center">  
 
-A simple, performance-oriented, activity tracker that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar.
+# *NowFocus* <br> Open-source task timer for linux  
 
+**Avoid multifailing. Master your to-do lists. Track your time.**
 
-## Features
+</div>
+NowFocus is a clean, keyboard-driven project time tracker build with python + GTK that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar. 
 
+## Features
 - Unlimited flexible combinations of to-do lists and time tracking systems  
-- Flexibly nested lists  
+- Infinitely nestable lists  
 - Inactivity detection that automatically pauses time tracking 
 - Pomodoro timer  
 - Task prioritization
 - Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though 
 - Randomness interrupt bell (optional) to keep you on track with tracking your time
-- Fast, keyboard-driven, interface 
+- Keyboard-driven interface 
 - Offline to-do list cache 
-- Tested on Ubuntu and Linux Mint with Xorg and Wayland
+- CLI
+- Run a command (or launch an application) when a task is started
+
+
+<img src="Screenshot-25-09-23-11-42-56.webp" width="500">  
+<img src="Screenshot-25-09-23-11-46-14.webp" width="400">  
+<img src="Screenshot-25-09-23-11-53-22.webp" width="400">  
+
+<br>
 
-### Currently Supported Todo Lists
+### Currently Supported To-do List Backends
 
 - Simple text or markdown file with indentation based sub-lists
 - Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
@@ -70,8 +81,9 @@ A simple, performance-oriented, activity tracker that flexibly connects multiple
 - [TaskWarrior](https://taskwarrior.org/)
 - [Vikunja](https://www.vikunja.io)
 - [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
+- [Trello](https://www.trello.com)
 
-### Currently Supported Time Trackers
+### Currently Supported Time Tracker Backends 
 
 - CSV file  
 - [ActivityWatch](https://www.activitywatch.net)      
@@ -79,53 +91,62 @@ A simple, performance-oriented, activity tracker that flexibly connects multiple
 - [TimeWarrior](https://timewarrior.net)
 
 
+## Installation (using pipx) 
 
-<!-- ## Installation pipx 
-If you don't have pipx install 
+1. Run the following in terminal to install with dependencies:
 ```
-sudo apt install pipx
+sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
 pipx ensurepath
-``` -->
+pipx install NowFocus
+``` 
+2. Now run `nowfocus` and check for errors
 
+3. Set up a keybinding (on Ubuntu or Linux Mint), open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `nowfocus`, and pick whatever key combo you'd like.
 
-## Installation 
+4. Add the following command to your startup applications: `nowfocus --force` 
 
-- Install dependencies:
-```
-sudo apt install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv pip libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
-```
 
-<!-- python3-gi python3-gi-cairo -->
+## Usage
 
-- Set up a python [venv](https://docs.python.org/3/tutorial/venv.html)
-```
-python3 -m venv .venv/nowfocus  
-source .venv/nowfocus/bin/activate 
-```
+#### Set up to-do lists and time trackers
 
-### Install with Pip
-```
-pip install nowfocus
-```
-- Run `python3  -m what-am-doing` and check for errors    
+Open NowFocus **Settings** from the indicator menu or tasks window and connect your to-do lists and time tracker(s) 
+
+#### Task Window Keybindings
+
+- `F11` Toggle fullscreen
+- `Esc` Close task window
+- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Ctrl + P` **Pause** current task
+- `Ctrl + D` Pause current task and mark it **Done**
+- `Ctrl + X` Cancel current task
+- `Ctrl + N` **New** task
+- `Ctrl + R` **Refresh** todolists
+- `Ctrl + L` or `Ctrl + F` **Focus** the task search
 
-- Add the following to your startup applications  `bash -c "source .venv/nowfocus/bin/activate; python3  -m what-am-doing"` 
+#### Commandline Interface
 
+- To raise the task window use simply: `nowfocus`  
+- If NowFocus has crashed or failed to shut down nicely use `nowfocus --force`
+- To start timing a task: add the task name as the first positional argument. `nowfocus "checking email"`
+- To stop timing use `nowfocus stop`
+- Start with verbose logging use: `nowfocus -l 3`
+- Start with targeted verbose logging use: `nowfocus -s trello`
 
-### Install from Source 
 
-- Clone this repo into some out-of-the-way directory (referred to as `YOUR_INSTALL_PATH`) 
-- Change to `YOUR_INSTALL_PATH` directory with `cd /path/to/where/you/cloned/nowfocus`
+## Development
 
-- Install required python modules: `pip install -r requirements.txt`
-- Run `python3 __main__.py` and check for errors    
-- Add the following to your startup applications: `bash -c "source .venv/nowfocus/bin/activate; python3 /YOUR_INSTALL_PATH/src/what-am-doing/__main__.py"` 
+### Install from Source
 
+- Install dependencies from above.  
+- Clone this repo somewhere (referred to as `YOUR_INSTALL_PATH`)  
+- Change to `YOUR_INSTALL_PATH` directory with `cd YOUR_INSTALL_PATH/nowfocus`  
+- build python module with `python3 -m build` (this should be done in a venv and will require some dependecies...)  
+- pipx install -e --force YOUR_INSTALL_PATH/monotask/  
 
-## Usage 
 
-- Open settings and add your to-do list and time tracker details
 
+<!-- 
 ## Build Flatpak
 
 ```
@@ -134,23 +155,7 @@ python3 -m build
 flatpak run org.flatpak.Builder --force-clean --user --install --install-deps-from=flathub --repo=repo builddir APPID.yaml
 flatpak run APPID
 ```
-
-## Keybindings
-
-To set up a keybinding to open your tasks on Ubuntu or Linux Mint, open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `/YOUR_INSTALL_PATH/src/what-am-doing/signal.sh`, and pick whatever key combo you'd like.
-
-### Task Window Keybindings
-
-
-- `F11` Toggle fullscreen
-- `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
-- `Ctrl + P` **Pause** current task
-- `Ctrl + D` Pause current task and mark it **Done**
-- `Ctrl + X` Cancel current task
-- `Ctrl + N` **New** task
-- `Ctrl + R` **Refresh** todolists
-- `Ctrl + L` or `Ctrl + F` **Focus** the task search
+ -->
 
 
 <!-- ## Contributing

{nowfocus-0.2.0 → nowfocus-0.2.3}/src/nowfocus/__main__.py

@@ -717,7 +717,8 @@ 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 ",pipe_file)
+
         try:
             with open(pipe_file, "r") as pipe:
                 data = pipe.read().strip()

{nowfocus-0.2.0 → nowfocus-0.2.3}/src/nowfocus/conf.py

@@ -21,7 +21,7 @@ user_settings_dir = GLib.get_user_config_dir()+"/"+app_id
 Path(user_settings_dir).mkdir(parents=True, exist_ok=True)
 
 debug_level = 1 # dev value 
-debug_systems = ['todoloading']
+debug_systems = []
 
 # key and type must be the same, (Seems redundant but it's is quite helpful) 
 connectors = {

{nowfocus-0.2.0 → nowfocus-0.2.3}/src/nowfocus/task_window.py

@@ -41,17 +41,13 @@ class TaskWindow(Gtk.Window):
 
         self.set_default_size(900,400)
 
-
-        self.search_cache_refresh_time = now()
+        self.search_cache_refresh_time = now().strftime("%Y-%m-%d %H:%M:%S")
         self.search_cache = {}
         self.task_rclick_menu = Gtk.Popover()
         self.task_rclick_menu.set_name('task_rclick_menu')
 
         self.num_initial_tasks = 25
 
-        # self.set_icon_from_file(os.path.abspath('icon/icon-0.svg')) # doesn't work
-        # self.set_icon(os.path.abspath('icon/icon-0.svg')) # doesn't work
-
         self.app = app
         session = app.session
         self.set_name("TaskWindow") # set css id
@@ -184,31 +180,21 @@ class TaskWindow(Gtk.Window):
             if todo['status']:
                 try:
                     openable = conf.todo_connectors[todo['type']].launch
-                    if openable not in openables:  
+                    # if openable not in openables:  
 
-                        openables.append(openable)
+                    openables.append(openable)
 
-                        openable_button = Gtk.Button(label=GLib.markup_escape_text(todo['label']))
-                        lamb
-                        openable_button.connect("clicked", lambda todo: openable(todo)) # Doesn't work because of passing widget as first argument
-                        # openable_button.connect("clicked",  openable, todo) # Doesn't work because of passing widget as first argument
-                        openable_button.set_property("tooltip-text","Open (new) "+GLib.markup_escape_text(todo['label']))
-                        self.buttons_box.add(openable_button)
+                    openable_button = Gtk.Button(label=GLib.markup_escape_text(todo['label']))
+                    
+                    openable_button.connect("clicked", lambda todo: openable(todo))
+                    # openable_button.connect("clicked",  openable, todo) # Doesn't work because of passing widget as first argument
+                    openable_button.set_property("tooltip-text","Open (new) "+GLib.markup_escape_text(todo['label']))
+                    self.buttons_box.add(openable_button)
 
                 except Exception as e:
-                    dbg("error adding todo connector open() to task window ",e)
+                    dbg("error adding todo connector open() to task window ",e, s='taskwindow')
 
 
-                # Old get_connector_openable version
-                # openable = get_connector_openable(None, todolist,False)
-                # if openable not in openables:            
-                #     openables.append(openable)
-                    
-                #     # TODO: encode label
-                #     openable_button = Gtk.Button(label=GLib.markup_escape_text(todolist['label']))
-                #     openable_button.connect("clicked", get_connector_openable, todolist)
-                #     openable_button.set_property("tooltip-text","Open "+GLib.markup_escape_text(todolist['label']))
-                #     self.buttons_box.add(openable_button)
             
 
         self.new_task_button = Gtk.Button(label="New Task")
@@ -252,7 +238,6 @@ class TaskWindow(Gtk.Window):
 
     def refresh_search_cache(self,w = None):
         self.search_cache = {}
-        # self.search_cache_refresh_time = now()
         self.search_cache_refresh_time = now().strftime("%Y-%m-%d %H:%M:%S")
         self.task_search(self.taskEntry)
         
@@ -397,7 +382,7 @@ class TaskWindow(Gtk.Window):
         self.tasks_box.show_all()
         self.shown_tasks.clear()
 
-        i = widget.get_text()
+        self.search_term = i = widget.get_text()
 
         # utils.dbg({"task search":i},s='taskwindow')
         if i in self.search_cache:
@@ -417,7 +402,7 @@ class TaskWindow(Gtk.Window):
                     total_duration += int(t['duration'])
 
                 if count < self.num_initial_tasks:
-                    self.add_task_to_list(t,i)
+                    self.add_task_to_list(t)
                 else:
                     self.lazy_loadable_tasks[id] = t
 
@@ -428,9 +413,10 @@ class TaskWindow(Gtk.Window):
 
 
 
-    def add_task_to_list(self,t,search_str = ''):
+    def add_task_to_list(self,t):
 
         try:
+            search_str = self.search_term
             utils.dbg("add_task_to_list "+ str(t['extended_label']), "status",t['status'], s='taskwindow',l=3)
 
             # self.shown_tasks[t['id']] = Gtk.Button() # Works but does not accept popovers
@@ -445,6 +431,7 @@ class TaskWindow(Gtk.Window):
             extended_label = GLib.markup_escape_text(t['extended_label'],)
             
             if len(search_str) > 1:
+                
                 # fts5 match highlighting, not that good because it highlights the whole word rather than the matching part...
                 # extended_label = extended_label.replace('[[',"<b>").replace(']]',"</b>")
 
@@ -454,7 +441,7 @@ class TaskWindow(Gtk.Window):
                 extended_label += " ("+sec_to_time(t['duration'])+")"
 
             if t['id'] in conf.user['task_commands'] and conf.user['task_commands'][t['id']]['status']:
-                extended_label += " ["+conf.user['task_commands'][t['id']]['command']+"]"
+                extended_label += " ["+GLib.markup_escape_text(conf.user['task_commands'][t['id']]['command'])+"]"
 
             if t['priority']:
                 extended_label = str(t['priority']) +" "+ extended_label

{nowfocus-0.2.0 → nowfocus-0.2.3}/src/nowfocus/utils.py

@@ -578,12 +578,12 @@ def db_set_item(i,table = "tasks"):
     if table == 'tasks':
         reindex(raw)
 
-def db_edit_session(session, column, new_value):
-    dbg("db_edit_session", session, 'column', column, 'new value', new_value)
+# def db_edit_session(session, column, new_value):
+#     dbg("db_edit_session", session, 'column', column, 'new value', new_value)
     
-    db_query("UPDATE session set ? = ? WHERE start_time = ? AND extended_Label = ? LIMIT 1",(column, new_value, session['start_time'], session['extended_label']))
+#     db_query("UPDATE session set ? = ? WHERE start_time = ? AND extended_Label = ? LIMIT 1",(column, new_value, session['start_time'], session['extended_label']))
     
-    db_query("select * FROM sessions WHERE start_time = ? AND extended_Label = ? ",(session['start_time'], session['extended_label']))
+#     db_query("select * FROM sessions WHERE start_time = ? AND extended_Label = ? ",(session['start_time'], session['extended_label']))
 
 def db_set_todolist(todolist_id,lists,tasks):
     # print('db_set_todolist params: \ntodolist_id: ',todolist_id,'lists: ',lists,'tasks: ',tasks)
@@ -638,7 +638,7 @@ def db_cleanup(widget = None):
     # print("Active todolist ids",ids)
 
     # Delete unlinked tasks
-    db_query('DELETE FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
+    # db_query('DELETE FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
     # print(len(orphaned_tasks),"orphaned_tasks",orphaned_tasks)
     # orphaned_tasks = db_query('SELECT id, extended_label, todolist FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
     # print(len(orphaned_tasks),"orphaned_tasks",orphaned_tasks)

nowfocus-0.2.0/README.md

@@ -1,112 +0,0 @@
-# NowFocus
-
-A simple, performance-oriented, activity tracker that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar.
-
-
-## Features
-
-- Unlimited flexible combinations of to-do lists and time tracking systems  
-- Flexibly nested lists  
-- Inactivity detection that automatically pauses time tracking 
-- Pomodoro timer  
-- Task prioritization
-- Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though 
-- Randomness interrupt bell (optional) to keep you on track with tracking your time
-- Fast, keyboard-driven, interface 
-- Offline to-do list cache 
-- Tested on Ubuntu and Linux Mint with Xorg and Wayland
-
-### Currently Supported Todo Lists
-
-- Simple text or markdown file with indentation based sub-lists
-- Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
-- [todotxt format](http://todotxt.org/)
-- [TaskWarrior](https://taskwarrior.org/)
-- [Vikunja](https://www.vikunja.io)
-- [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
-
-### Currently Supported Time Trackers
-
-- CSV file  
-- [ActivityWatch](https://www.activitywatch.net)      
-- [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
-- [TimeWarrior](https://timewarrior.net)
-
-
-
-<!-- ## Installation pipx 
-If you don't have pipx install 
-```
-sudo apt install pipx
-pipx ensurepath
-``` -->
-
-
-## Installation 
-
-- Install dependencies:
-```
-sudo apt install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv pip libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
-```
-
-<!-- python3-gi python3-gi-cairo -->
-
-- Set up a python [venv](https://docs.python.org/3/tutorial/venv.html)
-```
-python3 -m venv .venv/nowfocus  
-source .venv/nowfocus/bin/activate 
-```
-
-### Install with Pip
-```
-pip install nowfocus
-```
-- Run `python3  -m what-am-doing` and check for errors    
-
-- Add the following to your startup applications  `bash -c "source .venv/nowfocus/bin/activate; python3  -m what-am-doing"` 
-
-
-### Install from Source 
-
-- Clone this repo into some out-of-the-way directory (referred to as `YOUR_INSTALL_PATH`) 
-- Change to `YOUR_INSTALL_PATH` directory with `cd /path/to/where/you/cloned/nowfocus`
-
-- Install required python modules: `pip install -r requirements.txt`
-- Run `python3 __main__.py` and check for errors    
-- Add the following to your startup applications: `bash -c "source .venv/nowfocus/bin/activate; python3 /YOUR_INSTALL_PATH/src/what-am-doing/__main__.py"` 
-
-
-## Usage 
-
-- Open settings and add your to-do list and time tracker details
-
-## Build Flatpak
-
-```
-python3 -m build
-# python3 flatpak-pip-generator --runtime=org.gnome.Sdk/x86_64/47 PACKAGE # run this for lots of stuff
-flatpak run org.flatpak.Builder --force-clean --user --install --install-deps-from=flathub --repo=repo builddir APPID.yaml
-flatpak run APPID
-```
-
-## Keybindings
-
-To set up a keybinding to open your tasks on Ubuntu or Linux Mint, open **Setting > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `/YOUR_INSTALL_PATH/src/what-am-doing/signal.sh`, and pick whatever key combo you'd like.
-
-### Task Window Keybindings
-
-
-- `F11` Toggle fullscreen
-- `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
-- `Ctrl + P` **Pause** current task
-- `Ctrl + D` Pause current task and mark it **Done**
-- `Ctrl + X` Cancel current task
-- `Ctrl + N` **New** task
-- `Ctrl + R` **Refresh** todolists
-- `Ctrl + L` or `Ctrl + F` **Focus** the task search
-
-
-<!-- ## Contributing
-Package it for your operating system.
-Write a connector for your favorite to-do list or time tracker -->