From 55db4f6916324c4a2421f741ed3c474a53f3ad8c Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 15 Aug 2021 16:38:07 +0200
Subject: [PATCH] Assume branch=master and revision=HEAD by default for all
 apps

---
 README.md       | 11 +++++------
 list_builder.py |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b64506c..33e39a0 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,6 @@ To add your application to the catalog:
 App example addition:
 ```json
     "wallabag": {
-        "branch": "master",
-        "revision": "HEAD",
         "url": "https://github.com/abeudin/wallabag_ynh",
         "state": "working"
     }
@@ -44,9 +42,10 @@ N.B. : We strongly encourage you to transfer the ownership of your repository to
 the Yunohost-Apps organization on Github, such that the community will help you
 with keeping your app working and up to date with packaging evolutions.
 
-N.B.2 : If `"revision": "HEAD"` is used in `apps.json`, any commit to the
-`master` branch on your app will automatically be published to the catalog.
-Therefore we strongly encourage you to develop in separate branches, and only
+N.B.2 : Implicitly, the catalog publishes the `HEAD` of branch `master`
+(this can be overwritten by adding keys `branch` and `revision`).
+Therefore, **be careful that any commit on the `master` branch will automatically be published**.
+**We strongly encourage you to develop in separate branches**, and only
 merge changes that were carefully tested. Get in touch with the Apps group to
 obtain an access to the developer CI where you'll be able to test your app
 easily.
@@ -72,7 +71,7 @@ instead of doing Pull Request for files in `locales` folder.
 
 ### How to make my app flagged as High Quality ?
 
-A High Quality app will be highlighted in the app list and marked as a level 9 app.  
+A High Quality app will be highlighted in the app list and marked as a level 9 app.
 To become a High Quality app, a package has to follow the criterias listed [here](hq_validation_template.md).
 
 Once the app is validated is "high quality", the tag `"high_quality": true`
diff --git a/list_builder.py b/list_builder.py
index 0538090..be49b1f 100755
--- a/list_builder.py
+++ b/list_builder.py
@@ -212,6 +212,9 @@ def build_app_dict(app, infos):
     this_app_cache = app_cache_folder(app)
     assert os.path.exists(this_app_cache), "No cache yet for %s" % app
 
+    infos['branch'] = infos.get('branch', 'master')
+    infos['revision'] = infos.get('revision', 'HEAD')
+
     # If using head, find the most recent meaningful commit in logs
     if infos["revision"] == "HEAD":
         relevant_files = ["manifest.json", "actions.json", "hooks/", "scripts/", "conf/", "sources/"]