From 093e61f136bd4984879ee1beaba98588d0ea62dc Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 8 Nov 2018 13:16:07 +0000
Subject: [PATCH] Misc fixes

---
 app/app.py                                   | 3 +++
 app/scripts/appListsHistory/script.py        | 5 +++--
 app/scripts/callForListing/callForListing.sh | 2 ++
 app/templates/maintainer.html                | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/app.py b/app/app.py
index 491deb5..4d79f8f 100644
--- a/app/app.py
+++ b/app/app.py
@@ -166,6 +166,9 @@ def app_maintainer_dash():
             if test.branch.name == "stable":
                 app.ci_level = test.level
 
+        if isinstance(app.public_level, str):
+            app.public_level = -1
+
     maintainers = sorted(maintainers, key=lambda m: m.lower())
     apps = sorted(apps, key=lambda app: app.name.lower())
 
diff --git a/app/scripts/appListsHistory/script.py b/app/scripts/appListsHistory/script.py
index 2042044..ba0ee49 100644
--- a/app/scripts/appListsHistory/script.py
+++ b/app/scripts/appListsHistory/script.py
@@ -124,6 +124,7 @@ def make_rss_feed():
         fe.title('Changes between %s and %s' % (diff["begin"].strftime("%b %d"), diff["end"].strftime("%b %d")))
         fe.link(href='https://github.com/YunoHost/apps/commits/master/community.json')
         fe.content(jinja2.Template(open("rss_template.html").read()).render(data=diff), type="html")
+        fe._FeedEntry__atom_updated = diff["end"]
 
     fg.atom_file('atom.xml')
 
@@ -157,6 +158,6 @@ def make_count_summary():
 
     json.dump(history, open('count_history.json', 'w'))
 
-#get_lists_history()
+get_lists_history()
 make_rss_feed()
-#make_count_summary()
+make_count_summary()
diff --git a/app/scripts/callForListing/callForListing.sh b/app/scripts/callForListing/callForListing.sh
index 14daa7c..b3f8e1f 100755
--- a/app/scripts/callForListing/callForListing.sh
+++ b/app/scripts/callForListing/callForListing.sh
@@ -15,6 +15,7 @@ function createIssue()
                   --data "$DATA" )
     #echo "$ANSWER" >&2
 
+    echo "$ANSWER"
     echo "$ANSWER" \
     | grep "^  \"html_url\":" \
     | awk '{print $2}' \
@@ -31,6 +32,7 @@ function main()
 
 	while read -r line
 	do
+		echo $line
 		OWNER=$(echo "$line" | tr '/' ' ' | awk '{print $3}')
 		REPO=$(echo "$line" | tr '/' ' ' | awk '{print $4}')
 		createIssue $OWNER $REPO
diff --git a/app/templates/maintainer.html b/app/templates/maintainer.html
index f2871b3..4287f91 100644
--- a/app/templates/maintainer.html
+++ b/app/templates/maintainer.html
@@ -83,7 +83,7 @@
                         table-success
                     {% endif %}
                         " value="{{ app.public_level }}">
-                        <div title="Public Level"><strong>{{ app.public_level if app.public_level >= 0 else "?" }}</strong></div>
+                        <div title="Public Level"><strong>{{ app.public_level if app.public_level != None and app.public_level >= 0 else "?" }}</strong></div>
                     </td>
 
 
@@ -98,7 +98,7 @@
                         table-success
                     {% endif %}
                         " value="{{ app.ci_level }}">
-                        <div title="CI Level"><strong>{{ app.ci_level if app.ci_level and app.ci_level >= 0 else "?" }}</strong></div>
+                        <div title="CI Level"><strong>{{ app.ci_level if app.ci_level != None and app.ci_level >= 0 else "?" }}</strong></div>
                     </td>
 
                     {% endif %}
@@ -125,8 +125,8 @@
 
 
                     <td class="ci-app-test-info">
-                    {% if app.public_commit_date %}
-                    <span class="daysAgo" timestamp={{ app.public_commit_date.timestamp() }}></span></td>
+                    {% if app.master_commit_date %}
+                    <span class="daysAgo" timestamp={{ app.master_commit_date.timestamp() }}></span></td>
                     {% else %}
                     <span class="daysAgo">???</span></td>
                     {% endif %}