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

up2k: print final commit too

Browse source
This commit is contained in:
ed 2021-02-12 17:10:08 +01:00
parent efcf1d6b90
commit 56a26b0916
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
copyparty/__main__.py
View file

@ -144,12 +144,11 @@ def configure_ssl_ciphers(al):
is_help = al.ciphers == "help" is_help = al.ciphers == "help"
if al.ciphers: if al.ciphers and not is_help:
try: try:
ctx.set_ciphers(al.ciphers) ctx.set_ciphers(al.ciphers)
except: except:
if not is_help: print("\n\033[1;31mfailed to set ciphers\033[0m\n")
print("\n\033[1;31mfailed to set ciphers\033[0m\n")
if not hasattr(ctx, "get_ciphers"): if not hasattr(ctx, "get_ciphers"):
print("cannot read cipher list: openssl or python too old") print("cannot read cipher list: openssl or python too old")
@ -211,8 +210,8 @@ def main():
"print,get" prints the data in the log and returns GET "print,get" prints the data in the log and returns GET
(leave out the ",get" to return an error instead) (leave out the ",get" to return an error instead)
see "--ciphers help" for available ssl/tls ciphers, --ciphers help = available ssl/tls ciphers,
see "--ssl-ver help" for available ssl/tls versions, --ssl-ver help = available ssl/tls versions,
default is what python considers safe, usually >= TLS1 default is what python considers safe, usually >= TLS1
""" """
), ),

8
copyparty/up2k.py
View file

@ -130,8 +130,12 @@ class Up2k(object):
if db: if db:
# can be symlink so don't `and d.startswith(top)`` # can be symlink so don't `and d.startswith(top)``
excl = set([d for d in tops if d != top]) excl = set([d for d in tops if d != top])
self._build_dir([db, 0, time.time()], top, excl, top) dbw = [db, 0, time.time()]
self._build_dir(dbw, top, excl, top)
self._drop_lost(db, top) self._drop_lost(db, top)
if dbw[1]:
self.log("up2k", "commit {} new files".format(dbw[1]))
db.commit() db.commit()
def _build_dir(self, dbw, top, excl, cdir): def _build_dir(self, dbw, top, excl, cdir):
@ -190,7 +194,7 @@ class Up2k(object):
dbw[1] += 1 dbw[1] += 1
td = time.time() - dbw[2] td = time.time() - dbw[2]
if dbw[1] > 1024 or td > 60: if dbw[1] > 1024 or td > 60:
self.log("up2k", "commit {} files".format(dbw[1])) self.log("up2k", "commit {} new files".format(dbw[1]))
dbw[0].commit() dbw[0].commit()
dbw[1] = 0 dbw[1] = 0
dbw[2] = time.time() dbw[2] = time.time()