Merge: Extends catalog with a *try it* and a *download apk* links

Two new package metadata are added

* `upstream.tryit` for an URL that points to a demo version or a live version of the main web service offered by the package.
* `upstream.apk` for an URL that points to a dry `apk`, or an install page on some store, for the main android application offered by the package.

Moreover, packages that have one them will be respectively tagged `tryit` and `apk`

A demo is available: http://info.uqam.ca/~privat/catalog/#tag_tryit and http://info.uqam.ca/~privat/catalog/#tag_apk

Pull-Request: #1724
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Romain Chanoir <chanoir.romain@courrier.uqam.ca>

diff --git a/contrib/benitlux/package.ini b/contrib/benitlux/package.ini
index 53acc9d..e53853c 100644 (file)
--- a/contrib/benitlux/package.ini
+++ b/contrib/benitlux/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/benitlux/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://benitlux.xymus.net/

diff --git a/contrib/crazy_moles/package.ini b/contrib/crazy_moles/package.ini
index 42eae16..719752f 100644 (file)
--- a/contrib/crazy_moles/package.ini
+++ b/contrib/crazy_moles/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/crazy_moles/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/moles_android.apk

diff --git a/contrib/friendz/package.ini b/contrib/friendz/package.ini
index b1398f2..7ef0618 100644 (file)
--- a/contrib/friendz/package.ini
+++ b/contrib/friendz/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/friendz/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/friendz_android.apk

diff --git a/contrib/mnit_test/package.ini b/contrib/mnit_test/package.ini
index 29856ff..adcdf8f 100644 (file)
--- a/contrib/mnit_test/package.ini
+++ b/contrib/mnit_test/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=examples/mnit_simple/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/test_all.apk

diff --git a/contrib/nitrpg/package.ini b/contrib/nitrpg/package.ini
index 125e96c..812edca 100644 (file)
--- a/contrib/nitrpg/package.ini
+++ b/contrib/nitrpg/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/nitrpg/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://nitlanguage.org/rpg/games/nitlang/nit

diff --git a/contrib/online_ide/package.ini b/contrib/online_ide/package.ini
index ee1afbd..841f552 100644 (file)
--- a/contrib/online_ide/package.ini
+++ b/contrib/online_ide/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/online_ide/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://nitlanguage.org/online_ide/

diff --git a/contrib/opportunity/package.ini b/contrib/opportunity/package.ini
index 9e3dae9..5f819b4 100644 (file)
--- a/contrib/opportunity/package.ini
+++ b/contrib/opportunity/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/opportunity/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://xymus.net/opportunity/

diff --git a/contrib/pep8analysis/package.ini b/contrib/pep8analysis/package.ini
index 5f5fba5..43d5e4a 100644 (file)
--- a/contrib/pep8analysis/package.ini
+++ b/contrib/pep8analysis/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/pep8analysis/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://pep8.xymus.net/

diff --git a/contrib/tinks/package.ini b/contrib/tinks/package.ini
index dc04026..cf4f9ee 100644 (file)
--- a/contrib/tinks/package.ini
+++ b/contrib/tinks/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/tinks/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/tinks.apk

diff --git a/contrib/tnitter/package.ini b/contrib/tnitter/package.ini
index 42a426c..26ba69a 100644 (file)
--- a/contrib/tnitter/package.ini
+++ b/contrib/tnitter/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=contrib/tnitter/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+tryit=http://tnitter.xymus.net/

diff --git a/examples/calculator/package.ini b/examples/calculator/package.ini
index adeb755..80b32cb 100644 (file)
--- a/examples/calculator/package.ini
+++ b/examples/calculator/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=examples/calculator/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/calculator.apk

diff --git a/examples/mnit_ballz/package.ini b/examples/mnit_ballz/package.ini
index 7314aeb..9db4745 100644 (file)
--- a/examples/mnit_ballz/package.ini
+++ b/examples/mnit_ballz/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=examples/mnit_ballz/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/ballz.apk

diff --git a/examples/mnit_dino/package.ini b/examples/mnit_dino/package.ini
index fbd7d4f..efa6693 100644 (file)
--- a/examples/mnit_dino/package.ini
+++ b/examples/mnit_dino/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=examples/mnit_dino/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/dino.apk

diff --git a/examples/shoot/package.ini b/examples/shoot/package.ini
index 0fe112a..099ba60 100644 (file)
--- a/examples/shoot/package.ini
+++ b/examples/shoot/package.ini
@@ -9,3 +9,4 @@ git=https://github.com/nitlang/nit.git
 git.directory=examples/shoot/
 homepage=http://nitlanguage.org
 issues=https://github.com/nitlang/nit/issues
+apk=http://nitlanguage.org/fdroid/apk/shoot_android.apk

diff --git a/src/nitcatalog.nit b/src/nitcatalog.nit
index 28ae918..59d76b0 100644 (file)
--- a/src/nitcatalog.nit
+++ b/src/nitcatalog.nit
@@ -313,6 +313,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 +380,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