@@ -24,6 +24,24 @@ def run(docker_hub_client, args):
2424 get_tags (docker_hub_client , orgname , args )
2525
2626
27+ def formatted_image_info (repo ):
28+ """ Return image meta info from response JSON """
29+ images_platform = []
30+ images_size = []
31+ images_digest = []
32+ if 'images' in repo :
33+ for image in repo ['images' ]:
34+ images_platform .append (
35+ f"os:{ image ['os' ]} -({ image ['os_version' ] or 'N/A' } " \
36+ f") arch:{ image ['architecture' ]} "
37+ )
38+ images_size .append (readable_memory_format (
39+ image ['size' ] / 1024 ))
40+ images_digest .append (digest_to_short (image ['digest' ]))
41+
42+ return "\n " .join (images_platform ), "\n " .join (images_size ), "\n " .join (images_digest )
43+
44+
2745#pylint: disable=inconsistent-return-statements
2846def get_tags (docker_hub_client , orgname , args , per_page = PER_PAGE ):
2947 """ Fetch tags of repository """
@@ -46,25 +64,11 @@ def get_tags(docker_hub_client, orgname, args, per_page=PER_PAGE):
4664 else :
4765 digest = 'N/A'
4866
49- # images
50- images_platform = []
51- images_size = []
52- images_digest = []
53- if 'images' in repo :
54- for image in repo ['images' ]:
55- images_platform .append ("os:%s-(%s) arch:%s" % (
56- image ['os' ], image ['os_version' ] or 'N/A' ,
57- image ['architecture' ]))
58- images_size .append (readable_memory_format (
59- image ['size' ] / 1024 ))
60- images_digest .append (digest_to_short (image ['digest' ]))
61-
6267 # Convert full_size in bytes to KB
6368 size_in_kb = repo ['full_size' ] / 1024
6469 formatted_size = readable_memory_format (size_in_kb )
6570 rows .append ([repo ['name' ], formatted_size , formatted_date , digest_to_short (digest ),
66- "\n " .join (images_platform ), "\n " .join (images_size ),
67- "\n " .join (images_digest )])
71+ * formatted_image_info (repo )])
6872 header = ['Name' , 'Size' , 'Last updated' , 'Digest' , 'Images platform' ,
6973 'Image size' , 'Images digest' ]
7074 print_result (args .format , rows , header , resp ['content' ]['count' ],
0 commit comments