Python/apps/py-cutils: cutils/treesum.py comparison

comparison cutils/treesum.py @ 168:bcc4441cf216

Implement "--print-size" to print file and accumulated directory sizes also. NOTE: - Resulting digests (file and directory) are NOT affected. - Symbolic links are not considered.

author	Franz Glasner <fzglas.hg@dom66.de>
date	Thu, 09 Jan 2025 18:02:46 +0100
parents	df927ada9a37
children	91b8b2a8aebc

comparison

equal deleted inserted replaced

-:ffd14e2de130
+:bcc4441cf216
 gp.add_argument(
 "--physical", "-P", dest="logical", action="store_false",
 default=None,
 help="Do not follow symbolic links given on comment line "
 "arguments. This is the default.")
+gp.add_argument(
+"--print-size", action="store_true",
+help="""Print the size of a file or the accumulated sizes of
+directory content into the output also.
+The size is not considered when computing digests. For symbolic links
+the size is not printed also.""")
 gp.add_argument(
 "directories", nargs="*", metavar="DIRECTORY")
 parser = argparse.ArgumentParser(
 description="Generate and verify checksums for directory trees.",
 logical=None,
 minimal=None,
 mode=False,
 mmap=None,
 mtime=False,
-output=None):
+output=None,
+print_size=False):
 opts = argparse.Namespace(
 directories=directories,
 algorithm=(util.algotag2algotype(algorithm),
 algorithm),
 append_output=append_output,
 minimal=minimal,
 mmap=mmap,
 metadata_full_mode=full_mode,
 metadata_mode=mode,
 metadata_mtime=mtime,
-output=output)
+output=output,
+print_size=print_size)
 return opts
 def treesum(opts):
 # XXX TBD: opts.check and opts.checklist (as in shasum.py)
 outfp, d, opts.algorithm, opts.mmap, opts.base64, opts.logical,
 opts.follow_directory_symlinks,
 opts.metadata_mode,
 opts.metadata_full_mode,
 opts.metadata_mtime,
+opts.print_size,
 minimal=opts.minimal,
 comment=opts.comment)
 def generate_treesum_for_directory(
 outfp, root, algorithm, use_mmap, use_base64, handle_root_logical,
 follow_directory_symlinks, with_metadata_mode, with_metadata_full_mode,
-with_metadata_mtime,
+with_metadata_mtime, print_size,
 minimal=None, comment=None):
 """
 :param outfp: a *binary* file with a "write()" and a "flush()" method
 flags.append("with-metadata-mtime")
 if handle_root_logical:
 flags.append("logical")
 if follow_directory_symlinks:
 flags.append("follow-directory-symlinks")
+if print_size:
+flags.append("print-size")
 if flags:
 outfp.write(format_bsd_line("FLAGS", ",".join(flags), None, False))
 outfp.flush()
 if minimal is None:
 for top, fsobjects in walk.walk(
 root,
 follow_symlinks=follow_directory_symlinks):
 dir_dgst = algorithm[0]()
+dir_size = 0
 for fso in fsobjects:
 if fso.is_dir:
 if fso.is_symlink and not follow_directory_symlinks:
 linktgt = util.fsencode(os.readlink(fso.path))
 linkdgst = algorithm[0]()
 "%s/./@" % (opath,),
 use_base64))
 outfp.flush()
 continue
 # fetch from dir_digests
-dgst = dir_digests[top + (fso.name,)]
+dgst, dsz = dir_digests[top + (fso.name,)]
+dir_size += dsz
 dir_dgst.update(b"1:d,%d:%s," % (len(fso.fsname), fso.fsname))
 dir_dgst.update(
 b"%d:%s," % (len(dgst), dgst))
 if with_metadata_full_mode:
 modestr = normalized_mode_str(fso.stat.st_mode)
 if not isinstance(modestr, bytes):
 modestr = modestr.encode("ascii")
 dir_dgst.update(b"4:mode,%d:%s," % (len(modestr), modestr))
 else:
 dir_dgst.update(b"1:f,%d:%s," % (len(fso.fsname), fso.fsname))
+dir_size += fso.stat.st_size
 if with_metadata_mtime:
 mtime = datetime.datetime.utcfromtimestamp(
 int(fso.stat.st_mtime))
 mtime = mtime.isoformat("T") + "Z"
 if not isinstance(mtime, bytes):
 dir_dgst.update(b"4:mode,%d:%s," % (len(modestr), modestr))
 dgst = digest.compute_digest_file(
 algorithm[0], fso.path, use_mmap=use_mmap)
 dir_dgst.update(b"%d:%s," % (len(dgst), dgst))
 opath = "/".join(top) + "/" + fso.name if top else fso.name
-outfp.write(
+if print_size:
-format_bsd_line(
+outfp.write(
-algorithm[1], dgst, opath, use_base64))
+format_bsd_line(
+algorithm[1], dgst, opath, use_base64,
+fso.stat.st_size))
+else:
+outfp.write(
+format_bsd_line(
+algorithm[1], dgst, opath, use_base64))
 outfp.flush()
 opath = "/".join(top) + "/" if top else ""
-outfp.write(format_bsd_line(
+if print_size:
-algorithm[1], dir_dgst.digest(), opath, use_base64))
+outfp.write(format_bsd_line(
+algorithm[1], dir_dgst.digest(), opath, use_base64, dir_size))
+else:
+outfp.write(format_bsd_line(
+algorithm[1], dir_dgst.digest(), opath, use_base64))
 outfp.flush()
-dir_digests[top] = dir_dgst.digest()
+dir_digests[top] = (dir_dgst.digest(), dir_size)
 def normalized_compatible_mode_str(mode):
 # XXX FIXME: Windows and "executable"
 modebits = stat.S_IMODE(mode)
 if not modestr.startswith("0"):
 modestr = "0" + modestr
 return modestr
-def format_bsd_line(digestname, value, filename, use_base64):
+def format_bsd_line(digestname, value, filename, use_base64, size=None):
 ls = os.linesep if isinstance(os.linesep, bytes) \
 else os.linesep.encode("utf-8")
 if not isinstance(digestname, bytes):
 digestname = digestname.encode("ascii")
 if digestname == b"TIMESTAMP":
 value = base64.b64encode(value)
 else:
 value = binascii.hexlify(value)
 if filename != b"./@":
 filename = util.normalize_filename(filename, True)
-return b"%s (%s) = %s%s" % (digestname, filename, value, ls)
+if size is None:
+return b"%s (%s) = %s%s" % (digestname, filename, value, ls)
+else:
+return b"%s (%s) = %s,%d%s" % (digestname, filename, value, size, ls)
 if __name__ == "__main__":
 sys.exit(main())

Mercurial > hgrepos > Python > apps > py-cutils

comparison cutils/treesum.py @ 168:bcc4441cf216