Merge branch 'add-schema-link-toml' of https://github.com/YunoHost/apps into add-schema-link-toml

create & add a schema to graveyard.tom

tag kavita with "paid-content"

aaaaa the autoformater

tag kavita with "paid-content"

aaaaa the autoformater

add the schema link in toml files

create & add a schema to antifeatures.toml

add 'draft' property to the wishlist schema

README.md

@@ -1,6 +1,6 @@
 # YunoHost application catalog
 
-<img alt="YunoHost logo" src="https://avatars.githubusercontent.com/u/1519495?s=200&v=4" width=80><img alt="Package logo" src="https://yunohost.org/user/images/yunohost_package.png" width=80>
+<img src="https://avatars.githubusercontent.com/u/1519495?s=200&v=4" width=80><img src="https://yunohost.org/user/images/yunohost_package.png" width=80>
 
 This repository contains the default YunoHost app catalog, as well as related
 tools that can be run manually or automatically.
@@ -16,7 +16,7 @@ them such as their category or maintenance state. This file is regularly read by
 
 - You can browse [the contributor documentation](https://yunohost.org/contributordoc)
 - If you are not familiar with Git/GitHub, you can have a look at our [homemade guide](https://yunohost.org/packaging_apps_git)
-- Don't hesitate to reach for help on the dedicated [application packaging chatroom](https://yunohost.org/chat_rooms)... we can even schedule an audio meeting to help you get started!
+- Don't hesitate to reach for help on the dedicated [application packaging chatroom](https://yunohost.org/chat_rooms) ... we can even schedule an audio meeting to help you get started!
 
 ## How to add your app to the application catalog
 
@@ -46,9 +46,9 @@ App example addition:
 
 ```toml
 [your_app]
-antifeatures = [ "deprecated-software" ]   # Replace with the appropriate category id found in antifeatures.toml, remove if no relevant antifeature applies
+antifeatures = [ "deprecated-software" ]   # Remove if no relevant antifeature applies
 potential_alternative_to = [ "YouTube" ]   # Indicate if your app can be thought of as an alternative to popular proprietary services (or remove if none applies)
-category = "foobar"                        # Replace with the appropriate category id found in categories.toml, don't invent a category
+category = "foobar"                        # Replace with the appropriate category id found in categories.toml
 state = "working"
 url = "https://github.com/YunoHost-Apps/your_app_ynh"
 ```

antifeatures.toml

@@ -1,3 +1,5 @@
+#:schema https://github.com/YunoHost/apps/blob/master/schemas/antifeatures.toml.schema.json
+
 [tracking]
 icon = "user-secret"
 title.en = "Tracking"

apps.toml

@@ -1,3 +1,5 @@
+#:schema https://github.com/YunoHost/apps/raw/master/schemas/apps.toml.schema.json
+
 [13ft]
 category = "reading"
 level = 7
@@ -37,7 +39,6 @@ level = 6
 state = "working"
 subtags = [ "microblogging", "pictures" ]
 url = "https://github.com/YunoHost-Apps/acropolis_ynh"
-antifeatures = ["deprecated-software"]
 
 [actual]
 category = "productivity_and_management"
@@ -60,7 +61,6 @@ level = 8
 state = "working"
 subtags = [ "db" ]
 url = "https://github.com/YunoHost-Apps/adminer_ynh"
-antifeatures = ["deprecated-software"]
 
 [aeneria]
 category = "iot"
@@ -75,7 +75,6 @@ potential_alternative_to = [ "Google Agenda", "Microsoft Outlook" ]
 state = "working"
 subtags = [ "calendar" ]
 url = "https://github.com/YunoHost-Apps/agendav_ynh"
-antifeatures = ["deprecated-software"]
 
 [agora]
 category = "wat"
@@ -188,7 +187,6 @@ category = "iot"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/beehive_ynh"
-antifeatures = ["deprecated-software"]
 
 [biboumi]
 category = "communication"
@@ -203,7 +201,6 @@ level = 7
 state = "working"
 subtags = [ "books" ]
 url = "https://github.com/YunoHost-Apps/bicbucstriim_ynh"
-antifeatures = ["deprecated-software"]
 
 [blogotext]
 category = "publishing"
@@ -212,7 +209,6 @@ potential_alternative_to = [ "Blogger", "Coldfusion", "Wix" ]
 state = "working"
 subtags = [ "blog" ]
 url = "https://github.com/YunoHost-Apps/blogotext_ynh"
-antifeatures = ["deprecated-software"]
 
 [bludit]
 category = "publishing"
@@ -337,7 +333,6 @@ category = "small_utilities"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/cheky_ynh"
-antifeatures = ["deprecated-software"]
 
 [chitchatter]
 category = "communication"
@@ -441,7 +436,6 @@ potential_alternative_to = [ "Disqus" ]
 state = "working"
 subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/commento_ynh"
-antifeatures = ["deprecated-software"]
 
 [compteur_du_gase]
 category = "office"
@@ -495,7 +489,7 @@ subtags = [ "db" ]
 url = "https://github.com/YunoHost-Apps/couchdb_ynh"
 
 [couchpotato]
-antifeatures = [ "package-not-maintained", "deprecated-software" ]
+antifeatures = [ "package-not-maintained" ]
 category = "multimedia"
 level = 0
 potential_alternative_to = [ "Netflix" ]
@@ -665,7 +659,6 @@ level = 6
 state = "working"
 subtags = [ "pastebin" ]
 url = "https://github.com/YunoHost-Apps/distbin_ynh"
-antifeatures = ["deprecated-software"]
 
 [django-fmd]
 category = "iot"
@@ -845,7 +838,6 @@ category = "small_utilities"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/encryptor-decryptor_ynh"
-antifeatures = ["deprecated-software"]
 
 [endi]
 category = "productivity_and_management"
@@ -875,7 +867,6 @@ potential_alternative_to = [ "Google Sheets", "G Suite", "Microsoft Excel", "Off
 state = "working"
 subtags = [ "spreadsheet" ]
 url = "https://github.com/YunoHost-Apps/ethercalc_ynh"
-antifeatures = ["deprecated-software"]
 
 [etherpad]
 category = "office"
@@ -913,7 +904,6 @@ level = 8
 state = "working"
 subtags = [ "monitoring" ]
 url = "https://github.com/YunoHost-Apps/facette_ynh"
-antifeatures = ["deprecated-software"]
 
 [facilmap]
 category = "productivity_and_management"
@@ -955,7 +945,6 @@ potential_alternative_to = [ "WeTransfer" ]
 state = "working"
 subtags = [ "files" ]
 url = "https://github.com/YunoHost-Apps/filepizza_ynh"
-antifeatures = ["deprecated-software"]
 
 [firefish]
 category = "social_media"
@@ -1015,7 +1004,6 @@ potential_alternative_to = [ "Invision Community", "Vanilla", "vBulletin", "XenF
 state = "working"
 subtags = [ "forum" ]
 url = "https://github.com/YunoHost-Apps/fluxbb_ynh"
-antifeatures = ["deprecated-software"]
 
 [focalboard]
 category = "productivity_and_management"
@@ -1137,7 +1125,6 @@ level = 8
 state = "working"
 subtags = [ "website", "blog" ]
 url = "https://github.com/YunoHost-Apps/getsimple_ynh"
-antifeatures = ["deprecated-software"]
 
 [ghost]
 antifeatures = [ "arbitrary-limitations" ]
@@ -1369,7 +1356,6 @@ category = "system_tools"
 level = 7
 state = "working"
 url = "https://github.com/Yunohost-Apps/httpsh_ynh"
-antifeatures = ["deprecated-software"]
 
 [hubzilla]
 category = "social_media"
@@ -1458,6 +1444,7 @@ subtags = [ "videos" ]
 url = "https://github.com/YunoHost-Apps/invidious_ynh"
 
 [invoiceninja]
+antifeatures = [ "deprecated-software" ]
 category = "productivity_and_management"
 level = 7
 state = "working"
@@ -1490,7 +1477,7 @@ state = "working"
 url = "https://github.com/YunoHost-Apps/jackett_ynh"
 
 [jappix]
-antifeatures = [ "package-not-maintained", "deprecated-software" ]
+antifeatures = [ "package-not-maintained" ]
 category = "communication"
 level = 7
 state = "working"
@@ -1661,7 +1648,7 @@ subtags = [ "text" ]
 url = "https://github.com/YunoHost-Apps/languagetool_ynh"
 
 [laverna]
-antifeatures = [ "package-not-maintained", "deprecated-software" ]
+antifeatures = [ "package-not-maintained" ]
 category = "office"
 level = 7
 state = "working"
@@ -1742,7 +1729,6 @@ level = 7
 state = "working"
 subtags = [ "wiki" ]
 url = "https://github.com/YunoHost-Apps/libreto_ynh"
-antifeatures = ["deprecated-software"]
 
 [libretranslate]
 category = "small_utilities"
@@ -1790,7 +1776,6 @@ level = 6
 state = "working"
 subtags = [ "monitoring" ]
 url = "https://github.com/YunoHost-Apps/linuxdash_ynh"
-antifeatures = ["deprecated-software"]
 
 [lionwiki-t2t]
 category = "publishing"
@@ -1829,7 +1814,6 @@ potential_alternative_to = [ "Google Docs", "Microsoft Excel" ]
 state = "working"
 subtags = [ "spreadsheet" ]
 url = "https://github.com/YunoHost-Apps/luckysheet_ynh"
-antifeatures = ["deprecated-software"]
 
 [lufi]
 category = "synchronization"
@@ -2004,7 +1988,6 @@ level = 8
 state = "working"
 subtags = [ "chat" ]
 url = "https://github.com/YunoHost-Apps/minchat_ynh"
-antifeatures = ["deprecated-software"]
 
 [mindmaps]
 category = "office"
@@ -2012,7 +1995,6 @@ level = 8
 state = "working"
 subtags = [ "mindmap" ]
 url = "https://github.com/YunoHost-Apps/mindmaps_ynh"
-antifeatures = ["deprecated-software"]
 
 [minetest]
 category = "games"
@@ -2026,7 +2008,6 @@ category = "publishing"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/mineweb_ynh"
-antifeatures = ["deprecated-software"]
 
 [minidlna]
 category = "multimedia"
@@ -2139,7 +2120,6 @@ level = 8
 state = "working"
 subtags = [ "meeting" ]
 url = "https://github.com/YunoHost-Apps/mumble-web_ynh"
-antifeatures = ["deprecated-software"]
 
 [mumbleserver]
 category = "communication"
@@ -2375,7 +2355,6 @@ category = "wat"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/osjs_ynh"
-antifeatures = ["deprecated-software"]
 
 [osticket]
 category = "productivity_and_management"
@@ -2613,7 +2592,6 @@ level = 8
 state = "working"
 subtags = [ "website", "blog" ]
 url = "https://github.com/YunoHost-Apps/pico_ynh"
-antifeatures = ["deprecated-software"]
 
 [pihole]
 category = "system_tools"
@@ -2713,7 +2691,6 @@ potential_alternative_to = [ "Wix" ]
 state = "working"
 subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/prettynoemiecms_ynh"
-antifeatures = ["deprecated-software"]
 
 [privatebin]
 category = "small_utilities"
@@ -2995,7 +2972,6 @@ category = "small_utilities"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/scrumblr_ynh"
-antifeatures = ["deprecated-software"]
 
 [scrutiny]
 category = "system_tools"
@@ -3061,7 +3037,6 @@ category = "system_tools"
 level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/shellinabox_ynh"
-antifeatures = ["deprecated-software"]
 
 [shiori]
 category = "small_utilities"
@@ -3084,7 +3059,6 @@ potential_alternative_to = [ "bitly" ]
 state = "working"
 subtags = [ "url_shortener" ]
 url = "https://github.com/YunoHost-Apps/shuri_ynh"
-antifeatures = ["deprecated-software"]
 
 [signaturepdf]
 category = "small_utilities"
@@ -3097,14 +3071,12 @@ category = "small_utilities"
 level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/simple-file-manager_ynh"
-antifeatures = ["deprecated-software"]
 
 [simple-hash-generator]
 category = "small_utilities"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/simple-hash-generator_ynh"
-antifeatures = ["deprecated-software"]
 
 [simple-torrent]
 antifeatures = [ "deprecated-software" ]
@@ -3122,7 +3094,7 @@ subtags = [ "chat" ]
 url = "https://github.com/YunoHost-Apps/simplex_ynh"
 
 [simplytranslate]
-antifeatures = [ "non-free-network", "deprecated-software" ]
+antifeatures = [ "non-free-network" ]
 category = "small_utilities"
 level = 7
 state = "working"
@@ -3134,7 +3106,6 @@ level = 8
 state = "working"
 subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/sitemagiccms_ynh"
-antifeatures = ["deprecated-software"]
 
 [slingcode]
 category = "dev"
@@ -3142,7 +3113,6 @@ level = 8
 state = "working"
 subtags = [ "programming" ]
 url = "https://github.com/YunoHost-Apps/slingcode_ynh"
-antifeatures = ["deprecated-software"]
 
 [snappymail]
 category = "communication"
@@ -3231,7 +3201,6 @@ category = "system_tools"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/ssh_chroot_dir_ynh"
-antifeatures = ["deprecated-software"]
 
 [statpingng]
 category = "system_tools"
@@ -3261,7 +3230,6 @@ potential_alternative_to = [ "Google Slides", "Office 365", "Prezi", "SoZi" ]
 state = "working"
 subtags = [ "impress" ]
 url = "https://github.com/YunoHost-Apps/strut_ynh"
-antifeatures = ["deprecated-software"]
 
 [superset]
 category = "wat"
@@ -3318,7 +3286,7 @@ state = "working"
 url = "https://github.com/YunoHost-Apps/tandoor_ynh"
 
 [taskboard]
-antifeatures = [ "package-not-maintained", "deprecated-software" ]
+antifeatures = [ "package-not-maintained" ]
 category = "productivity_and_management"
 level = 7
 potential_alternative_to = [ "Trello" ]
@@ -3504,7 +3472,6 @@ level = 8
 state = "working"
 subtags = [ "task" ]
 url = "https://github.com/YunoHost-Apps/tyto_ynh"
-antifeatures = ["deprecated-software"]
 
 [ulogger]
 category = "small_utilities"
@@ -3622,7 +3589,6 @@ category = "wat"
 level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/wemawema_ynh"
-antifeatures = ["deprecated-software"]
 
 [wetty]
 category = "system_tools"
@@ -3791,7 +3757,6 @@ level = 6
 potential_alternative_to = [ "Mullvad" ]
 state = "working"
 url = "https://github.com/YunoHost-Apps/zeronet_ynh"
-antifeatures = ["deprecated-software"]
 
 [zerotier]
 antifeatures = [ "not-totally-free-upstream", "non-free-network" ]

categories.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/categories.toml.schema.json
+
 [synchronization]
 icon = "cloud"
 title.en = "Synchronization"

graveyard.toml

@@ -1,3 +1,5 @@
+#:schema https://github.com/YunoHost/apps/raw/master/schemas/graveyard.toml.schema.json
+
 [anfora]
 category = "social_media"
 subtags = [ "pictures" ]

schemas/antifeatures.toml.schema.json

@@ -0,0 +1,63 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "$id": "https://github.com/YunoHost/apps/blob/master/schemas/antifeatures.toml.schema.json",
+    "title": "Yunohost's antifeatures.toml schema",
+    "version": "0",
+    "$defs": {
+        "translated_string": {
+            "type": "object",
+            "required": [
+                "en"
+            ],
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-z]{2}$": {
+                    "type": "string"
+                }
+            }
+        }
+    },
+    "type": "object",
+    "required": [],
+    "additionalProperties": false,
+    "patternProperties": {
+        "^[a-z0-9_-]*$": {
+            "type": "object",
+            "required": [
+                "icon",
+                "title",
+                "description"
+            ],
+            "additionalProperties": false,
+            "properties": {
+                "icon": {
+                    "type": "string"
+                },
+                "title": {
+                    "$ref": "#/$defs/translated_string"
+                },
+                "description": {
+                    "$ref": "#/$defs/translated_string"
+                },
+                "subtags": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-z_]*$": {
+                            "type": "object",
+                            "required": [
+                                "title"
+                            ],
+                            "additionalProperties": false,
+                            "properties": {
+                                "title": {
+                                    "$ref": "#/$defs/translated_string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

schemas/graveyard.toml.schema.json

@@ -0,0 +1,48 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "$id": "https://github.com/YunoHost/apps/blob/master/schemas/graveyard.toml.schema.json",
+    "title": "Yunohost's graveyard.toml schema",
+    "version": "0",
+    "type": "object",
+    "required": [],
+    "additionalProperties": false,
+    "patternProperties": {
+        "^[a-z0-9_-]*$": {
+            "type": "object",
+            "required": [
+                "url"
+            ],
+            "additionalProperties": false,
+            "properties": {
+                "category": {
+                    "type": "string"
+                },
+                "subtags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "additionalItems": false
+                },
+                "url": {
+                    "type": "string",
+                    "format": "url"
+                },
+                "antifeatures": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "additionalItems": false
+                },
+                "potential_alternative_to": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "additionalItems": false
+                }
+            }
+        }
+    }
+}

schemas/wishlist.toml.schema.json

@@ -3,14 +3,16 @@
     "$id": "https://github.com/YunoHost/apps/blob/master/schemas/wishlist.toml.schema.json",
     "title": "Yunohost's wishlist.toml schema",
     "version": "0",
-
     "type": "object",
     "required": [],
     "additionalProperties": false,
     "patternProperties": {
         "^[a-z0-9_-]*$": {
             "type": "object",
-            "required": ["name", "upstream"],
+            "required": [
+                "name",
+                "upstream"
+            ],
             "additionalProperties": false,
             "properties": {
                 "name": {
@@ -26,9 +28,12 @@
                 "website": {
                     "type": "string",
                     "format": "url"
+                },
+                "draft": {
+                    "type": "string",
+                    "format": "url"
                 }
             }
         }
     }
-
 }

tools/readme_generator/make_readme.py

@@ -6,7 +6,7 @@ import os
 from pathlib import Path
 from copy import deepcopy
 
-from typing import Dict, Optional, List, Tuple
+from typing import Dict, Optional, List
 
 import toml
 from jinja2 import Environment, FileSystemLoader
@@ -51,22 +51,7 @@ def generate_READMEs(app_path: Path):
 
     env = Environment(loader=FileSystemLoader(Path(__file__).parent / "templates"))
 
-    # parse available README template and generate a list in the form of:
+    for lang, lang_suffix in [("en", ""), ("fr", "_fr")]:
-    # > [("en", ""), ("fr", "_fr"), ...]
-    available_langs: List[Tuple[str, str]] = [("en", "")]
-    for README_template in (Path(__file__).parent / "templates").iterdir():
-        # we only want README_{lang}.md.j2 files
-        if README_template.name == "README.md.j2":
-            continue
-
-        if not README_template.name.endswith(".j2") or not README_template.name.startswith("README_"):
-            continue
-
-        language_code = README_template.name.split("_")[1].split(".")[0]
-
-        available_langs.append((language_code, "_" + language_code))
-
-    for lang, lang_suffix in available_langs:
         template = env.get_template(f"README{lang_suffix}.md.j2")
 
         if (app_path / "doc" / f"DESCRIPTION{lang_suffix}.md").exists():

wishlist.toml

@@ -1,3 +1,5 @@
+#:schema https://github.com/YunoHost/apps/raw/master/schemas/wishlist.toml.schema.json
+
 [access-to-memory-atom]
 name = "Access to Memory (AtoM)"
 description = "Standards-based archival description and access in a multilingual, multi-repository environment."
@@ -1711,12 +1713,6 @@ upstream = ""
 website = "https://umap.openstreetmap.fr/"
 draft = "https://github.com/YunoHost-Apps/umap_ynh"
 
-[univer]
-name = "Univer"
-description = "Replacement of Luckysheet (deprecated, in yunohost packages)"
-upstream = "https://github.com/dream-num/univer"
-website = "https://univer.ai/"
-
 [upmpdcli]
 name = "upmpdcli"
 description = ""