From 7203fb39ad36fc34b5346e81ebe643b7c0db44e9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 5 May 2019 00:29:30 +0200 Subject: [PATCH 1/9] Update Chtickynotes - Set maintained to false + update version --- community.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/community.json b/community.json index 9f5d428c..c00f7c11 100644 --- a/community.json +++ b/community.json @@ -175,8 +175,9 @@ "chtickynotes": { "branch": "master", "level": 0, - "revision": "94575a0db73e0ba1028882c625ebb363b0450f01", + "revision": "HEAD", "state": "notworking", + "maintained": "orphaned", "url": "https://github.com/YunoHost-Apps/chtickynotes_ynh" }, "coin": { From b75fb6818fac4de272338b816ad3bb7e9a6c4743 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 5 Aug 2019 20:36:09 +0200 Subject: [PATCH 2/9] revert HEAD --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index c00f7c11..0e2d6228 100644 --- a/community.json +++ b/community.json @@ -175,7 +175,7 @@ "chtickynotes": { "branch": "master", "level": 0, - "revision": "HEAD", + "revision": "94575a0db73e0ba1028882c625ebb363b0450f01", "state": "notworking", "maintained": "orphaned", "url": "https://github.com/YunoHost-Apps/chtickynotes_ynh" From ce664097f73bc497c07ad19f8637655584f7e8bb Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 6 Aug 2019 08:33:31 +0200 Subject: [PATCH 3/9] Adding bitwarden --- apps.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps.json b/apps.json index 1e5155c7..2b0c0a91 100644 --- a/apps.json +++ b/apps.json @@ -143,6 +143,13 @@ "revision": "49fb42612bb37f44960b93b872f3523fa615f203", "state": "notworking", "url": "https://github.com/YunoHost-Apps/bicbucstriim_ynh" + }, + "bitwarden": { + "branch": "master", + "maintained": true, + "revision": "HEAD", + "state": "working", + "url": "https://github.com/YunoHost-Apps/bitwarden_ynh" }, "blogotext": { "branch": "master", From ddacfb82af9075d1a7910fcfc53e00af71a29963 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 7 Aug 2019 08:13:12 +0200 Subject: [PATCH 4/9] Changing jitsi_ynh status --- apps.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps.json b/apps.json index 2b0c0a91..4aca60ed 100644 --- a/apps.json +++ b/apps.json @@ -856,8 +856,7 @@ }, "jitsi": { "branch": "master", - "maintained": false, - "revision": "b0c2dad3a00ac909e6e659550d0fae7be7dad28e", + "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/jitsi_ynh" }, From 4cebd9c51dde1677aba2cab00239b522b163a816 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 Aug 2019 19:05:47 +0000 Subject: [PATCH 5/9] Update app's level --- apps.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps.json b/apps.json index 4aca60ed..c52127bc 100644 --- a/apps.json +++ b/apps.json @@ -143,9 +143,10 @@ "revision": "49fb42612bb37f44960b93b872f3523fa615f203", "state": "notworking", "url": "https://github.com/YunoHost-Apps/bicbucstriim_ynh" - }, + }, "bitwarden": { "branch": "master", + "level": 7, "maintained": true, "revision": "HEAD", "state": "working", @@ -856,6 +857,7 @@ }, "jitsi": { "branch": "master", + "level": 7, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/jitsi_ynh" @@ -869,7 +871,7 @@ }, "jupyterlab": { "branch": "master", - "level": 7, + "level": 0, "revision": "HEAD", "state": "working", "url": "https://github.com/YunoHost-Apps/jupyterlab_ynh" @@ -1867,7 +1869,7 @@ }, "timeoff": { "branch": "master", - "level": 1, + "level": 2, "maintained": false, "revision": "25925abef093ac18f077326c3e7cb0dec9e0cb9b", "state": "working", From fd76ffc464dcc9bfc43f3f76c5481b3d359eaa26 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Tue, 13 Aug 2019 22:25:36 +0200 Subject: [PATCH 6/9] Add qr --- apps.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps.json b/apps.json index c52127bc..821cefc7 100644 --- a/apps.json +++ b/apps.json @@ -1524,6 +1524,13 @@ "state": "notworking", "url": "https://github.com/YunoHost-Apps/pydio_ynh" }, + "qr": { + "branch": "master", + "maintained": true, + "revision": "HEAD", + "state": "working", + "url": "https://code.antopie.org/miraty/qr_ynh" + }, "radicale": { "branch": "master", "level": 7, From ca3c2c1b41783f8c317a1c092011e38ee00d4e37 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Tue, 13 Aug 2019 23:39:43 +0200 Subject: [PATCH 7/9] Update framaforms --- apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index c52127bc..92843a58 100644 --- a/apps.json +++ b/apps.json @@ -543,9 +543,9 @@ }, "framaforms": { "branch": "master", - "level": 2, + "maintained": true, "revision": "HEAD", - "state": "inprogress", + "state": "working", "url": "https://github.com/YunoHost-Apps/framaforms_ynh" }, "framagames": { From 794d3c7a5edd32294ce9e3006ef831007f995be1 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 16 Aug 2019 00:54:18 +0000 Subject: [PATCH 8/9] Add support for code.antopie.org + display error message on the chat when building the list --- list_builder.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/list_builder.py b/list_builder.py index c0d13dfe..f8804488 100755 --- a/list_builder.py +++ b/list_builder.py @@ -6,6 +6,7 @@ import time import json import zlib import argparse +import subprocess import requests from dateutil.parser import parse @@ -26,6 +27,12 @@ def fail(msg, retcode=1): print("Error: {0:s}".format(msg)) sys.exit(retcode) +def error(msg): + msg = "[Applist builder error] " + msg + if os.path.exists("/usr/bin/sendxmpppy"): + subprocess.call(["sendxmpppy", msg], stdout=open(os.devnull, 'wb')) + print(msg) + def include_translations_in_manifest(app_name, manifest): for i in os.listdir("locales"): @@ -157,6 +164,8 @@ for app, info in apps_list.items(): forge_type = "gitlab" elif forge_site == "code.ffdn.org": forge_type = "gogs" + elif forge_site == "code.antopie.org": + forge_type = "gitea" else: forge_type = "unknown" @@ -237,6 +246,7 @@ for app, info in apps_list.items(): manifest = get_json(raw_url) if manifest is None: + error("Manifest is empty for app %s ?" % app) continue api_url = 'https://api.github.com/repos/%s/%s/commits/%s' % ( @@ -245,6 +255,7 @@ for app, info in apps_list.items(): info2 = get_json(api_url) if info2 is None: + error("Commit info is empty for app %s ?" % app) continue commit_date = parse(info2['commit']['author']['date']) @@ -256,24 +267,27 @@ for app, info in apps_list.items(): raw_url = '%s/raw/%s/manifest.json' % (app_url, app_rev) manifest = get_json(raw_url, verify=True) if manifest is None: + error("Manifest is empty for app %s ?" % app) continue api_url = 'https://%s/api/v4/projects/%s%%2F%s/repository/commits/%s' % (forge_site, owner, repo, app_rev) commit = get_json(api_url) if commit is None: + error("Commit info is empty for app %s ?" % app) continue commit_date = parse(commit["authored_date"]) timestamp = int(time.mktime(commit_date.timetuple())) # Gogs-type forge - elif forge_type == "gogs": + elif forge_type in ["gogs", "gitea"]: if not app_url.endswith('.git'): app_url += ".git" raw_url = '%s/raw/%s/manifest.json' % (app_url[:-4], app_rev) manifest = get_json(raw_url, verify=False) if manifest is None: + error("Manifest is empty for app %s ?" % app) continue obj_url = '%s/objects/%s/%s' % ( @@ -282,6 +296,7 @@ for app, info in apps_list.items(): commit = get_zlib(obj_url, verify=False) if commit is None or len(commit) < 2: + error("Commit info is empty for app %s ?" % app) continue else: commit = commit[1] @@ -289,14 +304,14 @@ for app, info in apps_list.items(): # Extract author line and commit date commit_author = re_commit_author.search(commit) if not commit_author: - print("-> Error: author line in commit not found") + error("Author line in commit not found for app %s" % app) continue # Construct UTC timestamp timestamp = int(commit_author.group('time')) tz = commit_author.group('tz') if len(tz) != 5: - print("-> Error: unexpected timezone length in commit") + error("Unexpected timezone length in commit for app %s" % app) continue elif tz != '+0000': tdelta = (int(tz[1:3]) * 3600) + (int(tz[3:5]) * 60) @@ -305,10 +320,10 @@ for app, info in apps_list.items(): elif tz[0] == '-': timestamp += tdelta else: - print("-> Error: unexpected timezone format in commit") + error("Unexpected timezone format in commit for app %s" % app) continue else: - print("-> Error: unsupported VCS and/or protocol") + error("Unsupported VCS and/or protocol for app %s" % app) continue if manifest["id"] != app or manifest["id"] != repo.replace("_ynh", ""): @@ -333,7 +348,7 @@ for app, info in apps_list.items(): 'featured': app_featured } except KeyError as e: - print("-> Error: invalid app info or manifest, %s" % e) + error("Invalid app info or manifest for app %s, %s" % (app, e)) continue # Write resulting file From 691a17a4ac86ee44ce3bd558b1b7ebe5dcc687e3 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 16 Aug 2019 21:18:31 +0200 Subject: [PATCH 9/9] Update app's level (#817) --- apps.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps.json b/apps.json index b380baab..acce4a14 100644 --- a/apps.json +++ b/apps.json @@ -543,6 +543,7 @@ }, "framaforms": { "branch": "master", + "level": 2, "maintained": true, "revision": "HEAD", "state": "working", @@ -1526,6 +1527,7 @@ }, "qr": { "branch": "master", + "level": 5, "maintained": true, "revision": "HEAD", "state": "working",