mirror of
https://github.com/9001/copyparty.git
synced 2026-10-06 10:54:37 +01:00
pipe-dl progress on /?h
This commit is contained in:
@@ -5267,6 +5267,8 @@ class HttpCli(object):
|
|||||||
self.send_headers("oh_f", length=upper - lower, status=status, mime=mime)
|
self.send_headers("oh_f", length=upper - lower, status=status, mime=mime)
|
||||||
wr_slp = self.args.s_wr_slp
|
wr_slp = self.args.s_wr_slp
|
||||||
wr_sz = self.args.s_wr_sz
|
wr_sz = self.args.s_wr_sz
|
||||||
|
dls = self.conn.hsrv.dls
|
||||||
|
dl_id = self.dl_id
|
||||||
file_size = job["size"]
|
file_size = job["size"]
|
||||||
chunk_size = up2k_chunksize(file_size)
|
chunk_size = up2k_chunksize(file_size)
|
||||||
num_need = -1
|
num_need = -1
|
||||||
@@ -5286,7 +5288,7 @@ class HttpCli(object):
|
|||||||
if job:
|
if job:
|
||||||
self.pipes.set(req_path, job)
|
self.pipes.set(req_path, job)
|
||||||
|
|
||||||
if not job:
|
if not job or not job["hash"]:
|
||||||
t = "pipe: OK, upload has finished; yeeting remainder"
|
t = "pipe: OK, upload has finished; yeeting remainder"
|
||||||
self.log(t, 2)
|
self.log(t, 2)
|
||||||
data_end = file_size
|
data_end = file_size
|
||||||
@@ -5383,6 +5385,9 @@ class HttpCli(object):
|
|||||||
broken = True
|
broken = True
|
||||||
break
|
break
|
||||||
|
|
||||||
|
if dl_id:
|
||||||
|
dls[dl_id] = (time.time(), lower)
|
||||||
|
|
||||||
if lower < upper and not broken:
|
if lower < upper and not broken:
|
||||||
with open_nolock(req_path, "rb") as f:
|
with open_nolock(req_path, "rb") as f:
|
||||||
remains = sendfile_py(
|
remains = sendfile_py(
|
||||||
@@ -5394,8 +5399,8 @@ class HttpCli(object):
|
|||||||
wr_sz,
|
wr_sz,
|
||||||
wr_slp,
|
wr_slp,
|
||||||
not self.args.no_poll,
|
not self.args.no_poll,
|
||||||
self.conn.hsrv.dls,
|
dls,
|
||||||
self.dl_id,
|
dl_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
spd = self._spd((upper - lower) - remains)
|
spd = self._spd((upper - lower) - remains)
|
||||||
|
|||||||
Reference in New Issue
Block a user