mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 01:22:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

dont rmdir volume top on cleanup

Browse source
This commit is contained in:
ed 2023-02-26 18:28:37 +00:00
parent 4de028fc3b
commit 1e3b7eee3b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/up2k.py
View file

@ -2921,7 +2921,7 @@ class Up2k(object):
if is_dir: if is_dir:
ok, ng = rmdirs(self.log_func, scandir, True, atop, 1) ok, ng = rmdirs(self.log_func, scandir, True, atop, 1)
ok2, ng2 = rmdirs_up(os.path.dirname(atop)) ok2, ng2 = rmdirs_up(os.path.dirname(atop), ptop)
return n_files, ok + ok2, ng + ng2 return n_files, ok + ok2, ng + ng2
@ -2980,7 +2980,7 @@ class Up2k(object):
curs.clear() curs.clear()
rmdirs(self.log_func, scandir, True, sabs, 1) rmdirs(self.log_func, scandir, True, sabs, 1)
rmdirs_up(os.path.dirname(sabs)) rmdirs_up(os.path.dirname(sabs), svn.realpath)
return "k" return "k"
def _mv_file( def _mv_file(

9
copyparty/util.py
View file

@ -2278,18 +2278,21 @@ def rmdirs(
return ok, ng return ok, ng
def rmdirs_up(top: str) -> tuple[list[str], list[str]]: def rmdirs_up(top: str, stop: str) -> tuple[list[str], list[str]]:
"""rmdir on self, then all parents""" """rmdir on self, then all parents"""
if top == stop:
return [], [top]
try: try:
os.rmdir(fsenc(top)) os.rmdir(fsenc(top))
except: except:
return [], [top] return [], [top]
par = os.path.dirname(top) par = os.path.dirname(top)
if not par: if not par or par == stop:
return [top], [] return [top], []
ok, ng = rmdirs_up(par) ok, ng = rmdirs_up(par, stop)
return [top] + ok, ng return [top] + ok, ng