feat: add Curl.post()
This commit is contained in:
@@ -48,14 +48,40 @@ class Curl:
|
|||||||
md5(url.encode()).hexdigest())
|
md5(url.encode()).hexdigest())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def open(url: str, *, headers: Optional[Dict[str, str]] = None) \
|
def _cached_is_recent(fname: str, *, maxAge: int) -> bool:
|
||||||
-> Optional[HTTPResponse]:
|
fname = os.path.join(Curl.CACHE_DIR, fname)
|
||||||
|
return os.path.isfile(fname) and FileTime.get(fname) < maxAge
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _cached_read(
|
||||||
|
conn: Optional[HTTPResponse], fname_data: str, fname_head: str
|
||||||
|
) -> Optional[TextIO]:
|
||||||
|
fname_data = os.path.join(Curl.CACHE_DIR, fname_data)
|
||||||
|
if conn:
|
||||||
|
os.makedirs(Curl.CACHE_DIR, exist_ok=True)
|
||||||
|
with open(os.path.join(Curl.CACHE_DIR, fname_head), 'w') as fp:
|
||||||
|
fp.write(str(conn.info()).strip())
|
||||||
|
with open(fname_data, 'wb') as fpb:
|
||||||
|
while True:
|
||||||
|
data = conn.read(8192) # 1024 Bytes
|
||||||
|
if not data:
|
||||||
|
break
|
||||||
|
fpb.write(data)
|
||||||
|
return open(fname_data) if os.path.isfile(fname_data) else None
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def open(
|
||||||
|
url: str,
|
||||||
|
*,
|
||||||
|
post: Optional[bytes] = None,
|
||||||
|
headers: Optional[Dict[str, str]] = None,
|
||||||
|
) -> Optional[HTTPResponse]:
|
||||||
''' Open a network connection, returl urlopen() result or None. '''
|
''' Open a network connection, returl urlopen() result or None. '''
|
||||||
try:
|
try:
|
||||||
head = {'User-Agent': 'Mozilla/5.0'}
|
head = {'User-Agent': 'Mozilla/5.0'}
|
||||||
if headers:
|
if headers:
|
||||||
head.update(headers)
|
head.update(headers)
|
||||||
return urlopen(Request(url, headers=head))
|
return urlopen(Request(url, data=post, headers=head))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if isinstance(e, HTTPError) and e.getcode() == 304:
|
if isinstance(e, HTTPError) and e.getcode() == 304:
|
||||||
# print('Not-Modified: {}'.format(url), file=stderr)
|
# print('Not-Modified: {}'.format(url), file=stderr)
|
||||||
@@ -64,31 +90,48 @@ class Curl:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get(url: str, *, cache_only: bool = False) -> Optional[TextIO]:
|
def get(
|
||||||
|
url: str,
|
||||||
|
*,
|
||||||
|
cache_only: bool = False,
|
||||||
|
headers: Optional[Dict[str, str]] = None,
|
||||||
|
) -> Optional[TextIO]:
|
||||||
'''
|
'''
|
||||||
Returns an already open file pointer.
|
Returns an already open file pointer.
|
||||||
You are responsible for closing the file.
|
You are responsible for closing the file.
|
||||||
NOTE: `HTML2List.parse` and `Feed2List.parse` will close it for you.
|
NOTE: `HTML2List.parse` and `Feed2List.parse` will close it for you.
|
||||||
'''
|
'''
|
||||||
fname = '{}/curl-{}.data'.format(Curl.CACHE_DIR, Curl.url_hash(url))
|
fname = 'curl-{}.data'.format(Curl.url_hash(url))
|
||||||
fname_head = fname[:-5] + '.head'
|
|
||||||
# If file was created less than 45 sec ago, reuse cached value
|
# If file was created less than 45 sec ago, reuse cached value
|
||||||
if cache_only or (os.path.isfile(fname) and FileTime.get(fname) < 45):
|
if cache_only or Curl._cached_is_recent(fname, maxAge=45):
|
||||||
return open(fname)
|
return Curl._cached_read(None, fname, '')
|
||||||
|
|
||||||
os.makedirs(Curl.CACHE_DIR, exist_ok=True)
|
fname_head = fname[:-5] + '.head'
|
||||||
conn = Curl.open(url, headers=_read_modified_header(fname_head))
|
head = _read_modified_header(fname_head)
|
||||||
if conn:
|
if headers:
|
||||||
with open(fname_head, 'w') as fp:
|
head.update(headers)
|
||||||
fp.write(str(conn.info()).strip())
|
conn = Curl.open(url, headers=head)
|
||||||
with open(fname, 'wb') as fpb:
|
return Curl._cached_read(conn, fname, fname_head)
|
||||||
while True:
|
|
||||||
data = conn.read(8192) # 1024 Bytes
|
|
||||||
if not data:
|
|
||||||
break
|
|
||||||
fpb.write(data)
|
|
||||||
|
|
||||||
return open(fname) if os.path.isfile(fname) else None
|
@staticmethod
|
||||||
|
def post(
|
||||||
|
url: str,
|
||||||
|
data: bytes,
|
||||||
|
*,
|
||||||
|
cache_only: bool = False,
|
||||||
|
headers: Optional[Dict[str, str]] = None,
|
||||||
|
) -> Optional[TextIO]:
|
||||||
|
'''
|
||||||
|
Perform POST operation.
|
||||||
|
Returns an already open file pointer.
|
||||||
|
You are responsible for closing the file.
|
||||||
|
'''
|
||||||
|
fname = 'curl-{}.post.data'.format(Curl.url_hash(url))
|
||||||
|
if cache_only:
|
||||||
|
return Curl._cached_read(None, fname, '')
|
||||||
|
|
||||||
|
conn = Curl.open(url, post=data, headers=headers)
|
||||||
|
return Curl._cached_read(conn, fname, fname[:-5] + '.head')
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def json(url: str, fallback: Any = None, *, cache_only: bool = False) \
|
def json(url: str, fallback: Any = None, *, cache_only: bool = False) \
|
||||||
|
|||||||
Reference in New Issue
Block a user