Skip to content

Commit 7dc8b71

Browse files
ReikaNekoUwUReikaNekoUwU
authored
Add files via upload
1 parent f7dcb2a commit 7dc8b71

8 files changed

Lines changed: 96 additions & 40 deletions

‎PyWWW/pywwwget_chatgpt.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
978978
pw = p.password
979979
path = p.path or "/"
980980
file_dir = os.path.dirname(path)
981+
start_time = time.time()
981982
socket.setdefaulttimeout(float(timeout))
982983
ftp = FTP_TLS() if (p.scheme == "ftps") else FTP()
983984
try:
@@ -998,8 +999,10 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
998999
ftp.quit()
9991000
fulldatasize = bio.tell()
10001001
bio.seek(0, 0)
1002+
end_time = time.time()
1003+
total_time = end_time - start_time
10011004
if(returnstats):
1002-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'FTPLib': 'pyftp'}
1005+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'FTPLib': 'pyftp'}
10031006
else:
10041007
return bio
10051008
except Exception:
@@ -1108,6 +1111,7 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11081111
user = p.username or "anonymous"
11091112
pw = p.password or ("anonymous" if user == "anonymous" else "")
11101113
path = p.path or "/"
1114+
start_time = time.time()
11111115
socket.setdefaulttimeout(float(timeout))
11121116
ssh = paramiko.SSHClient()
11131117
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@@ -1122,8 +1126,10 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11221126
ssh.close()
11231127
fulldatasize = bio.tell()
11241128
bio.seek(0, 0)
1129+
end_time = time.time()
1130+
total_time = end_time - start_time
11251131
if(returnstats):
1126-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'paramiko'}
1132+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'paramiko'}
11271133
else:
11281134
return bio
11291135
except Exception:
@@ -1204,6 +1210,7 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12041210
fname = os.path.basename(path) or "upload.bin"
12051211

12061212
conn = None
1213+
start_time = time.time()
12071214
try:
12081215
# NOTE: pysftp host key checking is strict by default.
12091216
# If you need AutoAddPolicy-like behavior, set cnopts (see note below).
@@ -1218,10 +1225,10 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12181225
fulldatasize = bio.tell()
12191226
bio.seek(0, 0)
12201227

1221-
fulldatasize = bio.tell()
1222-
bio.seek(0, 0)
1228+
end_time = time.time()
1229+
total_time = end_time - start_time
12231230
if(returnstats):
1224-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'pysftp'}
1231+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'pysftp'}
12251232
else:
12261233
return bio
12271234

‎PyWWW/pywwwget_deepseek.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
10931093
pw = p.password
10941094
path = p.path or "/"
10951095
file_dir = os.path.dirname(path)
1096+
start_time = time.time()
10961097
socket.setdefaulttimeout(float(timeout))
10971098
ftp = FTP_TLS() if (p.scheme == "ftps") else FTP()
10981099
try:
@@ -1113,8 +1114,10 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
11131114
ftp.quit()
11141115
fulldatasize = bio.tell()
11151116
bio.seek(0, 0)
1117+
end_time = time.time()
1118+
total_time = end_time - start_time
11161119
if(returnstats):
1117-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'FTPLib': 'pyftp'}
1120+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'FTPLib': 'pyftp'}
11181121
else:
11191122
return bio
11201123
except Exception:
@@ -1224,6 +1227,7 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
12241227
pw = p.password or ("anonymous" if user == "anonymous" else "")
12251228
path = p.path or "/"
12261229
socket.setdefaulttimeout(float(timeout))
1230+
start_time = time.time()
12271231
ssh = paramiko.SSHClient()
12281232
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
12291233
try:
@@ -1237,8 +1241,10 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
12371241
ssh.close()
12381242
fulldatasize = bio.tell()
12391243
bio.seek(0, 0)
1244+
end_time = time.time()
1245+
total_time = end_time - start_time
12401246
if(returnstats):
1241-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'paramiko'}
1247+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'paramiko'}
12421248
else:
12431249
return bio
12441250
except Exception:
@@ -1319,6 +1325,7 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
13191325
fname = os.path.basename(path) or "upload.bin"
13201326

13211327
conn = None
1328+
start_time = time.time()
13221329
try:
13231330
# NOTE: pysftp host key checking is strict by default.
13241331
# If you need AutoAddPolicy-like behavior, set cnopts (see note below).
@@ -1333,10 +1340,10 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
13331340
fulldatasize = bio.tell()
13341341
bio.seek(0, 0)
13351342

1336-
fulldatasize = bio.tell()
1337-
bio.seek(0, 0)
1343+
end_time = time.time()
1344+
total_time = end_time - start_time
13381345
if(returnstats):
1339-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'pysftp'}
1346+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'pysftp'}
13401347
else:
13411348
return bio
13421349

