fxreader.online/freelance-project-34-marketing-blog
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[~] Refactor

Browse Source
This commit is contained in:
Siarhei Siniak 2022-10-22 18:43:24 +03:00
parent cbfd726638
commit e7bcb225a6
1 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
d1/f2.py
View File

@ -20,7 +20,7 @@ sys.path.insert(0, os.path.dirname(__file__))
class Application: class Application:
MAX_CHUNK = 512 * 1024 * 1024 MAX_FILE_SIZE = 512 * 1024 * 1024
LOG_SIZE = 10 * 1024 * 1024 LOG_SIZE = 10 * 1024 * 1024
MAX_TIME = 16 MAX_TIME = 16
@ -256,6 +256,8 @@ class Application:
first_output = False first_output = False
sent_bytes = 0 sent_bytes = 0
content_length = None
def dump_headers(): def dump_headers():
self.op1( self.op1(
json_data=dict( json_data=dict(
@ -264,9 +266,14 @@ class Application:
output_length=get_output_length() output_length=get_output_length()
) )
) )
output_stream.sendall(
headers_detailed['first_line'].encode('latin-1') nonlocal content_length
) content_length2 = None
if 'Content-Length' in headers_detailed['headers']:
content_length = int(headers_detailed['headers']['Content-Length'])
else:
content_length = 0
if headers_detailed['headers'].get('Transfer-Encoding') == 'chunked': if headers_detailed['headers'].get('Transfer-Encoding') == 'chunked':
del headers_detailed['headers']['Transfer-Encoding'] del headers_detailed['headers']['Transfer-Encoding']
@ -275,7 +282,7 @@ class Application:
if finished_output: if finished_output:
content_length = get_output_length() content_length = get_output_length()
else: else:
content_length = Application.MAX_CHUNK content_length = Application.MAX_FILE_SIZE
headers_detailed['headers']['Content-Length'] = \ headers_detailed['headers']['Content-Length'] = \
'%d' % content_length '%d' % content_length
@ -284,8 +291,37 @@ class Application:
headers_detailed=headers_detailed, headers_detailed=headers_detailed,
) )
) )
elif content_length > 512 * 1024:
content_length2 = content_length
content_length = min(2 * 1024 * 1024, content_length)
headers_detailed['headers']['Content-Length'] = '%d' % content_length
content_range_header = headers_detailed['headers'].get('Content-Range')
if not content_range_header is None:
parsed_range = re.compile(r'(\w+) (\d+)-(\d+)\/(\d+)').match(
content_range_header
)
assert parsed_range[1] == 'bytes'
start = int(parsed_range[2])
total = int(parsed_range[3])
else:
total = content_length2
start = 0
end = start + content_length
headers_detailed['first_line'] = 'HTTP/1.1 206 Partial Content'
headers_detailed['headers']['Status'] = '206 Partial Content'
headers_detailed['headers']['Content-Range'] = \
'bytes %d-%d/%d' % (
start, end - 1, total,
)
headers_detailed['headers']['Connection'] = 'close' headers_detailed['headers']['Connection'] = 'close'
output_stream.sendall(
headers_detailed['first_line'].encode('latin-1')
)
for k, v in headers_detailed['headers'].items(): for k, v in headers_detailed['headers'].items():
output_stream.sendall( output_stream.sendall(
( (
@ -324,9 +360,14 @@ class Application:
if first_output and len(content_chunks) > 0: if first_output and len(content_chunks) > 0:
chunk = content_chunks[0] chunk = content_chunks[0]
del content_chunks[0] del content_chunks[0]
if len(chunk) > 0: if sent_bytes + len(chunk) > content_length:
output_stream.sendall(chunk) chunk2 = chunk[:content_length - sent_bytes]
sent_bytes += len(chunk) finished_output = True
else:
chunk2 = chunk
if len(chunk2) > 0:
output_stream.sendall(chunk2)
sent_bytes += len(chunk2)
#self.op1( #self.op1(
# json_data=dict(sent_bytes=sent_bytes) # json_data=dict(sent_bytes=sent_bytes)
#) #)
@ -459,7 +500,7 @@ class Application:
'--no-buffer', '--no-buffer',
'--silent', '--silent',
'--data-binary', '@%s' % self.input_dat, '--data-binary', '@%s' % self.input_dat,
'--max-filesize', '%d' % Application.MAX_CHUNK, '--max-filesize', '%d' % Application.MAX_FILE_SIZE,
'--max-time', '%d' % Application.MAX_TIME, '--max-time', '%d' % Application.MAX_TIME,
#'-o', self.output_dat, #'-o', self.output_dat,
'-q', '-q',