Merge branch 'main' into fix/submit-hardening
# Conflicts: # scrapers/atcoder.py # scrapers/codeforces.py
This commit is contained in:
commit
427d03ec2d
21 changed files with 154 additions and 129 deletions
|
|
@ -19,7 +19,7 @@ local function prompt_credentials(platform, callback)
|
|||
end
|
||||
vim.ui.input({ prompt = platform .. ' username: ' }, function(username)
|
||||
if not username or username == '' then
|
||||
logger.log('Submit cancelled', vim.log.levels.WARN)
|
||||
logger.log('Submit cancelled', { level = vim.log.levels.WARN })
|
||||
return
|
||||
end
|
||||
vim.fn.inputsave()
|
||||
|
|
@ -27,7 +27,7 @@ local function prompt_credentials(platform, callback)
|
|||
vim.fn.inputrestore()
|
||||
vim.cmd.redraw()
|
||||
if not password or password == '' then
|
||||
logger.log('Submit cancelled', vim.log.levels.WARN)
|
||||
logger.log('Submit cancelled', { level = vim.log.levels.WARN })
|
||||
return
|
||||
end
|
||||
local creds = { username = username, password = password }
|
||||
|
|
@ -42,13 +42,13 @@ function M.submit(opts)
|
|||
local problem_id = state.get_problem_id()
|
||||
local language = (opts and opts.language) or state.get_language()
|
||||
if not platform or not contest_id or not problem_id or not language then
|
||||
logger.log('No active problem. Use :CP <platform> <contest> first.', vim.log.levels.ERROR)
|
||||
logger.log('No active problem. Use :CP <platform> <contest> first.', { level = vim.log.levels.ERROR })
|
||||
return
|
||||
end
|
||||
|
||||
local source_file = state.get_source_file()
|
||||
if not source_file or vim.fn.filereadable(source_file) ~= 1 then
|
||||
logger.log('Source file not found', vim.log.levels.ERROR)
|
||||
logger.log('Source file not found', { level = vim.log.levels.ERROR })
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -71,12 +71,13 @@ function M.submit(opts)
|
|||
function(result)
|
||||
vim.schedule(function()
|
||||
if result and result.success then
|
||||
logger.log('Submitted successfully', vim.log.levels.INFO, true)
|
||||
logger.log('Submitted successfully', { level = vim.log.levels.INFO, override = true })
|
||||
else
|
||||
logger.log(
|
||||
'Submit failed: ' .. (result and result.error or 'unknown error'),
|
||||
vim.log.levels.ERROR
|
||||
)
|
||||
local err = result and result.error or 'unknown error'
|
||||
if err:match('^Login failed') then
|
||||
cache.clear_credentials(platform)
|
||||
end
|
||||
logger.log('Submit failed: ' .. err, { level = vim.log.levels.ERROR })
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue