mirror of
https://github.com/simon987/hexlib.git
synced 2025-04-10 06:06:41 +00:00
Add useragent option in Web
This commit is contained in:
parent
66d37e0be2
commit
53a03baaa4
@ -1,5 +1,7 @@
|
||||
import redis
|
||||
import os
|
||||
from fake_useragent import UserAgent
|
||||
|
||||
|
||||
from hexlib.log import stdout_logger
|
||||
from hexlib.web import Web
|
||||
@ -13,10 +15,13 @@ def get_redis():
|
||||
|
||||
|
||||
def get_web():
|
||||
ua = UserAgent()
|
||||
|
||||
return Web(
|
||||
proxy=os.environ.get("PROXY", None),
|
||||
rps=os.environ.get("RPS", 1),
|
||||
logger=stdout_logger,
|
||||
cookie_file=os.environ.get("COOKIE_FILE", None),
|
||||
retry_codes=set(int(x) if x else None for x in os.environ.get("RETRY_CODES", "").split(","))
|
||||
retry_codes=set(int(x) if x else None for x in os.environ.get("RETRY_CODES", "").split(",")),
|
||||
ua=ua[os.environ.get("USER_AGENT")] if os.environ.get("USER_AGENT", None) is not None else None
|
||||
)
|
||||
|
@ -111,7 +111,8 @@ def download_file(url, destination, session=None, headers=None, overwrite=False,
|
||||
|
||||
|
||||
class Web:
|
||||
def __init__(self, proxy=None, rps=1, retries=3, logger=None, cookie_file=None, retry_codes=None, session=None):
|
||||
def __init__(self, proxy=None, rps=1, retries=3, logger=None, cookie_file=None, retry_codes=None, session=None,
|
||||
ua=None):
|
||||
self._cookie_file = cookie_file
|
||||
self._proxy = proxy
|
||||
self._logger = logger
|
||||
@ -125,6 +126,9 @@ class Web:
|
||||
|
||||
self._session = session
|
||||
|
||||
if ua is not None:
|
||||
session.headers["User-Agent"] = ua
|
||||
|
||||
if self._cookie_file:
|
||||
self._session.cookies = load_cookiejar(cookie_file)
|
||||
|
||||
|
4
setup.py
4
setup.py
@ -2,7 +2,7 @@ from setuptools import setup
|
||||
|
||||
setup(
|
||||
name="hexlib",
|
||||
version="1.30",
|
||||
version="1.31",
|
||||
description="Misc utility methods",
|
||||
author="simon987",
|
||||
author_email="me@simon987.net",
|
||||
@ -13,6 +13,6 @@ setup(
|
||||
]},
|
||||
install_requires=[
|
||||
"ImageHash", "influxdb", "siphash", "python-dateutil", "redis", "orjson", "zstandard",
|
||||
"u-msgpack-python", "psycopg2-binary"
|
||||
"u-msgpack-python", "psycopg2-binary", "fake-useragent"
|
||||
]
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user