From f44d5740fc9315ccb0792ecac3e8ec9f28f171be Mon Sep 17 00:00:00 2001 From: zman Date: Fri, 7 Feb 2025 21:23:32 -0500 Subject: [PATCH] aaa --- app/services/tcgplayer.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/services/tcgplayer.py b/app/services/tcgplayer.py index 6de6d43..09196e6 100644 --- a/app/services/tcgplayer.py +++ b/app/services/tcgplayer.py @@ -118,6 +118,16 @@ class TCGPlayerService: logger.error(f"Failed to get browser cookies: {str(e)}") return None + + def is_in_docker(): + """Check if we're running inside a Docker container""" + try: + with open('/proc/1/cgroup', 'r') as f: + return 'docker' in f.read() + except: + # If we can't read the file, check for common Docker env vars + return os.environ.get('DOCKER_CONTAINER', False) or os.environ.get('IN_DOCKER', False) + def _send_request(self, url: str, method: str, data=None, except_302=False) -> requests.Response: """Send a request with the specified cookies""" # if previous request was made less than 10 seconds ago, wait until current time is 10 seconds after previous request @@ -128,10 +138,11 @@ class TCGPlayerService: time.sleep(10 - time_diff) headers = self._set_headers(method) # only get cookies on mac os not in docker container - if not self.cookies and os.name != 'nt': - self.cookies = self._get_browser_cookies() - else: - self.cookies = self.get_cookies_from_file() + if not self.cookies: + if self.is_in_docker(): + self.cookies = self.get_cookies_from_file() + else: + self.cookies = self._get_browser_cookies() if not self.cookies: raise ValueError("Failed to retrieve browser cookies")