mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.3.8

Browse source
This commit is contained in:
ed 2022-07-27 16:07:26 +02:00
parent 77f624b01e
commit dac2fad48e
5 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/__version__.py
View file

@ -1,8 +1,8 @@
# coding: utf-8
VERSION = (1, 3, 7)
VERSION = (1, 3, 8)
CODENAME = "god dag"
BUILD_DT = (2022, 7, 16)
BUILD_DT = (2022, 7, 27)
S_VERSION = ".".join(map(str, VERSION))
S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

5
copyparty/httpcli.py
View file

@ -378,7 +378,10 @@ class HttpCli(object):
em = str(ex)
msg = em if pex == ex else min_ex()
self.log("{}\033[0m, {}".format(msg, self.vpath), 3)
self.log(
"{}\033[0m, {}".format(msg, self.vpath),
6 if em.startswith("client d/c ") else 3,
)
msg = "{}\r\nURL: {}\r\n".format(em, self.vpath)
if self.hint:

7
copyparty/httpsrv.py
View file

@ -261,8 +261,11 @@ class HttpSrv(object):
)
self.thr_client(sck, addr)
me.name = self.name + "-poolw"
except:
self.log(self.name, "thr_client: " + min_ex(), 3)
except Exception as ex:
if str(ex).startswith("client d/c "):
self.log(self.name, "thr_client: " + str(ex), 6)
else:
self.log(self.name, "thr_client: " + min_ex(), 3)
def shutdown(self) -> None:
self.stopping = True

5
copyparty/up2k.py
View file

@ -952,7 +952,7 @@ class Up2k(object):
def _verify_integrity(self, vol: VFS) -> int:
"""expensive; blocks database access until finished"""
ptop = vol.realpath
assert self.pp and self.mtag
assert self.pp
cur = self.cur[ptop]
rei = vol.flags.get("noidx")
@ -1068,8 +1068,7 @@ class Up2k(object):
with self.mutex:
reg = self.register_vpath(ptop, vol.flags)
assert reg and self.pp and self.mtag
_, db_path = reg
assert reg and self.pp
entags = self.entags[ptop]
flags = self.flags[ptop]
cur = self.cur[ptop]

14
copyparty/web/up2k.js
View file

@ -921,8 +921,14 @@ function up2k_init(subtle) {
catch (ex) { }
ev(e);
e.dataTransfer.dropEffect = 'copy';
e.dataTransfer.effectAllowed = 'copy';
try {
e.dataTransfer.dropEffect = 'copy';
e.dataTransfer.effectAllowed = 'copy';
}
catch (ex) {
document.body.ondragenter = document.body.ondragleave = document.body.ondragover = null;
return modal.alert('your browser does not support drag-and-drop uploading');
}
clmod(ebi('drops'), 'vis', 1);
var v = this.getAttribute('v');
if (v)
@ -1369,6 +1375,10 @@ function up2k_init(subtle) {
st.busy.handshake.length)
return false;
if (t.n - st.car > 8)
// prevent runahead from a stuck upload (slow server hdd)
return false;
if ((uc.multitask ? 1 : 0) <
st.todo.upload.length +
st.busy.upload.length)