Skip to content

Fix time kept when no workspace or line numbers on #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
spiknyckel wants to merge 2 commits into from
Closed

Fix time kept when no workspace or line numbers on #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20bbe08
Fix time kept when no workspace or line numbers on
spiknyckel Dec 31, 2022
2319305
Added workspace to Editing text
spiknyckel Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions lua/presence/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function Presence:setup(options)
self:set_option("neovim_image_text", "The One True Text Editor")
self:set_option("enable_line_number", false)
-- Status text options
self:set_option("editing_text", "Editing %s")
self:set_option("editing_text", "Editing %s %s")
self:set_option("file_explorer_text", "Browsing %s")
self:set_option("git_commit_text", "Committing changes")
self:set_option("plugin_manager_text", "Managing plugins")
Expand Down Expand Up @@ -465,7 +465,7 @@ function Presence:format_status_text(status_type, ...)
end

-- Get the status text for the current buffer
function Presence:get_status_text(filename)
function Presence:get_status_text(filename, workspace_name)
local file_explorer = file_explorers[vim.bo.filetype:match "[^%d]+"]
or file_explorers[(filename or ""):match "[^%d]+"]
local plugin_manager = plugin_managers[vim.bo.filetype]
Expand All @@ -477,12 +477,17 @@ function Presence:get_status_text(filename)
end

if not filename or filename == "" then return nil end
if workspace_name ~= nil and workspace_name ~= "" then
workspace_name = "in " .. workspace_name
else
workspace_name = ""
end

if vim.bo.modifiable and not vim.bo.readonly then
if vim.bo.filetype == "gitcommit" then
return self:format_status_text("git_commit", filename)
elseif filename then
return self:format_status_text("editing", filename)
return self:format_status_text("editing", filename, workspace_name)
end
elseif filename then
return self:format_status_text("reading", filename)
Expand Down Expand Up @@ -771,16 +776,17 @@ function Presence:update_for_buffer(buffer, should_debounce)
local extension = filename and self.get_file_extension(filename) or nil
self.log:debug(string.format("Parsed filename %s with %s extension", filename, extension or "no"))

-- Return early if there is no valid activity status text to set
local status_text = self:get_status_text(filename)
if not status_text then
return self.log:debug("No status text for the given buffer, skipping...")
end

-- Get project information
self.log:debug(string.format("Getting project name for %s...", parent_dirpath))
local project_name, project_path = self:get_project_name(parent_dirpath)

-- Return early if there is no valid activity status text to set
local status_text = self:get_status_text(filename, project_name)
if not status_text then
return self.log:debug("No status text for the given buffer, skipping...")
end

-- Check for blacklist
local is_blacklisted = #self.options.blacklist > 0 and self:check_blacklist(buffer, parent_dirpath, project_path)
if is_blacklisted then
Expand All @@ -791,9 +797,8 @@ function Presence:update_for_buffer(buffer, should_debounce)
end

local activity_set_at = os.time()
-- If we shouldn't debounce and we trigger an activity, keep this value the same.
-- Otherwise set it to the current time.
local relative_activity_set_at = should_debounce and self.last_activity.relative_set_at or os.time()
-- Set the relative time if it does not already exist
local relative_activity_set_at = self.last_activity.relative_set_at or os.time()

self.log:debug(string.format("Setting activity for %s...", buffer and #buffer > 0 and buffer or "unnamed buffer"))

Expand Down