From 7070f8fbe5743cdced899f1ea97d632be623abdf Mon Sep 17 00:00:00 2001 From: Joshua Gottlieb Date: Mon, 21 Oct 2024 07:27:03 -0500 Subject: [PATCH] adding proxy support for mv, temp file change for windows --- checkers/Manyvids.py | 16 ++++++++++++++-- utils/NoDriverBrowserCreator.py | 5 +++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/checkers/Manyvids.py b/checkers/Manyvids.py index a799467..07047f3 100644 --- a/checkers/Manyvids.py +++ b/checkers/Manyvids.py @@ -17,11 +17,16 @@ def isModelOnline(mvUserName): isOnline = False icon = Constants.defaultIcon pageUrl = f"https://www.manyvids.com/live/cam/{mvUserName.lower()}" - page = requests.get(pageUrl) + if Constants.MV_PROXY: + page = requests.get(pageUrl, proxies=GetProxies()) + else: + page = requests.get(pageUrl) soup = BeautifulSoup(page.content, "html.parser") onlineStatus = soup.find("div", {"class":"status_box__v1drl"}) if onlineStatus: logger.debug(onlineStatus.text) + else: + logger.debug("no online status") if onlineStatus and (onlineStatus.text == "LIVE" or onlineStatus.text == "IN PRIVATE"): isOnline = True icon = GetIcon(soup, mvUserName) @@ -34,4 +39,11 @@ def GetIcon(soup:BeautifulSoup, mvUserName): icon = re.search(reString, soup.prettify()) if icon: icon = icon.group() - return icon \ No newline at end of file + return icon + +def GetProxies(): + proxies = { + 'http': f'{Constants.MV_PROXY}', + 'https': f'{Constants.MV_PROXY}', + } + return proxies diff --git a/utils/NoDriverBrowserCreator.py b/utils/NoDriverBrowserCreator.py index 90e12f2..db10ce7 100644 --- a/utils/NoDriverBrowserCreator.py +++ b/utils/NoDriverBrowserCreator.py @@ -54,18 +54,19 @@ async def GetBrowser(proxy=""): await asyncio.sleep(1 * Constants.NODRIVER_WAIT_MULTIPLIER) toSandbox = not IsRoot() toHeadless = False if platform.system() == "Linux" else True + dataDir = "/ndTemp" if platform.system() == "Linux" else None if proxy: browser = await uc.start(sandbox=toSandbox, headless=toHeadless, browser_args=[f'--proxy-server={proxy}','--mute-audio','--disable-3d-apis','--disable-dev-shm-usage','--disable-gpu','--disable-blink-features=AutomationControlled'], retries = Constants.NODRIVER_BROWSER_CONNECT_RETRIES, - user_data_dir="/ndTemp" + user_data_dir=dataDir ) else: browser = await uc.start(sandbox=toSandbox, headless=toHeadless, retries = Constants.NODRIVER_BROWSER_CONNECT_RETRIES, - user_data_dir="/ndTemp" + user_data_dir=dataDir ) except Exception as e: logger.warning(f"error creating browser in GetBrowser: {e}")