[gentoo-commits] proj/javatoolkit:master commit in: /, src/javatoolkit/scripts/

[gentoo-commits] proj/javatoolkit:master commit in: /, src/javatoolkit/scripts/

[Arthur Zamarin]

commit:     086c628a3b32020eec50ce82a3711503233f4447
Author:     Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Tue Mar  4 09:36:02 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 11:32:07 2025 +0000
URL:        https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=086c628a

class_version_verify.py: Change output format

Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me>
Approved-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 NEWS                                            |  1 +
 src/javatoolkit/scripts/class_version_verify.py | 20 +++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index 80aeaaf..8b1f63c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 0.6.8 (???)
+- Change output format
 - Add tests
 - Support Multi-Release jars, bug #900767
 - Migrate build-system to flit with pyproject.toml

diff --git a/src/javatoolkit/scripts/class_version_verify.py b/src/javatoolkit/scripts/class_version_verify.py
index fd544d3..098685c 100755
--- a/src/javatoolkit/scripts/class_version_verify.py
+++ b/src/javatoolkit/scripts/class_version_verify.py
@@ -103,18 +103,12 @@ def __get_total_line(cvv_magic: cvv.CVVMagic) -> str:
     return f'Checked: {total} Good: {good} Bad: {bad} Skipped: {skipped}'
 
 
-def __format_class(class_file: cvv.ClassFile) -> str:
-    return f'{class_file.encoded_version} {__format_loc(class_file.loc)}'
+def __format_class(cf: cvv.ClassFile) -> str:
+    return f'{__format_loc(cf.loc)} version {cf.encoded_version} (expected {cf.expected_version})'
 
 
 def __format_skipped(f: cvv.SkippedFile) -> str:
-    msg: str
-    match f:
-        case cvv.SkippedModuleInfo() as cf:
-            msg = __format_class(cf)
-        case cvv.SkippedVersionDir(loc, reason):
-            msg = f'{__format_loc(loc)} because "{reason}"'
-    return f'Skipped: {msg}'
+    return f'Skip: {__format_loc(f.loc)} because: {f.reason}'
 
 
 def __format_bad(f: cvv.BadFile) -> str:
@@ -124,8 +118,8 @@ def __format_bad(f: cvv.BadFile) -> str:
             msg = f'{__format_class(f)}'
         case cvv.BadMultireleaseManifest(loc, multiReleaseDirs):
             plain_dirs = [d.member for d in multiReleaseDirs]
-            msg = f'{__format_loc(loc)} missing "Multi-Release: true" for {plain_dirs}'
-    return f'Bad: {msg}'
+            msg = f'{__format_loc(loc)} missing "Multi-Release: true" implied by {plain_dirs}'
+    return f'Bad:  {msg}'
 
 
 def __format_good(f: cvv.GoodFile) -> str:
@@ -135,9 +129,9 @@ def __format_good(f: cvv.GoodFile) -> str:
 def __format_loc(loc: cvv.Loc) -> str:
     match loc:
         case cvv.FileLoc(path):
-            return f'None {path}'
+            return f'{path}'
         case cvv.JarLoc(jar, member):
-            return f'{jar.path} {member}'
+            return f'{jar.path}({member})'
 
 
 if __name__ == '__main__':