diff --git a/lua/pending/sync/gcal.lua b/lua/pending/sync/gcal.lua index 12264dc..6dddaa6 100644 --- a/lua/pending/sync/gcal.lua +++ b/lua/pending/sync/gcal.lua @@ -154,21 +154,6 @@ local function unlink_remote(task, extra, now_ts) task.modified = now_ts end ----@param parts {[1]: integer, [2]: string}[] ----@return string -local function fmt_counts(parts) - local items = {} - for _, p in ipairs(parts) do - if p[1] > 0 then - table.insert(items, p[1] .. ' ' .. p[2]) - end - end - if #items == 0 then - return 'nothing to do' - end - return table.concat(items, ' | ') -end - ---@param callback fun(access_token: string): nil local function with_token(callback) oauth.async(function() @@ -191,7 +176,7 @@ function M.push() local s = require('pending').store() local now_ts = os.date('!%Y-%m-%dT%H:%M:%SZ') --[[@as string]] - local created, updated, deleted, failed = 0, 0, 0, 0 + local created, updated, deleted = 0, 0, 0 for _, task in ipairs(s:tasks()) do local extra = task._extra or {} @@ -212,7 +197,6 @@ function M.push() delete_event(access_token, cal_id --[[@as string]], event_id --[[@as string]]) if del_err then log.warn('gcal delete failed: ' .. del_err) - failed = failed + 1 else unlink_remote(task, extra, now_ts) deleted = deleted + 1 @@ -230,7 +214,6 @@ function M.push() local upd_err = update_event(access_token, cal_id, event_id, task) if upd_err then log.warn('gcal update failed: ' .. upd_err) - failed = failed + 1 else updated = updated + 1 end @@ -238,12 +221,10 @@ function M.push() local lid, lid_err = find_or_create_calendar(access_token, cat, calendars) if lid_err or not lid then log.warn('gcal calendar failed: ' .. (lid_err or 'unknown')) - failed = failed + 1 else local new_id, create_err = create_event(access_token, lid, task) if create_err then log.warn('gcal create failed: ' .. create_err) - failed = failed + 1 elseif new_id then if not task._extra then task._extra = {} @@ -264,12 +245,7 @@ function M.push() if buffer.bufnr() and vim.api.nvim_buf_is_valid(buffer.bufnr()) then buffer.render(buffer.bufnr()) end - log.info('gcal push: ' .. fmt_counts({ - { created, 'added' }, - { updated, 'updated' }, - { deleted, 'removed' }, - { failed, 'failed' }, - })) + log.info(string.format('Google Calendar pushed — +%d ~%d -%d', created, updated, deleted)) end) end diff --git a/lua/pending/sync/gtasks.lua b/lua/pending/sync/gtasks.lua index a2a6da0..7337030 100644 --- a/lua/pending/sync/gtasks.lua +++ b/lua/pending/sync/gtasks.lua @@ -195,21 +195,6 @@ local function unlink_remote(task, now_ts) task.modified = now_ts end ----@param parts {[1]: integer, [2]: string}[] ----@return string -local function fmt_counts(parts) - local items = {} - for _, p in ipairs(parts) do - if p[1] > 0 then - table.insert(items, p[1] .. ' ' .. p[2]) - end - end - if #items == 0 then - return 'nothing to do' - end - return table.concat(items, ' | ') -end - ---@param task pending.Task ---@return table local function task_to_gtask(task) @@ -465,12 +450,9 @@ function M.push() if buffer.bufnr() and vim.api.nvim_buf_is_valid(buffer.bufnr()) then buffer.render(buffer.bufnr()) end - log.info('gtasks push: ' .. fmt_counts({ - { created, 'added' }, - { updated, 'updated' }, - { deleted, 'deleted' }, - { failed, 'failed' }, - })) + log.info( + string.format('Google Tasks pushed — +%d ~%d -%d !%d', created, updated, deleted, failed) + ) end) end @@ -492,12 +474,15 @@ function M.pull() if buffer.bufnr() and vim.api.nvim_buf_is_valid(buffer.bufnr()) then buffer.render(buffer.bufnr()) end - log.info('gtasks pull: ' .. fmt_counts({ - { created, 'added' }, - { updated, 'updated' }, - { unlinked, 'unlinked' }, - { failed, 'failed' }, - })) + log.info( + string.format( + 'Google Tasks pulled — +%d ~%d !%d, unlinked: %d', + created, + updated, + failed, + unlinked + ) + ) end) end @@ -521,17 +506,19 @@ function M.sync() if buffer.bufnr() and vim.api.nvim_buf_is_valid(buffer.bufnr()) then buffer.render(buffer.bufnr()) end - log.info('gtasks sync — push: ' .. fmt_counts({ - { pushed_create, 'added' }, - { pushed_update, 'updated' }, - { pushed_delete, 'deleted' }, - { pushed_failed, 'failed' }, - }) .. ' pull: ' .. fmt_counts({ - { pulled_create, 'added' }, - { pulled_update, 'updated' }, - { unlinked, 'unlinked' }, - { pulled_failed, 'failed' }, - })) + log.info( + string.format( + 'Google Tasks synced — push: +%d ~%d -%d !%d, pull: +%d ~%d !%d, unlinked: %d', + pushed_create, + pushed_update, + pushed_delete, + pushed_failed, + pulled_create, + pulled_update, + pulled_failed, + unlinked + ) + ) end) end