barrett/cp.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(commands): canonicalize CF contest IDs and auto-restore on action

Browse source 
Problem: two related gaps in `handle_command` and `parse_command`.
Codeforces contest IDs were passed through raw, so URLs or problem IDs
with trailing letters (e.g. `1933A`, full contest URLs) caused scraper
failures. Separately, action commands like `:CP run` silently failed
when invoked with no active contest instead of attempting recovery.

Solution: add `canonicalize_cf_contest` to strip URLs and trailing
problem letters before building the `contest_setup` command. Add a
guard in `handle_command` that calls `restore_from_current_file()`
before dispatching any contest-requiring action when no platform is
active, returning early if no cached state is found.
This commit is contained in:
Barrett Ruth 2026-03-05 15:29:09 -05:00
parent a67e0d5db8
commit b5aaac3862
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lua/cp/commands/init.lua
View file

@ -25,6 +25,16 @@ local actions = constants.ACTIONS
---@field language? string ---@field language? string
---@field subcommand? string ---@field subcommand? string
---@param str string
---@return string
local function canonicalize_cf_contest(str)
local id = str:match('/contest/(%d+)') or str:match('/problemset/problem/(%d+)')
if id then return id end
local num = str:match('^(%d+)[A-Za-z]')
if num then return num end
return str
end
--- Turn raw args into normalized structure to later dispatch --- Turn raw args into normalized structure to later dispatch
---@param args string[] The raw command-line mode args ---@param args string[] The raw command-line mode args
---@return ParsedCommand ---@return ParsedCommand
@ -246,16 +256,24 @@ local function parse_command(args)
if args[2] == 'login' or args[2] == 'logout' then if args[2] == 'login' or args[2] == 'logout' then
return { type = 'action', action = args[2], platform = first } return { type = 'action', action = args[2], platform = first }
end end
local contest = args[2]
if first == 'codeforces' then
contest = canonicalize_cf_contest(contest)
end
return { return {
type = 'contest_setup', type = 'contest_setup',
platform = first, platform = first,
contest = args[2], contest = contest,
} }
elseif #args == 4 and args[3] == '--lang' then elseif #args == 4 and args[3] == '--lang' then
local contest = args[2]
if first == 'codeforces' then
contest = canonicalize_cf_contest(contest)
end
return { return {
type = 'contest_setup', type = 'contest_setup',
platform = first, platform = first,
contest = args[2], contest = contest,
language = args[4], language = args[4],
} }
else else
@ -296,6 +314,14 @@ function M.handle_command(opts)
local restore = require('cp.restore') local restore = require('cp.restore')
restore.restore_from_current_file() restore.restore_from_current_file()
elseif cmd.type == 'action' then elseif cmd.type == 'action' then
local CONTEST_ACTIONS = { 'run', 'panel', 'edit', 'interact', 'stress', 'submit', 'next', 'prev', 'pick' }
if vim.tbl_contains(CONTEST_ACTIONS, cmd.action) and not state.get_platform() then
local restore = require('cp.restore')
if not restore.restore_from_current_file() then
return
end
end
local setup = require('cp.setup') local setup = require('cp.setup')
local ui = require('cp.ui.views') local ui = require('cp.ui.views')