nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Nitsmell : Adding new code smells and print console updated
[nit.git]
/
src
/
nitcatalog.nit
diff --git
a/src/nitcatalog.nit
b/src/nitcatalog.nit
index
5c478f0
..
982e206
100644
(file)
--- a/
src/nitcatalog.nit
+++ b/
src/nitcatalog.nit
@@
-232,12
+232,19
@@
redef class Catalog
var name = mpackage.name.html_escape
res.more_head.add """<title>{{{name}}}</title>"""
var name = mpackage.name.html_escape
res.more_head.add """<title>{{{name}}}</title>"""
- res.add """
-<div class="content">
-<h1 class="package-name">{{{name}}}</h1>
-"""
+ res.add """<div class="content">"""
+
var mdoc = mpackage.mdoc_or_fallback
var mdoc = mpackage.mdoc_or_fallback
- if mdoc != null then res.add mdoc.html_documentation
+ if mdoc == null then
+ res.add """<h1 class="package-name">{{{name}}}</h1>"""
+ else
+ res.add """
+<div style="float: left">
+ <h1 class="package-name">{{{name}}} - </h1>
+</div>
+"""
+ res.add mdoc.html_documentation
+ end
res.add "<h2>Content</h2>"
var ot = new OrderedTree[MConcern]
res.add "<h2>Content</h2>"
var ot = new OrderedTree[MConcern]
@@
-561,10
+568,16
@@
end
# Get files or groups
var args = tc.option_context.rest
# Get files or groups
var args = tc.option_context.rest
+var mmodules
if opt_no_parse.value then
if opt_no_parse.value then
- modelbuilder.scan_full(args)
+ mmodules = modelbuilder.scan_full(args)
else
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
end
# Scan packages and compute information
@@
-586,7
+599,7
@@
for p in model.mpackages do
end
end
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
catalog.git_info(p)
end
@@
-703,7
+716,7
@@
css.write_to_file(out/"style.css")
# PAGES
# PAGES
-for p in model.mpackages do
+for p in mpackages do
# print p
var f = "p/{p.name}.html"
catalog.package_page(p)
# print p
var f = "p/{p.name}.html"
catalog.package_page(p)
@@
-726,7
+739,7
@@
index.add catalog.list_best(catalog.score)
if catalog.deps.not_empty then
index.add "<h2>Most Required</h2>\n"
var reqs = new Counter[MPackage]
if catalog.deps.not_empty then
index.add "<h2>Most Required</h2>\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)
reqs[p] = catalog.deps[p].smallers.length - 1
end
index.add catalog.list_best(reqs)
@@
-743,7
+756,7
@@
index.add """
<div class="sidebar">
<h3>Stats</h3>
<ul class="box">
<div class="sidebar">
<h3>Stats</h3>
<ul class="box">
-<li>{{{model.mpackages.length}}} packages</li>
+<li>{{{mpackages.length}}} packages</li>
<li>{{{catalog.maint2proj.length}}} maintainers</li>
<li>{{{catalog.contrib2proj.length}}} contributors</li>
<li>{{{catalog.tag2proj.length}}} tags</li>
<li>{{{catalog.maint2proj.length}}} maintainers</li>
<li>{{{catalog.contrib2proj.length}}} contributors</li>
<li>{{{catalog.tag2proj.length}}} tags</li>
@@
-775,6
+788,6
@@
page = catalog.new_page("")
page.more_head.add "<title>Projets of Nit</title>"
page.add """<div class="content">\n<h1>People of Nit</h1>\n"""
page.add "<h2>Table of Projets</h2>\n"
page.more_head.add "<title>Projets of Nit</title>"
page.add """<div class="content">\n<h1>People of Nit</h1>\n"""
page.add "<h2>Table of Projets</h2>\n"
-page.add catalog.table_packages(model.mpackages)
+page.add catalog.table_packages(mpackages.to_a)
page.add "</div>\n"
page.write_to_file(out/"table.html")
page.add "</div>\n"
page.write_to_file(out/"table.html")