Merge pull request #21 from Hashino/next

fix: sync tasks

Author: Hashino

lua/doing.lua

@@ -35,11 +35,11 @@ function Doing.add(task, to_front)
     end
 
     state.add(task, to_front)
-    utils.task_modified()
+    state.task_modified()
   else
     vim.ui.input({ prompt = "Enter the new task: ", }, function(input)
       state.add(input, to_front)
-      utils.task_modified()
+      state.task_modified()
     end)
   end
 end
@@ -55,44 +55,27 @@ function Doing.done()
     state.done()
 
     if #state.tasks == 0 then
-      utils.show_message("All tasks done ")
+      state.show_message("All tasks done ")
     elseif not config.options.show_remaining then
-      utils.show_message(#state.tasks .. " tasks left.")
+      state.show_message(#state.tasks .. " tasks left.")
     else
-      utils.task_modified()
+      state.task_modified()
     end
   else
-    utils.show_message("Not doing any task")
+    state.show_message("Not doing any task")
   end
 end
 
 ---@param force? boolean return status even if the plugin is toggled off
 ---@return string current current plugin task or message
 function Doing.status(force)
-  if (state.view_enabled or force) and utils.should_display() then
-    local count = #state.tasks or 0
-    if state.message then
-      return state.message
-    elseif count > 0 then
-      local tasks_left = ""
-
-      -- append task count number if there is more than 1 task
-      if config.options.show_remaining and count > 1 then
-        tasks_left = "  +" .. (count - 1) .. " more"
-      end
-
-      return config.options.doing_prefix .. state.tasks[1] .. tasks_left
-    elseif force then
-      return "Not doing any tasks"
-    end
-  end
-  return ""
+  return state.status(force)
 end
 
 ---toggle the visibility of the plugin
 function Doing.toggle()
   state.view_enabled = not state.view_enabled
-  utils.task_modified()
+  state.task_modified()
 end
 
 ---@return integer number of tasks left

lua/doing/edit.lua

@@ -1,5 +1,4 @@
 local win_cfg = require("doing.config").options.edit_win_config
-local utils   = require("doing.utils")
 local state   = require("doing.state")
 
 local Edit    = {
@@ -25,7 +24,7 @@ function Edit.open_edit()
         end
 
         state.set(lines)
-        vim.defer_fn(utils.task_modified, 0)
+        vim.defer_fn(state.task_modified, 0)
       end,
     })
   end

lua/doing/state.lua

@@ -18,7 +18,7 @@ vim.api.nvim_create_autocmd({ "DirChanged", "VimEnter", }, {
 
     local ok, res = pcall(vim.fn.readfile, tasks_file)
     State.tasks = ok and res or {}
-    utils.task_modified()
+    State.task_modified()
   end,
 })
 
@@ -36,7 +36,9 @@ local function sync()
     end)()
   end
 
-  if #State.tasks > 0 and not vim.fn.writefile(State.tasks, tasks_file) then
+  local ok = pcall(vim.fn.writefile, State.tasks, tasks_file)
+
+  if #State.tasks > 0 and not ok then
     utils.notify("error writing to tasks file", vim.log.levels.ERROR)
   end
 end
@@ -45,19 +47,70 @@ if not config.options.store.sync_tasks then
   vim.api.nvim_create_autocmd("VimLeave", { callback = sync, })
 end
 
-function State.add(str, to_front)
-  table.insert(State.tasks, to_front and 1 or #State.tasks, str)
+---@param force? boolean return status even if the plugin is toggled off
+---@return string current current plugin task or message
+function State.status(force)
+  if (State.view_enabled or force) and utils.should_display() then
+    local count = #State.tasks or 0
+    if State.message then
+      return State.message
+    elseif count > 0 then
+      local tasks_left = ""
+
+      -- append task count number if there is more than 1 task
+      if config.options.show_remaining and count > 1 then
+        tasks_left = "  +" .. (count - 1) .. " more"
+      end
+
+      return config.options.doing_prefix .. State.tasks[1] .. tasks_left
+    elseif force then
+      return "Not doing any tasks"
+    end
+  end
+  return ""
+end
+
+---show a message for the duration of `options.message_timeout` or timeout
+---@param str string message to show
+---@param timeout? number time in ms to show message
+function State.show_message(str, timeout)
+  if config.options.show_messages then
+    State.message = str
+    State.task_modified()
+
+    vim.defer_fn(function()
+      State.message = nil
+      State.task_modified()
+    end, timeout or config.options.message_timeout)
+  else
+    State.task_modified()
+  end
+end
+
+---gets called when a task is added, edited, or removed
+function State.task_modified()
+  if config.options.winbar.enabled then
+    vim.api.nvim_set_option_value("winbar", State.status(), { scope = "local", })
+  end
+
+  vim.api.nvim_exec_autocmds("User", { pattern = "TaskModified", })
   return config.options.store.sync_tasks and sync()
 end
 
+function State.add(str, to_front)
+  if to_front then
+    table.insert(State.tasks, 1, str)
+  else
+    table.insert(State.tasks, str)
+  end
+end
+
 function State.done()
   table.remove(State.tasks, 1)
-  return config.options.store.sync_tasks and sync()
 end
 
 function State.set(tasks)
   State.tasks = tasks
-  return config.options.store.sync_tasks and sync()
 end
 
 return State

lua/doing/utils.lua

@@ -5,8 +5,8 @@ local Utils = {}
 ---redraw winbar depending on if there are tasks
 function Utils.update_winbar()
   if config.options.winbar.enabled then
-    local status = require("doing").status()
-    vim.api.nvim_set_option_value("winbar", status, { scope = "local", })
+    vim.api.nvim_set_option_value("winbar", require("doing").status(),
+      { scope = "local", })
   end
 end
 
@@ -57,31 +57,6 @@ function Utils.should_display()
   return true
 end
 
----gets called when a task is added, edited, or removed
-function Utils.task_modified()
-  Utils.update_winbar()
-  vim.api.nvim_exec_autocmds("User", {
-    pattern = "TaskModified",
-  })
-end
-
----show a message for the duration of `options.message_timeout` or timeout
----@param str string message to show
----@param timeout? number time in ms to show message
-function Utils.show_message(str, timeout)
-  if config.options.show_messages then
-    require("doing.state").message = str
-    Utils.task_modified()
-
-    vim.defer_fn(function()
-      require("doing.state").message = nil
-      Utils.task_modified()
-    end, timeout or config.options.message_timeout)
-  else
-    Utils.task_modified()
-  end
-end
-
 function Utils.os_path_separator()
   local dir_separator = "/"
   if (vim.loop or vim.uv).os_uname().sysname:find("Windows") then