diff --git a/apps.json b/apps.json index 5d8522d7..22fcc915 100644 --- a/apps.json +++ b/apps.json @@ -2,7 +2,6 @@ "20euros": { "branch": "master", "category": "games", - "level": 7, "maintained": true, "revision": "HEAD", "state": "working", @@ -329,6 +328,7 @@ "codimd": { "branch": "master", "category": "office", + "level": 2, "revision": "HEAD", "state": "working", "subtags": [ @@ -468,7 +468,7 @@ "diaspora": { "branch": "master", "category": "social_media", - "level": 0, + "level": 1, "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", "state": "working", "subtags": [ @@ -1515,6 +1515,7 @@ "mautrix_whatsapp": { "branch": "master", "category": "communication", + "level": 0, "revision": "HEAD", "state": "working", "subtags": [ @@ -1606,7 +1607,7 @@ "minidlna": { "branch": "master", "category": "multimedia", - "level": 2, + "level": 4, "revision": "HEAD", "state": "working", "subtags": [ @@ -2612,7 +2613,7 @@ "strut": { "branch": "master", "category": "office", - "level": 8, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -2667,7 +2668,7 @@ "synapse": { "branch": "master", "category": "communication", - "level": 2, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -2886,7 +2887,7 @@ "wallabag2": { "branch": "master", "category": "reading", - "level": 8, + "level": 7, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/wallabag2_ynh" diff --git a/list_builder.py b/list_builder.py index 669ea20e..12a26518 100755 --- a/list_builder.py +++ b/list_builder.py @@ -80,7 +80,12 @@ def init_cache(app, infos): else: depth = 40 - git("clone --quiet --depth {depth} --single-branch --branch master {url} {folder}".format(depth=depth, url=infos["url"], folder=app_cache_folder(app))) + git("clone --quiet --depth {depth} --single-branch --branch {branch} {url} {folder}".format( + depth=depth, + url=infos["url"], + branch=infos.get("branch", "master"), + folder=app_cache_folder(app)) + ) def refresh_cache(app, infos): @@ -90,10 +95,12 @@ def refresh_cache(app, infos): if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 3600: return + branch=infos.get("branch", "master") + try: git("remote set-url origin " + infos["url"], in_folder=app_cache_folder(app)) - git("fetch --quiet origin master --force", in_folder=app_cache_folder(app)) - git("reset origin/master --hard", in_folder=app_cache_folder(app)) + git("fetch --quiet origin %s --force" % branch, in_folder=app_cache_folder(app)) + git("reset origin/%s --hard" % branch, in_folder=app_cache_folder(app)) except: # Sometimes there are tmp issue such that the refresh cache .. # we don't trigger an error unless the cache hasnt been updated since more than 24 hours @@ -160,8 +167,6 @@ def build_catalog(): def build_app_dict(app, infos): - assert infos["branch"] == "master" - # Make sure we have some cache this_app_cache = app_cache_folder(app) assert os.path.exists(this_app_cache), "No cache yet for %s" % app