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

u2cli: bail from recursive symlinks + verbose errors

Browse source
This commit is contained in:
ed 2022-08-13 00:28:08 +02:00
parent 9ccd327298
commit 84b5bbd3b6
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
bin/up2k.py
View file

@ -3,7 +3,7 @@ from __future__ import print_function, unicode_literals
""" """
up2k.py: upload to copyparty up2k.py: upload to copyparty
2022-08-10, v0.17, ed <irc.rizon.net>, MIT-Licensed 2022-08-13, v0.18, ed <irc.rizon.net>, MIT-Licensed
https://github.com/9001/copyparty/blob/hovudstraum/bin/up2k.py https://github.com/9001/copyparty/blob/hovudstraum/bin/up2k.py
- dependencies: requests - dependencies: requests
@ -330,8 +330,8 @@ def _scd(err, top):
abspath = os.path.join(top, fh.name) abspath = os.path.join(top, fh.name)
try: try:
yield [abspath, fh.stat()] yield [abspath, fh.stat()]
except: except Exception as ex:
err.append(abspath) err.append((abspath, str(ex)))
def _lsd(err, top): def _lsd(err, top):
@ -340,8 +340,8 @@ def _lsd(err, top):
abspath = os.path.join(top, name) abspath = os.path.join(top, name)
try: try:
yield [abspath, os.stat(abspath)] yield [abspath, os.stat(abspath)]
except: except Exception as ex:
err.append(abspath) err.append((abspath, str(ex)))
if hasattr(os, "scandir"): if hasattr(os, "scandir"):
@ -350,15 +350,20 @@ else:
statdir = _lsd statdir = _lsd
def walkdir(err, top): def walkdir(err, top, seen):
"""recursive statdir""" """recursive statdir"""
atop = os.path.abspath(os.path.realpath(top))
if atop in seen:
return err.append((top, "recursive-symlink"))
seen = seen[:] + [atop]
for ap, inf in sorted(statdir(err, top)): for ap, inf in sorted(statdir(err, top)):
if stat.S_ISDIR(inf.st_mode): if stat.S_ISDIR(inf.st_mode):
try: try:
for x in walkdir(err, ap): for x in walkdir(err, ap, seen):
yield x yield x
except: except Exception as ex:
err.append(ap) err.append((ap, str(ex)))
else: else:
yield ap, inf yield ap, inf
@ -373,7 +378,7 @@ def walkdirs(err, tops):
stop = os.path.dirname(top) stop = os.path.dirname(top)
if os.path.isdir(top): if os.path.isdir(top):
for ap, inf in walkdir(err, top): for ap, inf in walkdir(err, top, []):
yield stop, ap[len(stop) :].lstrip(sep), inf yield stop, ap[len(stop) :].lstrip(sep), inf
else: else:
d, n = top.rsplit(sep, 1) d, n = top.rsplit(sep, 1)
@ -576,12 +581,19 @@ class Ctl(object):
if err: if err:
eprint("\n# failed to access {0} paths:\n".format(len(err))) eprint("\n# failed to access {0} paths:\n".format(len(err)))
for x in err: for ap, msg in err:
eprint(x.decode("utf-8", "replace") + "\n") if ar.v:
eprint("{0}\n `-{1}\n\n".format(ap.decode("utf-8", "replace"), msg))
else:
eprint(ap.decode("utf-8", "replace") + "\n")
eprint("^ failed to access those {0} paths ^\n\n".format(len(err))) eprint("^ failed to access those {0} paths ^\n\n".format(len(err)))
if not ar.v:
eprint("hint: set -v for detailed error messages\n")
if not ar.ok: if not ar.ok:
eprint("aborting because --ok is not set\n") eprint("hint: aborting because --ok is not set\n")
return return
eprint("found {0} files, {1}\n\n".format(nfiles, humansize(nbytes))) eprint("found {0} files, {1}\n\n".format(nfiles, humansize(nbytes)))
@ -929,6 +941,7 @@ source file/folder selection uses rsync syntax, meaning that:
ap.add_argument("url", type=unicode, help="server url, including destination folder") ap.add_argument("url", type=unicode, help="server url, including destination folder")
ap.add_argument("files", type=unicode, nargs="+", help="files and/or folders to process") ap.add_argument("files", type=unicode, nargs="+", help="files and/or folders to process")
ap.add_argument("-v", action="store_true", help="verbose")
ap.add_argument("-a", metavar="PASSWORD", help="password") ap.add_argument("-a", metavar="PASSWORD", help="password")
ap.add_argument("-s", action="store_true", help="file-search (disables upload)") ap.add_argument("-s", action="store_true", help="file-search (disables upload)")
ap.add_argument("--ok", action="store_true", help="continue even if some local files are inaccessible") ap.add_argument("--ok", action="store_true", help="continue even if some local files are inaccessible")