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

u2c: apply exclude-filter to deletion too

Browse source 
if a file gets synced and you later add an exclude-filter for it,
delete the file from the server as if it doesn't exist locally
This commit is contained in:
ed 2024-01-27 18:49:25 +00:00
parent e397ec2e48
commit b2e233403d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/u2c.py
View file

@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
S_VERSION = "1.13" S_VERSION = "1.14"
S_BUILD_DT = "2024-01-24" S_BUILD_DT = "2024-01-27"
""" """
u2c.py: upload to copyparty u2c.py: upload to copyparty
@ -877,6 +877,8 @@ class Ctl(object):
self.st_hash = [file, ofs] self.st_hash = [file, ofs]
def hasher(self): def hasher(self):
ptn = re.compile(self.ar.x.encode("utf-8"), re.I) if self.ar.x else None
sep = "{0}".format(os.sep).encode("ascii")
prd = None prd = None
ls = {} ls = {}
for top, rel, inf in self.filegen: for top, rel, inf in self.filegen:
@ -909,7 +911,12 @@ class Ctl(object):
if self.ar.drd: if self.ar.drd:
dp = os.path.join(top, rd) dp = os.path.join(top, rd)
lnodes = set(os.listdir(dp)) lnodes = set(os.listdir(dp))
bnames = [x for x in ls if x not in lnodes] if ptn:
zs = dp.replace(sep, b"/").rstrip(b"/") + b"/"
zls = [zs + x for x in lnodes]
zls = [x for x in zls if not ptn.match(x)]
lnodes = [x.split(b"/")[-1] for x in zls]
bnames = [x for x in ls if x not in lnodes and x != b".hist"]
vpath = self.ar.url.split("://")[-1].split("/", 1)[-1] vpath = self.ar.url.split("://")[-1].split("/", 1)[-1]
names = [x.decode("utf-8", "replace") for x in bnames] names = [x.decode("utf-8", "replace") for x in bnames]
locs = [vpath + srd + "/" + x for x in names] locs = [vpath + srd + "/" + x for x in names]