‎PyWWW/pywwwget_merged.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
986986
pw = p.password
987987
path = p.path or "/"
988988
file_dir = os.path.dirname(path)
989+
start_time = time.time()
989990
socket.setdefaulttimeout(float(timeout))
990991
ftp = FTP_TLS() if (p.scheme == "ftps") else FTP()
991992
try:
@@ -1006,8 +1007,10 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
10061007
ftp.quit()
10071008
fulldatasize = bio.tell()
10081009
bio.seek(0, 0)
1010+
end_time = time.time()
1011+
total_time = end_time - start_time
10091012
if(returnstats):
1010-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'FTPLib': 'pyftp'}
1013+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'FTPLib': 'pyftp'}
10111014
else:
10121015
return bio
10131016
except Exception:
@@ -1117,6 +1120,7 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11171120
pw = p.password or ("anonymous" if user == "anonymous" else "")
11181121
path = p.path or "/"
11191122
socket.setdefaulttimeout(float(timeout))
1123+
start_time = time.time()
11201124
ssh = paramiko.SSHClient()
11211125
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
11221126
try:
@@ -1130,8 +1134,10 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11301134
ssh.close()
11311135
fulldatasize = bio.tell()
11321136
bio.seek(0, 0)
1137+
end_time = time.time()
1138+
total_time = end_time - start_time
11331139
if(returnstats):
1134-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'paramiko'}
1140+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'paramiko'}
11351141
else:
11361142
return bio
11371143
except Exception:
@@ -1212,6 +1218,7 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12121218
fname = os.path.basename(path) or "upload.bin"
12131219

12141220
conn = None
1221+
start_time = time.time()
12151222
try:
12161223
# NOTE: pysftp host key checking is strict by default.
12171224
# If you need AutoAddPolicy-like behavior, set cnopts (see note below).
@@ -1226,10 +1233,10 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12261233
fulldatasize = bio.tell()
12271234
bio.seek(0, 0)
12281235

1229-
fulldatasize = bio.tell()
1230-
bio.seek(0, 0)
1236+
end_time = time.time()
1237+
total_time = end_time - start_time
12311238
if(returnstats):
1232-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'pysftp'}
1239+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'pysftp'}
12331240
else:
12341241
return bio
12351242

‎PyWWW/pywwwget_nextver.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
994994
pw = p.password
995995
path = p.path or "/"
996996
file_dir = os.path.dirname(path)
997+
start_time = time.time()
997998
socket.setdefaulttimeout(float(timeout))
998999
ftp = FTP_TLS() if (p.scheme == "ftps") else FTP()
9991000
try:
@@ -1014,8 +1015,10 @@ def download_file_from_ftp_file(url, timeout=60, returnstats=False):
10141015
ftp.quit()
10151016
fulldatasize = bio.tell()
10161017
bio.seek(0, 0)
1018+
end_time = time.time()
1019+
total_time = end_time - start_time
10171020
if(returnstats):
1018-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'FTPLib': 'pyftp'}
1021+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'FTPLib': 'pyftp'}
10191022
else:
10201023
return bio
10211024
except Exception:
@@ -1125,6 +1128,7 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11251128
pw = p.password or ("anonymous" if user == "anonymous" else "")
11261129
path = p.path or "/"
11271130
socket.setdefaulttimeout(float(timeout))
1131+
start_time = time.time()
11281132
ssh = paramiko.SSHClient()
11291133
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
11301134
try:
@@ -1138,8 +1142,10 @@ def download_file_from_sftp_file(url, timeout=60, returnstats=False):
11381142
ssh.close()
11391143
fulldatasize = bio.tell()
11401144
bio.seek(0, 0)
1145+
end_time = time.time()
1146+
total_time = end_time - start_time
11411147
if(returnstats):
1142-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'paramiko'}
1148+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'paramiko'}
11431149
else:
11441150
return bio
11451151
except Exception:
@@ -1220,6 +1226,7 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12201226
fname = os.path.basename(path) or "upload.bin"
12211227

12221228
conn = None
1229+
start_time = time.time()
12231230
try:
12241231
# NOTE: pysftp host key checking is strict by default.
12251232
# If you need AutoAddPolicy-like behavior, set cnopts (see note below).
@@ -1234,10 +1241,10 @@ def download_file_from_pysftp_file(url, timeout=60, returnstats=False):
12341241
fulldatasize = bio.tell()
12351242
bio.seek(0, 0)
12361243

1237-
fulldatasize = bio.tell()
1238-
bio.seek(0, 0)
1244+
end_time = time.time()
1245+
total_time = end_time - start_time
12391246
if(returnstats):
1240-
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'SFTPLib': 'pysftp'}
1247+
returnval = {'Type': "Buffer", 'Buffer': bio, 'Contentsize': fulldatasize, 'ContentsizeAlt': {'IEC': get_readable_size(fulldatasize, 2, "IEC"), 'SI': get_readable_size(fulldatasize, 2, "SI")}, 'Headers': None, 'Version': None, 'Method': None, 'HeadersSent': None, 'URL': url, 'Code': None, 'RequestTime': {'StartTime': start_time, 'EndTime': end_time, 'TotalTime': total_time}, 'SFTPLib': 'pysftp'}
12411248
else:
12421249
return bio
12431250

0 commit comments

Comments
 (0)