From f1c1b02e8fad9f9cae03b05ae950b015453b8e60 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 20 Mar 2019 22:14:43 +0100 Subject: [PATCH 1/3] Small naming thing --- list_builder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/list_builder.py b/list_builder.py index 0790bfb..df71b05 100755 --- a/list_builder.py +++ b/list_builder.py @@ -312,10 +312,10 @@ for app, info in apps_list.items(): continue if manifest["id"] != app or manifest["id"] != repo.replace("_ynh", ""): - print("Warning: IDs different between community.json, manifest and repo name") - print(" Manifest id : %s" % manifest["id"]) - print(" Name in community json : %s" % app) - print(" Repo name : %s" % repo.replace("_ynh", "")) + print("Warning: IDs different between list.json, manifest and repo name") + print(" Manifest id : %s" % manifest["id"]) + print(" Name in json list : %s" % app) + print(" Repo name : %s" % repo.replace("_ynh", "")) try: result_dict[manifest['id']] = { From bd74d7ba9f68592308dd074008fd8841d6ab47c6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 21 Mar 2019 02:09:42 +0100 Subject: [PATCH 2/3] Split apps list into official and community for backward compatibility --- list_builder.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/list_builder.py b/list_builder.py index df71b05..29ec157 100755 --- a/list_builder.py +++ b/list_builder.py @@ -341,3 +341,19 @@ with open(args.output, 'w') as f: f.write(json.dumps(result_dict, sort_keys=True)) print("\nDone! Written in %s" % args.output) + +if args.input == "apps.json": + print("\nAlso splitting the file into official and community-build.json for backward compatibility") + + official_apps = set(["agendav", "ampache", "baikal", "dokuwiki", "etherpad_mypads", "hextris", "jirafeau", "kanboard", "my_webapp", "nextcloud", "opensondage", "phpmyadmin", "piwigo", "rainloop", "roundcube", "searx", "shellinabox", "strut", "synapse", "transmission", "ttrss", "wallabag2", "wordpress", "zerobin"]) + + official_apps_dict = {k: v for k, v in result_dict.items() if k in official_apps} + community_apps_dict = {k: v for k, v in result_dict.items() if k not in official_apps} + + with open("official-build.json", 'w') as f: + f.write(json.dumps(official_apps_dict, sort_keys=True)) + + with open("community-build.json", 'w') as f: + f.write(json.dumps(community_apps_dict, sort_keys=True)) + + print("\nDone!") From 78a5b7df48f5e2f96d0b5002cc3148580c916924 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Thu, 21 Mar 2019 08:03:35 +0100 Subject: [PATCH 3/3] Use apps instead of community --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7d8918c..5994923 100644 --- a/README.md +++ b/README.md @@ -11,21 +11,23 @@ https://yunohost.org/apps **Situation will change soon regarding lists. Consider this info as obsolete** - **official.json** contains the repository information of validated apps. - **community.json** contains all references to known "free-software" YunoHost packages. If you want to add your app to the list, please [send a Pull Request](#contributing) + - **apps.json** contains all references to known YunoHost packages. If you want to add your app to the list, please [send a Pull Request](#contributing). **This list replace both community.json and official.json.** ## Usage -The official package list is automatically fetched. If you want to **enable the community package list** on your YunoHost instance: +The official package list is automatically fetched. If you want to **enable the apps package list** on your YunoHost instance: ``` -sudo yunohost app fetchlist -n community -u https://yunohost.org/community.json +sudo yunohost app fetchlist -n apps -u https://yunohost.org/apps.json ``` ## Contributing -### How to add your app to the community list +### How to add your app to the apps list + **If** your app is under a free-software licence : -* Fork and edit the [community list](https://github.com/YunoHost/apps/tree/master/community.json) +* Fork and edit the [apps list](https://github.com/YunoHost/apps/tree/master/apps.json) * Add your app's ID and git information at the right alphabetical place * Indicate the app's functioning state: `notworking`, `inprogress`, or `working` * Do not add the level yourself. The CI will do it. @@ -57,7 +59,7 @@ your app from one of the 2 json files. Usage: ```bash -./add_or_update.py [community.json OR official.json] [github/gitlab url OR app name [github/gitlab url OR app name [github/gitlab url OR app name ...]]] +./add_or_update.py apps.json [github/gitlab url OR app name [github/gitlab url OR app name [github/gitlab url OR app name ...]]] ``` ### How to make my app a High Quality app ?