From 3dc940ac538a2c4dc0a7725de4b36be8290d7bd4 Mon Sep 17 00:00:00 2001 From: chu23465 <130033130+chu23465@users.noreply.github.com> Date: Wed, 30 Apr 2025 08:34:34 +0530 Subject: [PATCH] Small change --- vinetrimmer/services/amazon.py | 37 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/vinetrimmer/services/amazon.py b/vinetrimmer/services/amazon.py index a954851..a79a20d 100644 --- a/vinetrimmer/services/amazon.py +++ b/vinetrimmer/services/amazon.py @@ -1234,20 +1234,33 @@ class Amazon(BaseService): """ try: res = self.session.get(self.endpoints["ontv"]) + response = res.text + if 'input type="hidden" name="appAction" value="SIGNIN"' in response: + raise self.log.exit( + "Cookies are signed out, cannot get ontv CSRF token. " + f"Expecting profile to have cookies for: {self.endpoints['ontv']}" + ) + for match in re.finditer(r"", response): + prop = json.loads(match.group(1)) + prop = prop.get("props", {}).get("codeEntry", {}).get("token") + if prop: + return prop + raise self.log.exit(f"Unable to get ontv CSRF token - Navigate to {self.endpoints['ontv']}, login and save cookies from that page to default.txt") except: res = self.session.get(self.endpoints["ontvold"]) - response = res.text - if 'input type="hidden" name="appAction" value="SIGNIN"' in response: - raise self.log.exit( - "Cookies are signed out, cannot get ontv CSRF token. " - f"Expecting profile to have cookies for: {self.endpoints['ontv']}" - ) - for match in re.finditer(r"", response): - prop = json.loads(match.group(1)) - prop = prop.get("props", {}).get("codeEntry", {}).get("token") - if prop: - return prop - raise self.log.exit(f"Unable to get ontv CSRF token - Navigate to {self.endpoints['ontv']}, login and save cookies from that page to default.txt") + response = res.text + if 'input type="hidden" name="appAction" value="SIGNIN"' in response: + raise self.log.exit( + "Cookies are signed out, cannot get ontv CSRF token. " + f"Expecting profile to have cookies for: {self.endpoints['ontv']}" + ) + for match in re.finditer(r"", response): + prop = json.loads(match.group(1)) + prop = prop.get("props", {}).get("codeEntry", {}).get("token") + if prop: + return prop + raise self.log.exit(f"Unable to get ontv CSRF token - Navigate to {self.endpoints['ontvold']}, login and save cookies from that page to default.txt") + def get_code_pair(self, device: dict) -> dict: """