Compare commits

..

No commits in common. "646a417cf79fdd0a0ae359937c3642ae6d431229" and "8465e707725940c2fccf7dcdcbfe832da258003f" have entirely different histories.

5 changed files with 147 additions and 104 deletions

View file

@ -306,6 +306,12 @@ def _login_headless(credentials: dict[str, str]) -> LoginResult:
cookie_cache = Path.home() / ".cache" / "cp-nvim" / "atcoder-cookies.json"
cookie_cache.parent.mkdir(parents=True, exist_ok=True)
saved_cookies: list[dict[str, Any]] = []
if cookie_cache.exists():
try:
saved_cookies = json.loads(cookie_cache.read_text())
except Exception:
pass
logged_in = False
login_error: str | None = None
@ -334,7 +340,15 @@ def _login_headless(credentials: dict[str, str]) -> LoginResult:
headless=True,
timeout=BROWSER_SESSION_TIMEOUT,
google_search=False,
cookies=saved_cookies if saved_cookies else [],
) as session:
if saved_cookies:
print(json.dumps({"status": "checking_login"}), flush=True)
session.fetch(
f"{BASE_URL}/home", page_action=check_login, network_idle=True
)
if not logged_in:
print(json.dumps({"status": "logging_in"}), flush=True)
session.fetch(
f"{BASE_URL}/login",
@ -342,7 +356,9 @@ def _login_headless(credentials: dict[str, str]) -> LoginResult:
solve_cloudflare=True,
)
if login_error:
return LoginResult(success=False, error=f"Login failed: {login_error}")
return LoginResult(
success=False, error=f"Login failed: {login_error}"
)
session.fetch(
f"{BASE_URL}/home", page_action=check_login, network_idle=True

View file

@ -65,6 +65,12 @@ def _login_headless_codechef(credentials: dict[str, str]) -> LoginResult:
_ensure_browser()
_COOKIE_PATH.parent.mkdir(parents=True, exist_ok=True)
saved_cookies: list[dict[str, Any]] = []
if _COOKIE_PATH.exists():
try:
saved_cookies = json.loads(_COOKIE_PATH.read_text())
except Exception:
pass
logged_in = False
login_error: str | None = None
@ -94,13 +100,25 @@ def _login_headless_codechef(credentials: dict[str, str]) -> LoginResult:
headless=True,
timeout=BROWSER_SESSION_TIMEOUT,
google_search=False,
cookies=saved_cookies if saved_cookies else [],
) as session:
if saved_cookies:
print(json.dumps({"status": "checking_login"}), flush=True)
session.fetch(
f"{BASE_URL}/", page_action=check_login, network_idle=True
)
if not logged_in:
print(json.dumps({"status": "logging_in"}), flush=True)
session.fetch(f"{BASE_URL}/login", page_action=login_action)
if login_error:
return LoginResult(success=False, error=f"Login failed: {login_error}")
return LoginResult(
success=False, error=f"Login failed: {login_error}"
)
session.fetch(f"{BASE_URL}/", page_action=check_login, network_idle=True)
session.fetch(
f"{BASE_URL}/", page_action=check_login, network_idle=True
)
if not logged_in:
return LoginResult(
success=False, error="Login failed (bad credentials?)"

View file

@ -348,6 +348,12 @@ def _login_headless_cf(credentials: dict[str, str]) -> LoginResult:
cookie_cache = Path.home() / ".cache" / "cp-nvim" / "codeforces-cookies.json"
cookie_cache.parent.mkdir(parents=True, exist_ok=True)
saved_cookies: list[dict[str, Any]] = []
if cookie_cache.exists():
try:
saved_cookies = json.loads(cookie_cache.read_text())
except Exception:
pass
logged_in = False
login_error: str | None = None
@ -382,7 +388,17 @@ def _login_headless_cf(credentials: dict[str, str]) -> LoginResult:
headless=True,
timeout=BROWSER_SESSION_TIMEOUT,
google_search=False,
cookies=saved_cookies if saved_cookies else [],
) as session:
if saved_cookies:
print(json.dumps({"status": "checking_login"}), flush=True)
session.fetch(
f"{BASE_URL}/",
page_action=check_login,
network_idle=True,
)
if not logged_in:
print(json.dumps({"status": "logging_in"}), flush=True)
session.fetch(
f"{BASE_URL}/enter",
@ -390,7 +406,9 @@ def _login_headless_cf(credentials: dict[str, str]) -> LoginResult:
solve_cloudflare=True,
)
if login_error:
return LoginResult(success=False, error=f"Login failed: {login_error}")
return LoginResult(
success=False, error=f"Login failed: {login_error}"
)
session.fetch(
f"{BASE_URL}/",

View file

@ -239,6 +239,21 @@ class CSESScraper(BaseScraper):
return self._login_error("Missing username or password")
async with httpx.AsyncClient(follow_redirects=True) as client:
token = credentials.get("token")
if token:
print(json.dumps({"status": "checking_login"}), flush=True)
if await self._check_token(client, token):
return LoginResult(
success=True,
error="",
credentials={
"username": username,
"password": password,
"token": token,
},
)
print(json.dumps({"status": "logging_in"}), flush=True)
token = await self._web_login(client, username, password)
if not token:

View file

@ -423,7 +423,11 @@ class USACOScraper(BaseScraper):
async with httpx.AsyncClient(follow_redirects=True) as client:
await _load_usaco_cookies(client)
if not client.cookies:
print(json.dumps({"status": "checking_login"}), flush=True)
logged_in = bool(client.cookies) and await _check_usaco_login(
client, username
)
if not logged_in:
print(json.dumps({"status": "logging_in"}), flush=True)
try:
ok = await _do_usaco_login(client, username, password)
@ -433,30 +437,6 @@ class USACOScraper(BaseScraper):
return self._submit_error("Login failed (bad credentials?)")
await _save_usaco_cookies(client)
result = await self._do_submit(client, problem_id, language_id, source)
if result.success or result.error != "auth_failure":
return result
client.cookies.clear()
print(json.dumps({"status": "logging_in"}), flush=True)
try:
ok = await _do_usaco_login(client, username, password)
except Exception as e:
return self._submit_error(f"Login failed: {e}")
if not ok:
return self._submit_error("Login failed (bad credentials?)")
await _save_usaco_cookies(client)
return await self._do_submit(client, problem_id, language_id, source)
async def _do_submit(
self,
client: httpx.AsyncClient,
problem_id: str,
language_id: str,
source: bytes,
) -> SubmitResult:
print(json.dumps({"status": "submitting"}), flush=True)
try:
page_r = await client.get(
@ -464,8 +444,6 @@ class USACOScraper(BaseScraper):
headers=HEADERS,
timeout=HTTP_TIMEOUT,
)
if "login" in page_r.url.path.lower() or "Login" in page_r.text[:2000]:
return self._submit_error("auth_failure")
form_url, hidden_fields, lang_val = _parse_submit_form(
page_r.text, language_id
)
@ -491,8 +469,6 @@ class USACOScraper(BaseScraper):
try:
resp = r.json()
if resp.get("code") == 0 and "login" in resp.get("message", "").lower():
return self._submit_error("auth_failure")
sid = str(resp.get("submission_id", resp.get("id", "")))
except Exception:
sid = ""