Java: pick-best-jars.py: handle module-info.class and META_INF/versions

Author: aibaars

java/maven-indexer/pick-best-jars.py

@@ -23,14 +23,18 @@ def read_bytes(fname):
   with open(fname, "rb") as f:
     return f.read()
 
+META_INF_VERSIONS = re.compile("META-INF/versions/[0-9]+/")
 def _read_jar_index(jarname):
   bypackage = dict()
   cd_file = jarname[:-6] + ".cd"
   zip_suffix = read_bytes(jarname) + read_bytes(cd_file)
   for l in listzip.listzip(zip_suffix):
     if l.endswith(".class") and not utils.is_private(l):
       lpackage = os.path.dirname(l)
+      lpackage = META_INF_VERSIONS.sub("", lpackage)
       cname = os.path.basename(l)
+      if cname == "module-info.class":
+        continue
       if lpackage not in bypackage:
         bypackage[lpackage] = set()
       bypackage[lpackage].add(cname)