From 3c9f86a41ff84f1c2c8868f14188cf594d2874d0 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 31 Mar 2020 00:51:22 +0000 Subject: [PATCH 01/25] Update maintained state --- apps.json | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/apps.json b/apps.json index 8bb2791c..98a86eff 100644 --- a/apps.json +++ b/apps.json @@ -58,7 +58,7 @@ "category": "synchronization", "high_quality": true, "level": 0, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -101,7 +101,7 @@ "category": "multimedia", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -163,7 +163,7 @@ "category": "synchronization", "high_quality": true, "level": 0, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -812,6 +812,7 @@ "branch": "master", "category": "social_media", "level": 7, + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1191,7 +1192,7 @@ "jenkins": { "branch": "master", "category": "dev", - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "inprogress", "url": "https://github.com/YunoHost-Apps/jenkins_ynh" @@ -1201,7 +1202,7 @@ "category": "synchronization", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1246,7 +1247,7 @@ "category": "productivity_and_management", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1258,7 +1259,7 @@ "branch": "master", "category": "synchronization", "level": 7, - "maintained": true, + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1662,8 +1663,8 @@ "moodle": { "branch": "master", "category": "wat", - "revision": "HEAD", "level": 7, + "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/moodle_ynh" }, @@ -1749,7 +1750,7 @@ "category": "publishing", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1794,7 +1795,7 @@ "category": "synchronization", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1827,6 +1828,7 @@ "branch": "master", "category": "communication", "level": 2, + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -1985,6 +1987,7 @@ "pelican": { "branch": "master", "category": "publishing", + "maintained": false, "revision": "a2f37b8e277ba173b53f73320514f1fc7f3aa3ac", "state": "inprogress", "subtags": [ @@ -2040,7 +2043,7 @@ "category": "system_tools", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -2245,7 +2248,7 @@ "category": "communication", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -2340,7 +2343,7 @@ "category": "communication", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -2402,7 +2405,7 @@ "category": "small_utilities", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/searx_ynh" @@ -2444,7 +2447,7 @@ "category": "system_tools", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/shellinabox_ynh" @@ -2754,7 +2757,7 @@ "category": "multimedia", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -2784,7 +2787,7 @@ "category": "reading", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -3087,7 +3090,7 @@ "category": "small_utilities", "high_quality": true, "level": 7, - "maintained": "request_adoption", + "maintained": false, "revision": "HEAD", "state": "working", "subtags": [ @@ -3137,4 +3140,4 @@ ], "url": "https://github.com/YunoHost-Apps/ztncui_ynh" } -} +} \ No newline at end of file From c806d6982f7cc46193d50a46b3f0871d8f667067 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 31 Mar 2020 02:55:34 +0200 Subject: [PATCH 02/25] Fix messy diff --- apps.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/apps.json b/apps.json index 98a86eff..24d69ed5 100644 --- a/apps.json +++ b/apps.json @@ -58,7 +58,7 @@ "category": "synchronization", "high_quality": true, "level": 0, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -101,7 +101,7 @@ "category": "multimedia", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -163,7 +163,7 @@ "category": "synchronization", "high_quality": true, "level": 0, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -1192,7 +1192,7 @@ "jenkins": { "branch": "master", "category": "dev", - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "inprogress", "url": "https://github.com/YunoHost-Apps/jenkins_ynh" @@ -1202,7 +1202,7 @@ "category": "synchronization", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -1247,7 +1247,7 @@ "category": "productivity_and_management", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -1663,8 +1663,8 @@ "moodle": { "branch": "master", "category": "wat", - "level": 7, "revision": "HEAD", + "level": 7, "state": "working", "url": "https://github.com/YunoHost-Apps/moodle_ynh" }, @@ -1750,7 +1750,7 @@ "category": "publishing", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -1795,7 +1795,7 @@ "category": "synchronization", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -2043,7 +2043,7 @@ "category": "system_tools", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -2248,7 +2248,7 @@ "category": "communication", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -2343,7 +2343,7 @@ "category": "communication", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -2405,7 +2405,7 @@ "category": "small_utilities", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/searx_ynh" @@ -2447,7 +2447,7 @@ "category": "system_tools", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/shellinabox_ynh" @@ -2757,7 +2757,7 @@ "category": "multimedia", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -2787,7 +2787,7 @@ "category": "reading", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -3090,7 +3090,7 @@ "category": "small_utilities", "high_quality": true, "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ @@ -3140,4 +3140,4 @@ ], "url": "https://github.com/YunoHost-Apps/ztncui_ynh" } -} \ No newline at end of file +} From a309a94de6f53bd586489a53ceb07ba904d2bb68 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 4 Apr 2020 14:30:09 +0200 Subject: [PATCH 03/25] "request_adoption" for Keeweb --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 24d69ed5..552a2993 100644 --- a/apps.json +++ b/apps.json @@ -1259,7 +1259,7 @@ "branch": "master", "category": "synchronization", "level": 7, - "maintained": false, + "maintained": "request_adoption", "revision": "HEAD", "state": "working", "subtags": [ From 174957b7998286087d99f2fb03af9616646fc0c9 Mon Sep 17 00:00:00 2001 From: Gredin67 <35761345+Gredin67@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:52:33 +0200 Subject: [PATCH 04/25] Add Matrix-WhatsApp bridge "mautrix-whatsapp" is the name of the upstream app https://github.com/tulir/mautrix-whatsapp --- apps.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps.json b/apps.json index c270186c..c39743b8 100644 --- a/apps.json +++ b/apps.json @@ -1510,6 +1510,16 @@ ], "url": "https://github.com/YunoHost-Apps/mattermost_ynh" }, + "mautrix_whatsapp": { + "branch": "master", + "category": "communication", + "revision": "HEAD", + "state": "working", + "subtags": [ + "chat" + ], + "url": "https://github.com/YunoHost-Apps/mautrix-whatsapp_ynh" + }, "mediadrop": { "branch": "master", "category": "multimedia", From bdbc08ce2fc37094f2a09609bda22fc09068ffc6 Mon Sep 17 00:00:00 2001 From: Ilja Date: Sun, 26 Apr 2020 14:02:31 +0200 Subject: [PATCH 05/25] Add neutrinet app to applist I used the script, but then changed the branchname to stable (no masters here) I used HEAD for revision. We use a testbranch in our workflow so this will be less work for us. --- apps.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps.json b/apps.json index c270186c..609447b2 100644 --- a/apps.json +++ b/apps.json @@ -1796,6 +1796,12 @@ ], "url": "https://github.com/YunoHost-Apps/netdata_ynh" }, + "neutrinet": { + "branch": "stable", + "revision": "HEAD", + "state": "working", + "url": "https://gitlab.domainepublic.net/Neutrinet/neutrinet_ynh" + }, "nextcloud": { "branch": "master", "category": "synchronization", From 32458ce74b86b1a50286ab731384f7fc00cc4bdd Mon Sep 17 00:00:00 2001 From: farvardin Date: Mon, 27 Apr 2020 22:04:41 +0200 Subject: [PATCH 06/25] new lionwiki-t2t location in YunoHost-Apps organisation --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index c7a21727..f38e6376 100644 --- a/apps.json +++ b/apps.json @@ -1397,7 +1397,7 @@ "subtags": [ "wiki" ], - "url": "https://github.com/farvardin/lionwiki-t2t_ynh" + "url": "https://github.com/YunoHost-Apps/lionwiki-t2t_ynh" }, "lstu": { "branch": "master", From 7625877d6dc65f1b248eddc5b51a1414d86cd1ac Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Tue, 28 Apr 2020 01:19:15 +0200 Subject: [PATCH 07/25] Update dockerui --- apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index f38e6376..bd9a51d0 100644 --- a/apps.json +++ b/apps.json @@ -548,9 +548,9 @@ "branch": "master", "category": "system_tools", "maintained": false, - "revision": "0c8d6674116b0da826375b5eaeab54ae1348a107", + "revision": "HEAD", "state": "notworking", - "url": "https://github.com/scith/dockerui_ynh" + "url": "https://github.com/YunoHost-Apps/dockerui_ynh" }, "dokuwiki": { "branch": "master", From 3900a2207ecb5ad5d6b07d51a43c9df6bb067e3b Mon Sep 17 00:00:00 2001 From: Gredin67 <35761345+Gredin67@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:44:11 +0200 Subject: [PATCH 08/25] Unified mautrix_whatsapp_ynh --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index c39743b8..5830bb33 100644 --- a/apps.json +++ b/apps.json @@ -1518,7 +1518,7 @@ "subtags": [ "chat" ], - "url": "https://github.com/YunoHost-Apps/mautrix-whatsapp_ynh" + "url": "https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh" }, "mediadrop": { "branch": "master", From e7eb2003f6a98c44cea3fcdb82d12d73ab1ff55f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 May 2020 20:05:23 +0000 Subject: [PATCH 09/25] Update app's level --- apps.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps.json b/apps.json index f38e6376..698a91b5 100644 --- a/apps.json +++ b/apps.json @@ -468,6 +468,7 @@ "diaspora": { "branch": "master", "category": "social_media", + "level": 0, "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", "state": "working", "subtags": [ @@ -889,7 +890,7 @@ "branch": "master", "category": "dev", "high_quality": true, - "level": 8, + "level": 2, "revision": "HEAD", "state": "working", "subtags": [ @@ -1391,7 +1392,7 @@ "lionwiki-t2t": { "branch": "master", "category": "publishing", - "level": 0, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -1638,7 +1639,7 @@ "monica": { "branch": "master", "category": "wat", - "level": 2, + "level": 0, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/monica_ynh" @@ -1743,7 +1744,7 @@ "my-mind": { "branch": "master", "category": "office", - "level": 1, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -2778,7 +2779,7 @@ "ttrss": { "branch": "master", "category": "reading", - "level": 7, + "level": 2, "maintained": "request_adoption", "revision": "HEAD", "state": "working", @@ -3007,6 +3008,7 @@ "yeswiki": { "branch": "master", "category": "publishing", + "level": 5, "revision": "HEAD", "state": "working", "subtags": [ @@ -3122,7 +3124,7 @@ "ztncui": { "branch": "master", "category": "system_tools", - "level": 2, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ From 46fa5732e752b2d1ba334ce2296e474c0fe65401 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 2 May 2020 13:21:49 +0200 Subject: [PATCH 10/25] unmaintaining my apps It's been more than a year that I'm not active enough anymore, and I don't want stress because of being slow --- apps.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps.json b/apps.json index bd9a51d0..904de4eb 100644 --- a/apps.json +++ b/apps.json @@ -833,6 +833,7 @@ "subtags": [ "music" ], + "maintained": false, "url": "https://github.com/YunoHost-Apps/funkwhale_ynh" }, "galette": { @@ -840,6 +841,7 @@ "category": "productivity_and_management", "revision": "9b09a7c5cca5683bcc8d89034c6a8ec024a2a441", "state": "notworking", + "maintained": false, "subtags": [ "business_and_ngos" ], @@ -1301,6 +1303,7 @@ "subtags": [ "accounting" ], + "maintained": false, "url": "https://github.com/YunoHost-Apps/kresus_ynh" }, "laverna": { @@ -1728,6 +1731,7 @@ "subtags": [ "meeting" ], + "maintained": false, "url": "https://github.com/YunoHost-Apps/mumbleserver_ynh" }, "munin": { @@ -1974,6 +1978,7 @@ "subtags": [ "forge" ], + "maintained": false, "url": "https://github.com/YunoHost-Apps/pagure_ynh" }, "peertube": { @@ -2608,6 +2613,7 @@ "subtags": [ "poll" ], + "maintained": false, "url": "https://github.com/YunoHost-Apps/studs_ynh" }, "subsonic": { @@ -2877,6 +2883,7 @@ "level": 7, "revision": "HEAD", "state": "working", + "maintained": false, "url": "https://github.com/YunoHost-Apps/weblate_ynh" }, "webmin": { From 49f1c635f1e46877681d4f0361dc06729c33d0a2 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 3 May 2020 02:38:29 +0200 Subject: [PATCH 11/25] Update apps.json --- apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index 698a91b5..d29286f9 100644 --- a/apps.json +++ b/apps.json @@ -890,7 +890,7 @@ "branch": "master", "category": "dev", "high_quality": true, - "level": 2, + "level": 8, "revision": "HEAD", "state": "working", "subtags": [ @@ -2779,7 +2779,7 @@ "ttrss": { "branch": "master", "category": "reading", - "level": 2, + "level": 7, "maintained": "request_adoption", "revision": "HEAD", "state": "working", From 85fd0ce3fa279c7d7e127894186754989e59c250 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 6 May 2020 16:10:45 +0000 Subject: [PATCH 12/25] Smarter error reporting when failing to refresh cache --- list_builder.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/list_builder.py b/list_builder.py index 2636c7f1..669ea20e 100755 --- a/list_builder.py +++ b/list_builder.py @@ -63,12 +63,12 @@ def refresh_all_caches(): try: init_cache(app, infos) except Exception as e: - error("Could not init cache for %s: %s" % (app, e)) + error("Failed to init cache for %s" % app) else: try: refresh_cache(app, infos) except Exception as e: - error("Could not refresh cache for %s: %s" % (app, e)) + error("Failed to not refresh cache for %s" % app) def init_cache(app, infos): @@ -90,9 +90,17 @@ def refresh_cache(app, infos): if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 3600: return - 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)) + 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)) + 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 + if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 24*3600: + pass + else: + raise ################################ From ed350c3e2884beacebdba8674c9623a9bc9c9444 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 8 May 2020 20:05:18 +0000 Subject: [PATCH 13/25] Update app's level --- apps.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/apps.json b/apps.json index a96fe787..40743a08 100644 --- a/apps.json +++ b/apps.json @@ -2,7 +2,7 @@ "20euros": { "branch": "master", "category": "games", - "level": 2, + "level": 3, "maintained": false, "revision": "c8d5fadc9f042a92f14b753eff3ffc948322cf2d", "state": "working", @@ -11,7 +11,7 @@ "243": { "branch": "master", "category": "games", - "level": 2, + "level": 7, "maintained": false, "revision": "b9d58efeac78feb7f74e723c999ff25ab7ab8b52", "state": "working", @@ -329,6 +329,7 @@ "codimd": { "branch": "master", "category": "office", + "level": 2, "revision": "HEAD", "state": "working", "subtags": [ @@ -468,7 +469,7 @@ "diaspora": { "branch": "master", "category": "social_media", - "level": 0, + "level": 1, "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", "state": "working", "subtags": [ @@ -1515,6 +1516,7 @@ "mautrix_whatsapp": { "branch": "master", "category": "communication", + "level": 0, "revision": "HEAD", "state": "working", "subtags": [ @@ -1606,7 +1608,7 @@ "minidlna": { "branch": "master", "category": "multimedia", - "level": 2, + "level": 4, "revision": "HEAD", "state": "working", "subtags": [ @@ -2606,7 +2608,7 @@ "strut": { "branch": "master", "category": "office", - "level": 8, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -2661,7 +2663,7 @@ "synapse": { "branch": "master", "category": "communication", - "level": 2, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -2880,7 +2882,7 @@ "wallabag2": { "branch": "master", "category": "reading", - "level": 8, + "level": 7, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/wallabag2_ynh" @@ -3137,7 +3139,7 @@ "ztncui": { "branch": "master", "category": "system_tools", - "level": 7, + "level": 0, "revision": "HEAD", "state": "working", "subtags": [ From 5109fe6b435bc5f964a83cfb2b8143a247093804 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 10 May 2020 10:18:04 +0200 Subject: [PATCH 14/25] add invoiceninja app --- apps.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps.json b/apps.json index a96fe787..49783a93 100644 --- a/apps.json +++ b/apps.json @@ -1157,6 +1157,13 @@ "state": "notworking", "url": "https://github.com/mitra42/internetarchive_ynh" }, + "invoiceninja": { + "branch": "master", + "category": "productivity_and_management", + "revision": "HEAD", + "state": "working", + "url": "https://github.com/YunoHost-Apps/invoiceninja_ynh" + }, "jappix": { "branch": "master", "category": "communication", From 06f4f4214c14e182047da707f1fe1275618d275d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 14 May 2020 17:41:21 +0200 Subject: [PATCH 15/25] Update apps.json --- apps.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps.json b/apps.json index 75455493..5d8522d7 100644 --- a/apps.json +++ b/apps.json @@ -2,18 +2,18 @@ "20euros": { "branch": "master", "category": "games", - "level": 2, - "maintained": false, - "revision": "c8d5fadc9f042a92f14b753eff3ffc948322cf2d", + "level": 7, + "maintained": true, + "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/20euros_ynh" }, "243": { "branch": "master", "category": "games", - "level": 2, - "maintained": false, - "revision": "b9d58efeac78feb7f74e723c999ff25ab7ab8b52", + "level": 7, + "maintained": true, + "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/243_ynh" }, @@ -437,9 +437,9 @@ "cubiks-2048": { "branch": "master", "category": "games", - "level": 3, - "maintained": false, - "revision": "1e0dce523039fcbd90e775a690018529b8190f18", + "level": 7, + "maintained": true, + "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/Cubiks-2048_ynh" }, From 0eb0b3712013022c4c10778f583d70ad83dd32e8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 14 May 2020 18:44:41 +0200 Subject: [PATCH 16/25] Fix ztncui level --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 40743a08..23283e54 100644 --- a/apps.json +++ b/apps.json @@ -3139,7 +3139,7 @@ "ztncui": { "branch": "master", "category": "system_tools", - "level": 0, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ From 69730524970e44e9543138ee519ed1df573ccf3c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 14 May 2020 17:58:24 +0000 Subject: [PATCH 17/25] Support other branches than master? --- list_builder.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 From afba6dac39568bc426d98153b404f972d71d44a6 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 14 May 2020 21:20:49 +0200 Subject: [PATCH 18/25] Update apps.json --- apps.json | 1 - 1 file changed, 1 deletion(-) diff --git a/apps.json b/apps.json index 22fcc915..4c786026 100644 --- a/apps.json +++ b/apps.json @@ -437,7 +437,6 @@ "cubiks-2048": { "branch": "master", "category": "games", - "level": 7, "maintained": true, "revision": "HEAD", "state": "working", From 3a570f23e8d6c93f099c71800039c708e43aa170 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 15 May 2020 17:21:48 +0200 Subject: [PATCH 19/25] Add yunomonitor --- apps.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps.json b/apps.json index 786c58fe..85774dc8 100644 --- a/apps.json +++ b/apps.json @@ -3081,6 +3081,16 @@ "state": "notworking", "url": "https://github.com/aymhce/yunohost_ynh" }, + "yunomonitor": { + "branch": "master", + "category": "system_tools", + "revision": "HEAD", + "state": "working", + "subtags": [ + "monitoring" + ], + "url": "https://github.com/aymhce/yunomonitor_ynh" + }, "z-push": { "branch": "master", "category": "synchronization", From c694c41121340c308583ec9a87e02576a52b6872 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 15 May 2020 17:22:46 +0200 Subject: [PATCH 20/25] fix url --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 85774dc8..462242cf 100644 --- a/apps.json +++ b/apps.json @@ -3089,7 +3089,7 @@ "subtags": [ "monitoring" ], - "url": "https://github.com/aymhce/yunomonitor_ynh" + "url": "https://github.com/YunoHost-Apps/yunomonitor_ynh" }, "z-push": { "branch": "master", From 3498f57849c48194aaf44efbd6567e46ed60c616 Mon Sep 17 00:00:00 2001 From: Kayou Date: Fri, 15 May 2020 23:31:29 +0200 Subject: [PATCH 21/25] Update app's level (#927) --- apps.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps.json b/apps.json index 462242cf..06e24da5 100644 --- a/apps.json +++ b/apps.json @@ -2,6 +2,7 @@ "20euros": { "branch": "master", "category": "games", + "level": 7, "maintained": true, "revision": "HEAD", "state": "working", @@ -467,7 +468,7 @@ "diaspora": { "branch": "master", "category": "social_media", - "level": 1, + "level": 3, "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", "state": "working", "subtags": [ @@ -1159,6 +1160,7 @@ "invoiceninja": { "branch": "master", "category": "productivity_and_management", + "level": 1, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/invoiceninja_ynh" @@ -1499,7 +1501,7 @@ "matomo": { "branch": "master", "category": "publishing", - "level": 0, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ @@ -1510,7 +1512,7 @@ "mattermost": { "branch": "master", "category": "communication", - "level": 4, + "level": 7, "revision": "HEAD", "state": "working", "subtags": [ From dcfe71065420bed4b3106b276c3e56a844e0fb85 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 18 May 2020 22:39:13 +0200 Subject: [PATCH 22/25] Add glitchsoc to apps.json --- apps.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps.json b/apps.json index 06e24da5..67ffc7e4 100644 --- a/apps.json +++ b/apps.json @@ -942,6 +942,13 @@ ], "url": "https://github.com/matlink/gitweb_ynh" }, + "glitchsoc": { + "branch": "master", + "revision": "HEAD", + "url": "https://github.com/Tagadda/glitch-soc_ynh", + "state": "inprogress" + + }, "glowingbear": { "branch": "master", "category": "communication", From fdb1c1da8806de7f8a063a0ed30b691a2127a2c9 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 18 May 2020 22:42:20 +0200 Subject: [PATCH 23/25] Add category and subtags --- apps.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps.json b/apps.json index 67ffc7e4..f3b6bde0 100644 --- a/apps.json +++ b/apps.json @@ -944,8 +944,12 @@ }, "glitchsoc": { "branch": "master", + "category": "social_media", "revision": "HEAD", "url": "https://github.com/Tagadda/glitch-soc_ynh", + "subtags": [ + "microblogging" + ], "state": "inprogress" }, From 24f6d66600ce86b436168ca3378925dcad01268c Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 24 May 2020 13:54:59 +0200 Subject: [PATCH 24/25] Add meilisearch. --- apps.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps.json b/apps.json index f3b6bde0..37b2e528 100644 --- a/apps.json +++ b/apps.json @@ -1586,6 +1586,16 @@ ], "url": "https://github.com/guigot/medusa_ynh" }, + "meilisearch" : { + "branch": "master", + "category": "dev", + "revision": "HEAD", + "state": "working", + "subtags": [ + "programming" + ], + "url": "https://github.com/YunoHost-Apps/meilisearch_ynh" + }, "menu": { "branch": "master", "category": "wat", From 0474909748d48d57114f9f3205e4dceb79f306c8 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Thu, 21 May 2020 22:12:31 +0200 Subject: [PATCH 25/25] Switch to HEAD for diaspora --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index f3b6bde0..355f71f8 100644 --- a/apps.json +++ b/apps.json @@ -469,7 +469,7 @@ "branch": "master", "category": "social_media", "level": 3, - "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", + "revision": "HEAD", "state": "working", "subtags": [ "microblogging"