PR#3516: Add number and size for download-build - koji

Jana Cupova • 2 years ago

f6e3488

cli/koji_cli/commands.py

file modified

+9 -4

		`@@ -6723,13 +6723,18 @@`
		`warn("No such sigkey %s for rpm %s" % (suboptions.key, nvra))`
		`rpms.remove(rpm)`

		`+ size = len(rpms) + len(archives)`
		`+ number = 0`
		`+`
		`# run the download`
		`for rpm in rpms:`
		`- download_rpm(info, rpm, suboptions.topurl, sigkey=suboptions.key,`
		`- quiet=suboptions.quiet, noprogress=suboptions.noprogress)`
		`+ number += 1`
		`+ download_rpm(info, rpm, suboptions.topurl, sigkey=suboptions.key, quiet=suboptions.quiet,`
		`+ noprogress=suboptions.noprogress, num=number, size=size)`
		`for archive in archives:`
		`- download_archive(info, archive, suboptions.topurl,`
		`- quiet=suboptions.quiet, noprogress=suboptions.noprogress)`
		`+ number += 1`
		`+ download_archive(info, archive, suboptions.topurl, quiet=suboptions.quiet,`
		`+ noprogress=suboptions.noprogress, num=number, size=size)`


		`def anon_handle_download_logs(options, session, args):`

cli/koji_cli/lib.py

file modified

+7 -4

		`@@ -617,7 +617,8 @@`
		`print('')`


		`- def download_rpm(build, rpm, topurl, sigkey=None, quiet=False, noprogress=False):`
		`+ def download_rpm(build, rpm, topurl, sigkey=None, quiet=False, noprogress=False, num=None,`
		`+ size=None):`
		`"Wrapper around download_file, do additional checks for rpm files"`
		`pi = koji.PathInfo(topdir=topurl)`
		`if sigkey:`
		`@@ -629,7 +630,8 @@`
		`url = os.path.join(pi.build(build), fname)`
		`path = os.path.basename(fname)`

		`- download_file(url, path, quiet=quiet, noprogress=noprogress, filesize=filesize)`
		`+ download_file(url, path, quiet=quiet, noprogress=noprogress, filesize=filesize, num=num,`
		`+ size=size)`

		`# size - we have stored size only for unsigned copies`
		`if not sigkey:`
		`@@ -654,7 +656,7 @@`
		`error("Downloaded rpm %s doesn't match db, deleting" % path)`


		`- def download_archive(build, archive, topurl, quiet=False, noprogress=False):`
		`+ def download_archive(build, archive, topurl, quiet=False, noprogress=False, num=None, size=None):`
		`"Wrapper around download_file, do additional checks for archive files"`

		`pi = koji.PathInfo(topdir=topurl)`
		`@@ -673,7 +675,8 @@`
		`url = os.path.join(directory, archive['filename'])`
		`path = archive['filename']`

		`- download_file(url, path, quiet=quiet, noprogress=noprogress, filesize=archive['size'])`
		`+ download_file(url, path, quiet=quiet, noprogress=noprogress, filesize=archive['size'], num=num,`
		`+ size=size)`

		`# check size`
		`if os.path.getsize(path) != archive['size']:`