{{{name}}}
-""" + res.add """{{{name}}}
""" + else + res.add """ +{{{name}}} -
+Content
" var ot = new OrderedTree[MConcern] @@ -268,9 +285,8 @@ redef class Catalog var e = homepage.html_escape res.add "Quality
\n- \n"
+ var errors = errors[mpackage]
+ if errors > 0 then
+ res.add "
- {errors} errors \n" + end + res.add "
- {warnings[mpackage]} warnings ({warnings_per_kloc[mpackage]}/kloc) \n" + res.add "
- {documentation_score[mpackage]}% documented \n" + res.add "
Tags
\n" var ts2 = new Array[String] for t in mpackage.tags do @@ -360,7 +385,7 @@ redef class Catalog if not contributors.is_empty then res.add "Contributors
\n- "
for c in contributors do
- add_contrib(c, mpackage, res)
+ res.add "
- {c.to_html} " end res.add "
`.
# `id_prefix` is used to give an id to the `` element.
- fun list_by(map: MultiHashMap[String, MPackage], id_prefix: String): Template
+ fun list_by(map: MultiHashMap[Object, MPackage], id_prefix: String): Template
do
var res = new Template
var keys = map.keys.to_a
alpha_comparator.sort(keys)
- var list = [for x in keys do "{x.html_escape}"]
+ var list = [for x in keys do "{x.to_s.html_escape}"]
res.add_list(list, ", ", " and ")
for k in keys do
var projs = map[k].to_a
alpha_comparator.sort(projs)
- var e = k.html_escape
+ var e = k.to_s.html_escape
res.add "{e} ({projs.length})
\n\n"
for p in projs do
res.add "- "
@@ -465,12 +490,16 @@ redef class Catalog
res.add "
methods \n"
res.add "lines \n"
res.add "score \n"
+ res.add "errors \n"
+ res.add "warnings \n"
+ res.add "w/kloc \n"
+ res.add "doc \n"
res.add ""
for p in mpackages do
res.add ""
res.add "{p.name} "
var maint = "?"
- if p.maintainers.not_empty then maint = p.maintainers.first
+ if p.maintainers.not_empty then maint = p.maintainers.first.name.html_escape
res.add "{maint} "
res.add "{p.contributors.length} "
if deps.not_empty then
@@ -484,6 +513,10 @@ redef class Catalog
res.add "{mmethods[p]} "
res.add "{loc[p]} "
res.add "{score[p]} "
+ res.add "{errors[p]} "
+ res.add "{warnings[p]} "
+ res.add "{warnings_per_kloc[p]} "
+ res.add "{documentation_score[p]} "
res.add " \n"
end
res.add "\n"
@@ -535,10 +568,16 @@ end
# Get files or groups
var args = tc.option_context.rest
+var mmodules
if opt_no_parse.value then
- modelbuilder.scan_full(args)
+ mmodules = modelbuilder.scan_full(args)
else
- modelbuilder.parse_full(args)
+ mmodules = modelbuilder.parse_full(args)
+end
+var mpackages = new Set[MPackage]
+for m in mmodules do
+ var p = m.mpackage
+ if p != null then mpackages.add p
end
# Scan packages and compute information
@@ -560,7 +599,7 @@ for p in model.mpackages do
end
end
-if not opt_no_git.value then for p in model.mpackages do
+if not opt_no_git.value then for p in mpackages do
catalog.git_info(p)
end
@@ -571,6 +610,9 @@ end
var out = opt_dir.value or else "catalog.out"
(out/"p").mkdir
+(out/"res").mkdir
+
+catalog.outdir = out
# Generate the css (hard coded)
var css = """
@@ -674,7 +716,7 @@ css.write_to_file(out/"style.css")
# PAGES
-for p in model.mpackages do
+for p in mpackages do
# print p
var f = "p/{p.name}.html"
catalog.package_page(p)
@@ -697,7 +739,7 @@ index.add catalog.list_best(catalog.score)
if catalog.deps.not_empty then
index.add "Most Required
\n"
var reqs = new Counter[MPackage]
- for p in model.mpackages do
+ for p in mpackages do
reqs[p] = catalog.deps[p].smallers.length - 1
end
index.add catalog.list_best(reqs)
@@ -714,7 +756,7 @@ index.add """
{e} ({projs.length})
\n- \n"
for p in projs do
res.add "
- "
@@ -465,12 +490,16 @@ redef class Catalog
res.add "
methods \n" res.add "lines \n" res.add "score \n" + res.add "errors \n" + res.add "warnings \n" + res.add "w/kloc \n" + res.add "doc \n" res.add "" for p in mpackages do res.add "" res.add " \n" end res.add "\n" @@ -535,10 +568,16 @@ end # Get files or groups var args = tc.option_context.rest +var mmodules if opt_no_parse.value then - modelbuilder.scan_full(args) + mmodules = modelbuilder.scan_full(args) else - modelbuilder.parse_full(args) + mmodules = modelbuilder.parse_full(args) +end +var mpackages = new Set[MPackage] +for m in mmodules do + var p = m.mpackage + if p != null then mpackages.add p end # Scan packages and compute information @@ -560,7 +599,7 @@ for p in model.mpackages do end end -if not opt_no_git.value then for p in model.mpackages do +if not opt_no_git.value then for p in mpackages do catalog.git_info(p) end @@ -571,6 +610,9 @@ end var out = opt_dir.value or else "catalog.out" (out/"p").mkdir +(out/"res").mkdir + +catalog.outdir = out # Generate the css (hard coded) var css = """ @@ -674,7 +716,7 @@ css.write_to_file(out/"style.css") # PAGES -for p in model.mpackages do +for p in mpackages do # print p var f = "p/{p.name}.html" catalog.package_page(p) @@ -697,7 +739,7 @@ index.add catalog.list_best(catalog.score) if catalog.deps.not_empty then index.add "{p.name} " var maint = "?" - if p.maintainers.not_empty then maint = p.maintainers.first + if p.maintainers.not_empty then maint = p.maintainers.first.name.html_escape res.add "{maint} " res.add "{p.contributors.length} " if deps.not_empty then @@ -484,6 +513,10 @@ redef class Catalog res.add "{mmethods[p]} " res.add "{loc[p]} " res.add "{score[p]} " + res.add "{errors[p]} " + res.add "{warnings[p]} " + res.add "{warnings_per_kloc[p]} " + res.add "{documentation_score[p]} " res.add "Most Required
\n" var reqs = new Counter[MPackage] - for p in model.mpackages do + for p in mpackages do reqs[p] = catalog.deps[p].smallers.length - 1 end index.add catalog.list_best(reqs) @@ -714,7 +756,7 @@ index.add """