feat(codechef): implement full CodeChef support (#354)
## Problem CodeChef had no working login, submit, or contest list. The browser selectors were wrong, the contest list was missing present/past contests, and problem/contest URLs were unset. ## Solution Fix login and submit selectors for the Drupal-based site. Paginate `/api/list/contests/past` to collect all 228 Starters, then expand each parent contest into individual division entries (e.g. `START228 (Div. 4)`). Add language IDs, correct `url`/`contest_url`/`standings_url` in metadata, and make `:CP <platform>` open the contest picker directly.
This commit is contained in:
parent
c7f2af16d4
commit
3c11d609f5
26 changed files with 336 additions and 158 deletions
|
|
@ -266,6 +266,7 @@ end
|
|||
---@param memory_mb number
|
||||
---@param interactive boolean
|
||||
---@param multi_test boolean
|
||||
---@param precision number?
|
||||
function M.set_test_cases(
|
||||
platform,
|
||||
contest_id,
|
||||
|
|
@ -467,6 +468,7 @@ function M.clear_credentials(platform)
|
|||
M.save()
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.clear_all()
|
||||
cache_data = {}
|
||||
M.save()
|
||||
|
|
@ -488,6 +490,7 @@ function M.get_data_pretty()
|
|||
return vim.inspect(cache_data)
|
||||
end
|
||||
|
||||
---@return table
|
||||
function M.get_raw_cache()
|
||||
return cache_data
|
||||
end
|
||||
|
|
|
|||
|
|
@ -257,10 +257,7 @@ local function parse_command(args)
|
|||
|
||||
if vim.tbl_contains(platforms, first) then
|
||||
if #args == 1 then
|
||||
return {
|
||||
type = 'error',
|
||||
message = 'Too few arguments - specify a contest.',
|
||||
}
|
||||
return { type = 'action', action = 'pick', requires_context = false, platform = first }
|
||||
elseif #args == 2 then
|
||||
if args[2] == 'login' or args[2] == 'logout' or args[2] == 'signup' then
|
||||
return { type = 'action', action = args[2], requires_context = false, platform = first }
|
||||
|
|
@ -362,6 +359,7 @@ local function check_platform_enabled(platform)
|
|||
end
|
||||
|
||||
--- Core logic for handling `:CP ...` commands
|
||||
---@param opts { fargs: string[] }
|
||||
---@return nil
|
||||
function M.handle_command(opts)
|
||||
local cmd = parse_command(opts.fargs)
|
||||
|
|
@ -400,7 +398,7 @@ function M.handle_command(opts)
|
|||
setup.navigate_problem(-1, cmd.language)
|
||||
elseif cmd.action == 'pick' then
|
||||
local picker = require('cp.commands.picker')
|
||||
picker.handle_pick_action(cmd.language)
|
||||
picker.handle_pick_action(cmd.language, cmd.platform)
|
||||
elseif cmd.action == 'edit' then
|
||||
local edit = require('cp.ui.edit')
|
||||
edit.toggle_edit(cmd.test_index)
|
||||
|
|
|
|||
|
|
@ -5,8 +5,9 @@ local logger = require('cp.log')
|
|||
|
||||
--- Dispatch `:CP pick` to appropriate picker
|
||||
---@param language? string
|
||||
---@param platform? string
|
||||
---@return nil
|
||||
function M.handle_pick_action(language)
|
||||
function M.handle_pick_action(language, platform)
|
||||
local config = config_module.get_config()
|
||||
|
||||
if not (config.ui and config.ui.picker) then
|
||||
|
|
@ -54,7 +55,7 @@ function M.handle_pick_action(language)
|
|||
picker = fzf_picker
|
||||
end
|
||||
|
||||
picker.pick(language)
|
||||
picker.pick(language, platform)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -531,10 +531,12 @@ end
|
|||
|
||||
local current_config = nil
|
||||
|
||||
---@param config cp.Config
|
||||
function M.set_current_config(config)
|
||||
current_config = config
|
||||
end
|
||||
|
||||
---@return cp.Config
|
||||
function M.get_config()
|
||||
return current_config or M.defaults
|
||||
end
|
||||
|
|
|
|||
|
|
@ -208,6 +208,12 @@ M.LANGUAGE_VERSIONS = {
|
|||
python = { python3 = 'PYTH 3', pypy3 = 'PYPY3' },
|
||||
java = { java = 'JAVA' },
|
||||
rust = { rust = 'rust' },
|
||||
c = { c = 'C' },
|
||||
go = { go = 'GO' },
|
||||
kotlin = { kotlin = 'KTLN' },
|
||||
javascript = { nodejs = 'NODEJS' },
|
||||
typescript = { typescript = 'TS' },
|
||||
csharp = { csharp = 'C#' },
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ local STATUS_MESSAGES = {
|
|||
installing_browser = 'Installing browser...',
|
||||
}
|
||||
|
||||
---@param platform string?
|
||||
function M.login(platform)
|
||||
platform = platform or state.get_platform()
|
||||
if not platform then
|
||||
|
|
@ -68,6 +69,7 @@ function M.login(platform)
|
|||
end)
|
||||
end
|
||||
|
||||
---@param platform string?
|
||||
function M.logout(platform)
|
||||
platform = platform or state.get_platform()
|
||||
if not platform then
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ local function check()
|
|||
end
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.check()
|
||||
local version = require('cp.version')
|
||||
vim.health.start('cp.nvim health check ~')
|
||||
|
|
|
|||
|
|
@ -38,11 +38,13 @@ function M.handle_command(opts)
|
|||
commands.handle_command(opts)
|
||||
end
|
||||
|
||||
---@return boolean
|
||||
function M.is_initialized()
|
||||
return initialized
|
||||
end
|
||||
|
||||
---@deprecated Use `vim.g.cp` instead
|
||||
---@param user_config table?
|
||||
function M.setup(user_config)
|
||||
vim.deprecate('require("cp").setup()', 'vim.g.cp', 'v0.7.7', 'cp.nvim', false)
|
||||
|
||||
|
|
|
|||
|
|
@ -58,11 +58,18 @@ local function contest_picker(platform, refresh, language)
|
|||
})
|
||||
end
|
||||
|
||||
function M.pick(language)
|
||||
---@param language? string
|
||||
---@param platform? string
|
||||
function M.pick(language, platform)
|
||||
if platform then
|
||||
contest_picker(platform, false, language)
|
||||
return
|
||||
end
|
||||
|
||||
local fzf = require('fzf-lua')
|
||||
local platforms = picker_utils.get_platforms()
|
||||
local entries = vim.tbl_map(function(platform)
|
||||
return platform.display_name
|
||||
local entries = vim.tbl_map(function(p)
|
||||
return p.display_name
|
||||
end, platforms)
|
||||
|
||||
return fzf.fzf_exec(entries, {
|
||||
|
|
@ -74,16 +81,16 @@ function M.pick(language)
|
|||
end
|
||||
|
||||
local selected_name = selected[1]
|
||||
local platform = nil
|
||||
local found = nil
|
||||
for _, p in ipairs(platforms) do
|
||||
if p.display_name == selected_name then
|
||||
platform = p
|
||||
found = p
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if platform then
|
||||
contest_picker(platform.id, false, language)
|
||||
if found then
|
||||
contest_picker(found.id, false, language)
|
||||
end
|
||||
end,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -64,7 +64,14 @@ local function contest_picker(opts, platform, refresh, language)
|
|||
:find()
|
||||
end
|
||||
|
||||
function M.pick(language)
|
||||
---@param language? string
|
||||
---@param platform? string
|
||||
function M.pick(language, platform)
|
||||
if platform then
|
||||
contest_picker({}, platform, false, language)
|
||||
return
|
||||
end
|
||||
|
||||
local opts = {}
|
||||
local platforms = picker_utils.get_platforms()
|
||||
|
||||
|
|
|
|||
|
|
@ -134,6 +134,9 @@ local function race_try_setup(platform, contest_id, language, attempt, token)
|
|||
)
|
||||
end
|
||||
|
||||
---@param platform string
|
||||
---@param contest_id string
|
||||
---@param language? string
|
||||
function M.start(platform, contest_id, language)
|
||||
if not platform or not vim.tbl_contains(constants.PLATFORMS, platform) then
|
||||
logger.log('Invalid platform', { level = vim.log.levels.ERROR })
|
||||
|
|
@ -252,6 +255,7 @@ function M.start(platform, contest_id, language)
|
|||
)
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.stop()
|
||||
local timer = race_state.timer
|
||||
if not timer then
|
||||
|
|
@ -276,6 +280,7 @@ function M.stop()
|
|||
)
|
||||
end
|
||||
|
||||
---@return { active: boolean, platform?: string, contest_id?: string, remaining_seconds?: integer }
|
||||
function M.status()
|
||||
if not race_state.timer or not race_state.start_time then
|
||||
return { active = false }
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@ local function substitute_template(cmd_template, substitutions)
|
|||
return out
|
||||
end
|
||||
|
||||
---@param cmd_template string[]
|
||||
---@param substitutions SubstitutableCommand
|
||||
---@return string[]
|
||||
function M.build_command(cmd_template, substitutions)
|
||||
return substitute_template(cmd_template, substitutions)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -376,6 +376,7 @@ function M.get_highlight_groups()
|
|||
}
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.setup_highlights()
|
||||
local groups = M.get_highlight_groups()
|
||||
for name, opts in pairs(groups) do
|
||||
|
|
|
|||
|
|
@ -216,6 +216,10 @@ local function run_scraper(platform, subcommand, args, opts)
|
|||
end
|
||||
end
|
||||
|
||||
---@param platform string
|
||||
---@param contest_id string
|
||||
---@param callback fun(data: table)?
|
||||
---@param on_error fun()?
|
||||
function M.scrape_contest_metadata(platform, contest_id, callback, on_error)
|
||||
run_scraper(platform, 'metadata', { contest_id }, {
|
||||
on_exit = function(result)
|
||||
|
|
@ -253,6 +257,8 @@ function M.scrape_contest_metadata(platform, contest_id, callback, on_error)
|
|||
})
|
||||
end
|
||||
|
||||
---@param platform string
|
||||
---@return { contests: ContestSummary[], supports_countdown: boolean }?
|
||||
function M.scrape_contest_list(platform)
|
||||
local result = run_scraper(platform, 'contests', {}, { sync = true })
|
||||
if not result or not result.success or not (result.data and result.data.contests) then
|
||||
|
|
@ -330,6 +336,10 @@ function M.scrape_all_tests(platform, contest_id, callback, on_done)
|
|||
})
|
||||
end
|
||||
|
||||
---@param platform string
|
||||
---@param credentials table
|
||||
---@param on_status fun(ev: table)?
|
||||
---@param callback fun(result: table)?
|
||||
function M.login(platform, credentials, on_status, callback)
|
||||
local done = false
|
||||
run_scraper(platform, 'login', {}, {
|
||||
|
|
@ -361,6 +371,14 @@ function M.login(platform, credentials, on_status, callback)
|
|||
})
|
||||
end
|
||||
|
||||
---@param platform string
|
||||
---@param contest_id string
|
||||
---@param problem_id string
|
||||
---@param language string
|
||||
---@param source_file string
|
||||
---@param credentials table
|
||||
---@param on_status fun(ev: table)?
|
||||
---@param callback fun(result: table)?
|
||||
function M.submit(
|
||||
platform,
|
||||
contest_id,
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@ local function build_run_cmd(file)
|
|||
return './' .. file
|
||||
end
|
||||
|
||||
---@param generator_cmd? string
|
||||
---@param brute_cmd? string
|
||||
function M.toggle(generator_cmd, brute_cmd)
|
||||
if state.get_active_panel() == 'stress' then
|
||||
if state.stress_buf and vim.api.nvim_buf_is_valid(state.stress_buf) then
|
||||
|
|
@ -239,6 +241,7 @@ function M.toggle(generator_cmd, brute_cmd)
|
|||
end)
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.cancel()
|
||||
if state.stress_buf and vim.api.nvim_buf_is_valid(state.stress_buf) then
|
||||
local job = vim.b[state.stress_buf].terminal_job_id
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ local function prompt_credentials(platform, callback)
|
|||
end)
|
||||
end
|
||||
|
||||
---@param opts { language?: string }?
|
||||
function M.submit(opts)
|
||||
local platform = state.get_platform()
|
||||
local contest_id = state.get_contest_id()
|
||||
|
|
@ -64,13 +65,13 @@ function M.submit(opts)
|
|||
local eff = plat_effective and plat_effective[language]
|
||||
if eff then
|
||||
if eff.submit_id then
|
||||
submit_language = eff.submit_id
|
||||
submit_language = eff.submit_id or submit_language
|
||||
else
|
||||
local ver = eff.version or constants.DEFAULT_VERSIONS[language]
|
||||
if ver then
|
||||
local versions = (constants.LANGUAGE_VERSIONS[platform] or {})[language]
|
||||
if versions and versions[ver] then
|
||||
submit_language = versions[ver]
|
||||
submit_language = versions[ver] or submit_language
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -331,6 +331,7 @@ setup_keybindings = function(buf)
|
|||
})
|
||||
end
|
||||
|
||||
---@param test_index? integer
|
||||
function M.toggle_edit(test_index)
|
||||
if edit_state then
|
||||
save_all_tests()
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
---@class DiffLayout
|
||||
---@field buffers integer[]
|
||||
---@field windows integer[]
|
||||
---@field mode string
|
||||
---@field cleanup fun()
|
||||
|
||||
local M = {}
|
||||
|
||||
local helpers = require('cp.helpers')
|
||||
|
|
@ -171,6 +177,11 @@ local function create_single_layout(parent_win, content)
|
|||
}
|
||||
end
|
||||
|
||||
---@param mode string
|
||||
---@param parent_win integer
|
||||
---@param expected_content string
|
||||
---@param actual_content string
|
||||
---@return DiffLayout
|
||||
function M.create_diff_layout(mode, parent_win, expected_content, actual_content)
|
||||
if mode == 'single' then
|
||||
return create_single_layout(parent_win, actual_content)
|
||||
|
|
@ -185,6 +196,13 @@ function M.create_diff_layout(mode, parent_win, expected_content, actual_content
|
|||
end
|
||||
end
|
||||
|
||||
---@param current_diff_layout DiffLayout?
|
||||
---@param current_mode string?
|
||||
---@param main_win integer
|
||||
---@param run table
|
||||
---@param config cp.Config
|
||||
---@param setup_keybindings_for_buffer fun(buf: integer)
|
||||
---@return DiffLayout?, string?
|
||||
function M.update_diff_panes(
|
||||
current_diff_layout,
|
||||
current_mode,
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ local current_diff_layout = nil
|
|||
local current_mode = nil
|
||||
local _run_gen = 0
|
||||
|
||||
---@return nil
|
||||
function M.disable()
|
||||
local active_panel = state.get_active_panel()
|
||||
if not active_panel then
|
||||
|
|
@ -351,6 +352,7 @@ local function create_window_layout(output_buf, input_buf)
|
|||
vim.api.nvim_set_current_win(solution_win)
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.ensure_io_view()
|
||||
local platform, contest_id, problem_id =
|
||||
state.get_platform(), state.get_contest_id(), state.get_problem_id()
|
||||
|
|
@ -598,6 +600,9 @@ local function render_io_view_results(io_state, test_indices, mode, combined_res
|
|||
utils.update_buffer_content(io_state.output_buf, output_lines, final_highlights, output_ns)
|
||||
end
|
||||
|
||||
---@param test_indices_arg integer[]?
|
||||
---@param debug boolean?
|
||||
---@param mode? string
|
||||
function M.run_io_view(test_indices_arg, debug, mode)
|
||||
_run_gen = _run_gen + 1
|
||||
local gen = _run_gen
|
||||
|
|
@ -754,10 +759,12 @@ function M.run_io_view(test_indices_arg, debug, mode)
|
|||
end)
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.cancel_io_view()
|
||||
_run_gen = _run_gen + 1
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.cancel_interactive()
|
||||
if state.interactive_buf and vim.api.nvim_buf_is_valid(state.interactive_buf) then
|
||||
local job = vim.b[state.interactive_buf].terminal_job_id
|
||||
|
|
|
|||
|
|
@ -314,6 +314,7 @@ end
|
|||
|
||||
--- Configure the buffer with good defaults
|
||||
---@param filetype? string
|
||||
---@return integer
|
||||
function M.create_buffer_with_options(filetype)
|
||||
local buf = vim.api.nvim_create_buf(false, true)
|
||||
vim.api.nvim_set_option_value('bufhidden', 'hide', { buf = buf })
|
||||
|
|
@ -345,6 +346,7 @@ function M.update_buffer_content(bufnr, lines, highlights, namespace)
|
|||
end
|
||||
end
|
||||
|
||||
---@return boolean, string?
|
||||
function M.check_required_runtime()
|
||||
if is_windows() then
|
||||
return false, 'Windows is not supported'
|
||||
|
|
@ -419,16 +421,19 @@ local function find_gnu_timeout()
|
|||
return _timeout_path, _timeout_reason
|
||||
end
|
||||
|
||||
---@return string?
|
||||
function M.timeout_path()
|
||||
local path = find_gnu_timeout()
|
||||
return path
|
||||
end
|
||||
|
||||
---@return { ok: boolean, path: string|nil, reason: string|nil }
|
||||
function M.timeout_capability()
|
||||
local path, reason = find_gnu_timeout()
|
||||
return { ok = path ~= nil, path = path, reason = reason }
|
||||
end
|
||||
|
||||
---@return string[]
|
||||
function M.cwd_executables()
|
||||
local uv = vim.uv
|
||||
local req = uv.fs_scandir('.')
|
||||
|
|
@ -452,6 +457,7 @@ function M.cwd_executables()
|
|||
return out
|
||||
end
|
||||
|
||||
---@return nil
|
||||
function M.ensure_dirs()
|
||||
vim.system({ 'mkdir', '-p', 'build', 'io' }):wait()
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue