X-Git-Url: http://nitlanguage.org

diff --git a/src/nitcatalog.nit b/src/nitcatalog.nit
index 28ae918..c604fa6 100644
--- a/src/nitcatalog.nit
+++ b/src/nitcatalog.nit
@@ -83,6 +83,9 @@ end
 class CatalogPage
 	super Template
 
+	# The associated catalog, used to groups options and other global data
+	var catalog: Catalog
+
 	# Placeholder to include additional things before the `</head>`.
 	var more_head = new Template
 
@@ -131,6 +134,37 @@ class CatalogPage
 """
 	end
 
+	# Inject piwik HTML code if required
+	private fun add_piwik
+	do
+		var tracker_url = catalog.piwik_tracker
+		if tracker_url == null then return
+
+		var site_id = catalog.piwik_site_id
+
+		tracker_url = tracker_url.trim
+		if tracker_url.chars.last != '/' then tracker_url += "/"
+		add """
+<!-- Piwik -->
+<script type="text/javascript">
+var _paq = _paq || [];
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
+(function() {
+var u=(("https:" == document.location.protocol) ? "https" : "http") + "://{{{tracker_url.escape_to_c}}}";
+_paq.push(['setTrackerUrl', u+'piwik.php']);
+_paq.push(['setSiteId', {{{site_id}}}]);
+var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+})();
+
+</script>
+<noscript><p><img src="http://{{{tracker_url.html_escape}}}piwik.php?idsite={{{site_id}}}" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
+"""
+
+	end
+
 	redef fun rendering
 	do
 		add """
@@ -138,6 +172,10 @@ class CatalogPage
 <script src='https://code.jquery.com/jquery-latest.min.js'></script>
 <script src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js'></script>
 <script src='https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.8.1/bootstrap-table-all.min.js'></script>
+"""
+		add_piwik
+		add """
+
 </body>
 </html>
 """
@@ -191,6 +229,12 @@ class Catalog
 	# The score is loosely computed using other metrics
 	var score = new Counter[MPackage]
 
+	# Return a empty `CatalogPage`.
+	fun new_page(rootpath: String): CatalogPage
+	do
+		return new CatalogPage(self, rootpath)
+	end
+
 	# Scan, register and add a contributor to a package
 	fun add_contrib(person: String, mpackage: MPackage, res: Template)
 	do
@@ -245,7 +289,7 @@ class Catalog
 	end
 
 	# Recursively generate a level in the file tree of the *content* section
-	private fun gen_content_level(ot: OrderedTree[Object], os: Array[Object], res: Template)
+	private fun gen_content_level(ot: OrderedTree[MConcern], os: Array[Object], res: Template)
 	do
 		res.add "<ul>\n"
 		for o in os do
@@ -255,13 +299,10 @@ class Catalog
 				var mdoc = o.mdoc
 				if mdoc != null then d = ": {mdoc.html_synopsis.write_to_string}"
 				res.add "<strong>{o.name}</strong>{d} ({o.filepath.to_s})"
-			else if o isa ModulePath then
+			else if o isa MModule then
 				var d = ""
-				var m = o.mmodule
-				if m != null then
-					var mdoc = m.mdoc
-					if mdoc != null then d = ": {mdoc.html_synopsis.write_to_string}"
-				end
+				var mdoc = o.mdoc
+				if mdoc != null then d = ": {mdoc.html_synopsis.write_to_string}"
 				res.add "<strong>{o.name}</strong>{d} ({o.filepath.to_s})"
 			else
 				abort
@@ -276,7 +317,7 @@ class Catalog
 	# Compute information and generate a full HTML page for a package
 	fun package_page(mpackage: MPackage): Writable
 	do
-		var res = new CatalogPage("..")
+		var res = new_page("..")
 		var score = score[mpackage].to_f
 		var name = mpackage.name.html_escape
 		res.more_head.add """<title>{{{name}}}</title>"""
@@ -293,14 +334,14 @@ class Catalog
 		end
 
 		res.add "<h2>Content</h2>"
-		var ot = new OrderedTree[Object]
+		var ot = new OrderedTree[MConcern]
 		for g in mpackage.mgroups do
 			var pa = g.parent
 			if g.is_interesting then
 				ot.add(pa, g)
 				pa = g
 			end
-			for mp in g.module_paths do
+			for mp in g.mmodules do
 				ot.add(pa, mp)
 			end
 		end
@@ -313,6 +354,21 @@ class Catalog
 <div class="sidebar">
 <ul class="box">
 """
+		var tryit = mpackage.metadata("upstream.tryit")
+		if tryit != null then
+			score += 1.0
+			var e = tryit.html_escape
+			res.add "<li><a href=\"{e}\">Try<span style=\"color:white\">n</span>it!</a></li>\n"
+		end
+		var apk = mpackage.metadata("upstream.apk")
+		if apk != null then
+			score += 1.0
+			var e = apk.html_escape
+			res.add "<li><a href=\"{e}\">Android apk</a></li>\n"
+		end
+
+		res.add """</ul>\n<ul class="box">\n"""
+
 		var homepage = mpackage.metadata("upstream.homepage")
 		if homepage != null then
 			score += 5.0
@@ -365,28 +421,27 @@ class Catalog
 
 		res.add "<h3>Tags</h3>\n"
 		var tags = mpackage.metadata("package.tags")
-		var ts2 = new Array[String]
-		var cat = null
+		var ts = new Array[String]
 		if tags != null then
-			var ts = tags.split(",")
-			for t in ts do
+			for t in tags.split(",") do
 				t = t.trim
 				if t == "" then continue
-				if cat == null then cat = t
-				tag2proj[t].add mpackage
-				t = t.html_escape
-				ts2.add "<a href=\"../index.html#tag_{t}\">{t}</a>"
+				ts.add t
 			end
-			res.add_list(ts2, ", ", ", ")
 		end
-		if ts2.is_empty then
-			var t = "none"
-			cat = t
+		if ts.is_empty then ts.add "none"
+		if tryit != null then ts.add "tryit"
+		if apk != null then ts.add "apk"
+		var ts2 = new Array[String]
+		for t in ts do
 			tag2proj[t].add mpackage
-			res.add "<a href=\"../index.html#tag_{t}\">{t}</a>"
+			t = t.html_escape
+			ts2.add "<a href=\"../index.html#tag_{t}\">{t}</a>"
 		end
-		if cat != null then cat2proj[cat].add mpackage
-		score += ts2.length.score
+		res.add_list(ts2, ", ", ", ")
+		var cat = ts.first
+		cat2proj[cat].add mpackage
+		score += ts.length.score
 
 		if deps.has(mpackage) then
 			var reqs = deps[mpackage].greaters.to_a
@@ -436,6 +491,12 @@ class Catalog
 		end
 
 		var contributors = mpackage.contributors
+		var more_contributors = mpackage.metadata("package.more_contributors")
+		if more_contributors != null then
+			for c in more_contributors.split(",") do
+				contributors.add c.trim
+			end
+		end
 		if not contributors.is_empty then
 			res.add "<h3>Contributors</h3>\n<ul class=\"box\">"
 			for c in contributors do
@@ -450,7 +511,7 @@ class Catalog
 		var mmethods = 0
 		var loc = 0
 		for g in mpackage.mgroups do
-			mmodules += g.module_paths.length
+			mmodules += g.mmodules.length
 			for m in g.mmodules do
 				var am = modelbuilder.mmodule2node(m)
 				if am != null then
@@ -641,6 +702,13 @@ class Catalog
 		res.add "</table>\n"
 		return res
 	end
+
+	# Piwik tracker URL, if any
+	var piwik_tracker: nullable String = null
+
+	# Piwik site ID
+	# Used when `piwik_tracker` is set
+	var piwik_site_id: Int = 1
 end
 
 # Execute a git command and return the result
@@ -662,7 +730,13 @@ var opt_no_git = new OptionBool("Do not gather git information from the working
 var opt_no_parse = new OptionBool("Do not parse nit files (no importation information)", "--no-parse")
 var opt_no_model = new OptionBool("Do not analyse nit files (no class/method information)", "--no-model")
 
-tc.option_context.add_option(opt_dir, opt_no_git, opt_no_parse, opt_no_model)
+# Piwik tracker URL.
+# If you want to monitor your visitors.
+var opt_piwik_tracker = new OptionString("Piwik tracker URL (ex: `nitlanguage.org/piwik/`)", "--piwik-tracker")
+# Piwik tracker site id.
+var opt_piwik_site_id = new OptionString("Piwik site ID", "--piwik-site-id")
+
+tc.option_context.add_option(opt_dir, opt_no_git, opt_no_parse, opt_no_model, opt_piwik_tracker, opt_piwik_site_id)
 
 tc.process_options(sys.args)
 tc.keep_going = true
@@ -670,10 +744,25 @@ tc.keep_going = true
 var modelbuilder = new ModelBuilder(model, tc)
 var catalog = new Catalog(modelbuilder)
 
+catalog.piwik_tracker = opt_piwik_tracker.value
+var piwik_site_id = opt_piwik_site_id.value
+if piwik_site_id != null then
+	if catalog.piwik_tracker == null then
+		print_error "Warning: ignored `{opt_piwik_site_id}` because `{opt_piwik_tracker}` is not set."
+	else if piwik_site_id.is_int then
+		print_error "Warning: ignored `{opt_piwik_site_id}`, an integer is required."
+	else
+		catalog.piwik_site_id = piwik_site_id.to_i
+	end
+end
+
+
 # Get files or groups
-for a in tc.option_context.rest do
-	modelbuilder.get_mgroup(a)
-	modelbuilder.identify_file(a)
+var args = tc.option_context.rest
+if opt_no_parse.value then
+	modelbuilder.scan_full(args)
+else
+	modelbuilder.parse_full(args)
 end
 
 # Scan packages and compute information
@@ -684,7 +773,6 @@ for p in model.mpackages do
 
 	# Load the module to process importation information
 	if opt_no_parse.value then continue
-	modelbuilder.parse_group(g)
 
 	catalog.deps.add_node(p)
 	for gg in p.mgroups do for m in gg.mmodules do
@@ -818,7 +906,7 @@ end
 
 # INDEX
 
-var index = new CatalogPage("")
+var index = catalog.new_page("")
 index.more_head.add "<title>Packages in Nit</title>"
 
 index.add """
@@ -865,7 +953,7 @@ index.write_to_file(out/"index.html")
 
 # PEOPLE
 
-var page = new CatalogPage("")
+var page = catalog.new_page("")
 page.more_head.add "<title>People of Nit</title>"
 page.add """<div class="content">\n<h1>People of Nit</h1>\n"""
 page.add "<h2>By Maintainer</h2>\n"
@@ -877,7 +965,7 @@ page.write_to_file(out/"people.html")
 
 # TABLE
 
-page = new CatalogPage("")
+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"