mirror of
https://github.com/ThePhaseless/Byparr.git
synced 2025-03-15 09:50:20 +08:00
spellcheck fixes
This commit is contained in:
parent
aa632d4e49
commit
462e73ac8a
@ -77,5 +77,5 @@ class LinkResponse(BaseModel):
|
|||||||
return user_agent
|
return user_agent
|
||||||
|
|
||||||
|
|
||||||
class NoChromeExtentionError(Exception):
|
class NoChromeExtensionError(Exception):
|
||||||
"""No chrome extention found."""
|
"""No chrome extention found."""
|
||||||
|
@ -5,9 +5,9 @@ from nodriver.core.element import Element
|
|||||||
|
|
||||||
from src.utils import logger
|
from src.utils import logger
|
||||||
from src.utils.consts import CHALLENGE_TITLES, UBLOCK_TITLE
|
from src.utils.consts import CHALLENGE_TITLES, UBLOCK_TITLE
|
||||||
from src.utils.extentions import download_extentions
|
from src.utils.extensions import download_extensions
|
||||||
|
|
||||||
downloaded_extentions = download_extentions()
|
downloaded_extensions = download_extensions()
|
||||||
|
|
||||||
|
|
||||||
async def new_browser():
|
async def new_browser():
|
||||||
@ -26,7 +26,7 @@ async def new_browser():
|
|||||||
config: webdriver.Config = webdriver.Config(
|
config: webdriver.Config = webdriver.Config(
|
||||||
browser_executable_path="/usr/bin/chromium", sandbox=True
|
browser_executable_path="/usr/bin/chromium", sandbox=True
|
||||||
)
|
)
|
||||||
config.add_argument(f"--load-extension={','.join(downloaded_extentions)}")
|
config.add_argument(f"--load-extension={','.join(downloaded_extensions)}")
|
||||||
|
|
||||||
return await webdriver.start(config=config)
|
return await webdriver.start(config=config)
|
||||||
|
|
||||||
@ -123,7 +123,7 @@ async def bypass_cloudflare(page: webdriver.Tab):
|
|||||||
)
|
)
|
||||||
logger.debug(inner_elem)
|
logger.debug(inner_elem)
|
||||||
else:
|
else:
|
||||||
logger.warning("Coulnd't find checkbox, trying again...")
|
logger.warning("Couldn't find checkbox, trying again...")
|
||||||
logger.debug(elem)
|
logger.debug(elem)
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,11 +21,11 @@ GITHUB_WEBSITES = [
|
|||||||
"www.github.com",
|
"www.github.com",
|
||||||
]
|
]
|
||||||
|
|
||||||
EXTENTION_REPOSITIORIES = [
|
EXTENSION_REPOSITIORIES = [
|
||||||
"OhMyGuus/I-Still-Dont-Care-About-Cookies",
|
"OhMyGuus/I-Still-Dont-Care-About-Cookies",
|
||||||
"uBlockOrigin/uBOL-home",
|
"uBlockOrigin/uBOL-home",
|
||||||
]
|
]
|
||||||
|
|
||||||
SLEEP_SECONDS = 1
|
SLEEP_SECONDS = 1
|
||||||
|
|
||||||
EXTENTIONS_PATH = Path(".extentions")
|
EXTENSIONS_PATH = Path(".extentions")
|
||||||
|
@ -9,9 +9,9 @@ import httpx
|
|||||||
import requests
|
import requests
|
||||||
|
|
||||||
from src.models.github import GithubResponse
|
from src.models.github import GithubResponse
|
||||||
from src.models.requests import NoChromeExtentionError
|
from src.models.requests import NoChromeExtensionError
|
||||||
from src.utils import logger
|
from src.utils import logger
|
||||||
from src.utils.consts import EXTENTION_REPOSITIORIES, EXTENTIONS_PATH, GITHUB_WEBSITES
|
from src.utils.consts import EXTENSION_REPOSITIORIES, EXTENSIONS_PATH, GITHUB_WEBSITES
|
||||||
|
|
||||||
|
|
||||||
def get_latest_github_chrome_release(url: str):
|
def get_latest_github_chrome_release(url: str):
|
||||||
@ -29,7 +29,7 @@ def get_latest_github_chrome_release(url: str):
|
|||||||
Raises:
|
Raises:
|
||||||
------
|
------
|
||||||
httpx.NetworkError: If the request to GitHub API returns a 403 Forbidden status code.
|
httpx.NetworkError: If the request to GitHub API returns a 403 Forbidden status code.
|
||||||
NoChromeExtentionError: If no release asset with 'chrom' in its name is found.
|
NoChromeExtensionError: If no release asset with 'chrom' in its name is found.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if url.startswith(tuple(GITHUB_WEBSITES)):
|
if url.startswith(tuple(GITHUB_WEBSITES)):
|
||||||
@ -47,10 +47,10 @@ def get_latest_github_chrome_release(url: str):
|
|||||||
if "chrom" in asset.name:
|
if "chrom" in asset.name:
|
||||||
return asset
|
return asset
|
||||||
|
|
||||||
raise NoChromeExtentionError
|
raise NoChromeExtensionError
|
||||||
|
|
||||||
|
|
||||||
def download_extentions():
|
def download_extensions():
|
||||||
"""
|
"""
|
||||||
Download extensions from the specified repositories and saves them locally.
|
Download extensions from the specified repositories and saves them locally.
|
||||||
|
|
||||||
@ -63,32 +63,32 @@ def download_extentions():
|
|||||||
httpx.NetworkError: If there is an error downloading an extension.
|
httpx.NetworkError: If there is an error downloading an extension.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
downloaded_extentions: list[str] = []
|
downloaded_extensions: list[str] = []
|
||||||
for repository in EXTENTION_REPOSITIORIES:
|
for repository in EXTENSION_REPOSITIORIES:
|
||||||
extention_name = repository.split("/")[-1]
|
extension_name = repository.split("/")[-1]
|
||||||
path = Path(f"{EXTENTIONS_PATH}/{extention_name}")
|
path = Path(f"{EXTENSIONS_PATH}/{extension_name}")
|
||||||
try:
|
try:
|
||||||
extention = get_latest_github_chrome_release(repository)
|
extension = get_latest_github_chrome_release(repository)
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Downloading {extention_name} from {extention.browser_download_url}"
|
f"Downloading {extension_name} from {extension.browser_download_url}"
|
||||||
)
|
)
|
||||||
except httpx.NetworkError:
|
except httpx.NetworkError:
|
||||||
if path.is_dir():
|
if path.is_dir():
|
||||||
logger.error(f"Error downloading {extention_name}, using local copy")
|
logger.error(f"Error downloading {extension_name}, using local copy")
|
||||||
downloaded_extentions.append(path.as_posix())
|
downloaded_extensions.append(path.as_posix())
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
zip_file = requests.get(extention.browser_download_url, timeout=10)
|
zip_file = requests.get(extension.browser_download_url, timeout=10)
|
||||||
except UnboundLocalError as e:
|
except UnboundLocalError as e:
|
||||||
logger.error(f"Error downloading {extention_name}, skipping")
|
logger.error(f"Error downloading {extension_name}, skipping")
|
||||||
logger.error(e)
|
logger.error(e)
|
||||||
continue
|
continue
|
||||||
Path(EXTENTIONS_PATH).mkdir(exist_ok=True)
|
Path(EXTENSIONS_PATH).mkdir(exist_ok=True)
|
||||||
with ZipFile(io.BytesIO(zip_file.content)) as zip_obj:
|
with ZipFile(io.BytesIO(zip_file.content)) as zip_obj:
|
||||||
if not path.joinpath(extention_name).exists():
|
if not path.joinpath(extension_name).exists():
|
||||||
zip_obj.extractall(f"{EXTENTIONS_PATH}/{extention_name}")
|
zip_obj.extractall(f"{EXTENSIONS_PATH}/{extension_name}")
|
||||||
logger.debug(f"Extracted {extention_name} to {path}")
|
logger.debug(f"Extracted {extension_name} to {path}")
|
||||||
|
|
||||||
logger.info(f"Successfully downloaded {extention_name} to {path}")
|
logger.info(f"Successfully downloaded {extension_name} to {path}")
|
||||||
downloaded_extentions.append(path.as_posix())
|
downloaded_extensions.append(path.as_posix())
|
||||||
return downloaded_extentions
|
return downloaded_extensions
|
Loading…
x
Reference in New Issue
Block a user