Skip to content

Commit b5fcb54

Browse files
ReikaNekoUwUReikaNekoUwU
authored
Add files via upload
1 parent 47f0810 commit b5fcb54

8 files changed

Lines changed: 26 additions & 10 deletions

‎PyWWW/pywwwget_chatgpt.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,6 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13411341
if resume_off and "Range" not in headers and "range" not in headers:
13421342
headers["Range"] = "bytes=%d-" % resume_off
13431343

1344-
headers = fix_header_names(headers)
13451344
if(httpuseragent is not None):
13461345
if('User-Agent' in headers):
13471346
headers['User-Agent'] = httpuseragent
@@ -1491,6 +1490,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14911490
httpurlout = resp.geturl()
14921491
httpheaderout = resp.info()
14931492
httpheadersentout = headers
1493+
fulldatasize = httpfile.tell()
14941494
try:
14951495
httpfile.seek(0, 0)
14961496
except Exception:
@@ -1499,7 +1499,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14991499
if(isinstance(httpheaderout, list)):
15001500
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15011501
httpheaderout = fix_header_names(httpheaderout)
1502-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1502+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1503+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15031504
return returnval
15041505
else:
15051506
return httpfile

‎PyWWW/pywwwget_deepseek.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
17231723
httpurlout = resp.geturl()
17241724
httpheaderout = resp.info()
17251725
httpheadersentout = headers
1726+
fulldatasize = httpfile.tell()
17261727
try:
17271728
httpfile.seek(0, 0)
17281729
except Exception:
@@ -1731,7 +1732,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
17311732
if(isinstance(httpheaderout, list)):
17321733
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
17331734
httpheaderout = fix_header_names(httpheaderout)
1734-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1735+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1736+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
17351737
return returnval
17361738
else:
17371739
return httpfile

‎PyWWW/pywwwget_merged.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13861386
headers['Referer'] = httpreferer
13871387
else:
13881388
headers.update({'Referer': httpreferer})
1389+
13891390
# Requests
13901391
if usehttp == "requests" and haverequests:
13911392
auth = (username, password) if (username and password) else None
@@ -1524,6 +1525,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15241525
httpurlout = resp.geturl()
15251526
httpheaderout = resp.info()
15261527
httpheadersentout = headers
1528+
fulldatasize = httpfile.tell()
15271529
try:
15281530
httpfile.seek(0, 0)
15291531
except Exception:
@@ -1532,7 +1534,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15321534
if(isinstance(httpheaderout, list)):
15331535
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15341536
httpheaderout = fix_header_names(httpheaderout)
1535-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1537+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1538+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15361539
return returnval
15371540
else:
15381541
return httpfile

‎PyWWW/pywwwget_nextver.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15061506
httpurlout = resp.geturl()
15071507
httpheaderout = resp.info()
15081508
httpheadersentout = headers
1509+
fulldatasize = httpfile.tell()
15091510
try:
15101511
httpfile.seek(0, 0)
15111512
except Exception:
@@ -1514,7 +1515,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15141515
if(isinstance(httpheaderout, list)):
15151516
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15161517
httpheaderout = fix_header_names(httpheaderout)
1517-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1518+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1519+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15181520
return returnval
15191521
else:
15201522
return httpfile

‎pywwwget_chatgpt.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,6 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13411341
if resume_off and "Range" not in headers and "range" not in headers:
13421342
headers["Range"] = "bytes=%d-" % resume_off
13431343

1344-
headers = fix_header_names(headers)
13451344
if(httpuseragent is not None):
13461345
if('User-Agent' in headers):
13471346
headers['User-Agent'] = httpuseragent
@@ -1491,6 +1490,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14911490
httpurlout = resp.geturl()
14921491
httpheaderout = resp.info()
14931492
httpheadersentout = headers
1493+
fulldatasize = httpfile.tell()
14941494
try:
14951495
httpfile.seek(0, 0)
14961496
except Exception:
@@ -1499,7 +1499,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14991499
if(isinstance(httpheaderout, list)):
15001500
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15011501
httpheaderout = fix_header_names(httpheaderout)
1502-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1502+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1503+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15031504
return returnval
15041505
else:
15051506
return httpfile

‎pywwwget_deepseek.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
17231723
httpurlout = resp.geturl()
17241724
httpheaderout = resp.info()
17251725
httpheadersentout = headers
1726+
fulldatasize = httpfile.tell()
17261727
try:
17271728
httpfile.seek(0, 0)
17281729
except Exception:
@@ -1731,7 +1732,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
17311732
if(isinstance(httpheaderout, list)):
17321733
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
17331734
httpheaderout = fix_header_names(httpheaderout)
1734-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1735+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1736+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
17351737
return returnval
17361738
else:
17371739
return httpfile

‎pywwwget_merged.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13861386
headers['Referer'] = httpreferer
13871387
else:
13881388
headers.update({'Referer': httpreferer})
1389+
13891390
# Requests
13901391
if usehttp == "requests" and haverequests:
13911392
auth = (username, password) if (username and password) else None
@@ -1524,6 +1525,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15241525
httpurlout = resp.geturl()
15251526
httpheaderout = resp.info()
15261527
httpheadersentout = headers
1528+
fulldatasize = httpfile.tell()
15271529
try:
15281530
httpfile.seek(0, 0)
15291531
except Exception:
@@ -1532,7 +1534,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15321534
if(isinstance(httpheaderout, list)):
15331535
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15341536
httpheaderout = fix_header_names(httpheaderout)
1535-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1537+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1538+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15361539
return returnval
15371540
else:
15381541
return httpfile

‎pywwwget_nextver.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15061506
httpurlout = resp.geturl()
15071507
httpheaderout = resp.info()
15081508
httpheadersentout = headers
1509+
fulldatasize = httpfile.tell()
15091510
try:
15101511
httpfile.seek(0, 0)
15111512
except Exception:
@@ -1514,7 +1515,8 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15141515
if(isinstance(httpheaderout, list)):
15151516
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
15161517
httpheaderout = fix_header_names(httpheaderout)
1517-
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1518+
returnval = {'Type': "Buffer", 'Buffer': httpfile, 'ContentSize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(
1519+
fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
15181520
return returnval
15191521
else:
15201522
return httpfile

0 commit comments

Comments
 (0)