1
0
Fork 0
mirror of https://github.com/YunoHost/apps.git synced 2024-09-03 20:06:07 +02:00

Merge branch 'master' into unlisted-apps

This commit is contained in:
Kayou 2020-05-25 11:43:12 +02:00 committed by GitHub
commit 643ea41a18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 34 deletions

113
apps.json
View file

@ -2,18 +2,18 @@
"20euros": { "20euros": {
"branch": "master", "branch": "master",
"category": "games", "category": "games",
"level": 2, "level": 7,
"maintained": false, "maintained": true,
"revision": "c8d5fadc9f042a92f14b753eff3ffc948322cf2d", "revision": "HEAD",
"state": "working", "state": "working",
"url": "https://github.com/YunoHost-Apps/20euros_ynh" "url": "https://github.com/YunoHost-Apps/20euros_ynh"
}, },
"243": { "243": {
"branch": "master", "branch": "master",
"category": "games", "category": "games",
"level": 2, "level": 7,
"maintained": false, "maintained": true,
"revision": "b9d58efeac78feb7f74e723c999ff25ab7ab8b52", "revision": "HEAD",
"state": "working", "state": "working",
"url": "https://github.com/YunoHost-Apps/243_ynh" "url": "https://github.com/YunoHost-Apps/243_ynh"
}, },
@ -336,6 +336,7 @@
"codimd": { "codimd": {
"branch": "master", "branch": "master",
"category": "office", "category": "office",
"level": 2,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -451,9 +452,8 @@
"cubiks-2048": { "cubiks-2048": {
"branch": "master", "branch": "master",
"category": "games", "category": "games",
"level": 3, "maintained": true,
"maintained": false, "revision": "HEAD",
"revision": "1e0dce523039fcbd90e775a690018529b8190f18",
"state": "working", "state": "working",
"url": "https://github.com/YunoHost-Apps/Cubiks-2048_ynh" "url": "https://github.com/YunoHost-Apps/Cubiks-2048_ynh"
}, },
@ -482,7 +482,8 @@
"diaspora": { "diaspora": {
"branch": "master", "branch": "master",
"category": "social_media", "category": "social_media",
"revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd", "level": 3,
"revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
"microblogging" "microblogging"
@ -562,9 +563,9 @@
"branch": "master", "branch": "master",
"category": "system_tools", "category": "system_tools",
"maintained": false, "maintained": false,
"revision": "0c8d6674116b0da826375b5eaeab54ae1348a107", "revision": "HEAD",
"state": "notworking", "state": "notworking",
"url": "https://github.com/scith/dockerui_ynh" "url": "https://github.com/YunoHost-Apps/dockerui_ynh"
}, },
"dokuwiki": { "dokuwiki": {
"branch": "master", "branch": "master",
@ -831,6 +832,7 @@
"branch": "master", "branch": "master",
"category": "social_media", "category": "social_media",
"level": 7, "level": 7,
"maintained": false,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -861,6 +863,7 @@
"subtags": [ "subtags": [
"music" "music"
], ],
"maintained": false,
"url": "https://github.com/YunoHost-Apps/funkwhale_ynh" "url": "https://github.com/YunoHost-Apps/funkwhale_ynh"
}, },
"galette": { "galette": {
@ -868,6 +871,7 @@
"category": "productivity_and_management", "category": "productivity_and_management",
"revision": "9b09a7c5cca5683bcc8d89034c6a8ec024a2a441", "revision": "9b09a7c5cca5683bcc8d89034c6a8ec024a2a441",
"state": "notworking", "state": "notworking",
"maintained": false,
"subtags": [ "subtags": [
"business_and_ngos" "business_and_ngos"
], ],
@ -975,6 +979,17 @@
], ],
"url": "https://github.com/matlink/gitweb_ynh" "url": "https://github.com/matlink/gitweb_ynh"
}, },
"glitchsoc": {
"branch": "master",
"category": "social_media",
"revision": "HEAD",
"url": "https://github.com/Tagadda/glitch-soc_ynh",
"subtags": [
"microblogging"
],
"state": "inprogress"
},
"glowingbear": { "glowingbear": {
"branch": "master", "branch": "master",
"category": "communication", "category": "communication",
@ -1197,6 +1212,14 @@
"state": "notworking", "state": "notworking",
"url": "https://github.com/mitra42/internetarchive_ynh" "url": "https://github.com/mitra42/internetarchive_ynh"
}, },
"invoiceninja": {
"branch": "master",
"category": "productivity_and_management",
"level": 1,
"revision": "HEAD",
"state": "working",
"url": "https://github.com/YunoHost-Apps/invoiceninja_ynh"
},
"jappix": { "jappix": {
"branch": "master", "branch": "master",
"category": "communication", "category": "communication",
@ -1296,7 +1319,7 @@
"branch": "master", "branch": "master",
"category": "synchronization", "category": "synchronization",
"level": 7, "level": 7,
"maintained": true, "maintained": "request_adoption",
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -1343,6 +1366,7 @@
"subtags": [ "subtags": [
"accounting" "accounting"
], ],
"maintained": false,
"url": "https://github.com/YunoHost-Apps/kresus_ynh" "url": "https://github.com/YunoHost-Apps/kresus_ynh"
}, },
"laverna": { "laverna": {
@ -1433,13 +1457,13 @@
"lionwiki-t2t": { "lionwiki-t2t": {
"branch": "master", "branch": "master",
"category": "publishing", "category": "publishing",
"level": 0, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
"wiki" "wiki"
], ],
"url": "https://github.com/farvardin/lionwiki-t2t_ynh" "url": "https://github.com/YunoHost-Apps/lionwiki-t2t_ynh"
}, },
"lstu": { "lstu": {
"branch": "master", "branch": "master",
@ -1533,7 +1557,7 @@
"matomo": { "matomo": {
"branch": "master", "branch": "master",
"category": "publishing", "category": "publishing",
"level": 0, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -1544,7 +1568,7 @@
"mattermost": { "mattermost": {
"branch": "master", "branch": "master",
"category": "communication", "category": "communication",
"level": 4, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -1552,6 +1576,17 @@
], ],
"url": "https://github.com/YunoHost-Apps/mattermost_ynh" "url": "https://github.com/YunoHost-Apps/mattermost_ynh"
}, },
"mautrix_whatsapp": {
"branch": "master",
"category": "communication",
"level": 0,
"revision": "HEAD",
"state": "working",
"subtags": [
"chat"
],
"url": "https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh"
},
"mediadrop": { "mediadrop": {
"branch": "master", "branch": "master",
"category": "multimedia", "category": "multimedia",
@ -1596,6 +1631,16 @@
], ],
"url": "https://github.com/guigot/medusa_ynh" "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": { "menu": {
"branch": "master", "branch": "master",
"category": "wat", "category": "wat",
@ -1643,7 +1688,7 @@
"minidlna": { "minidlna": {
"branch": "master", "branch": "master",
"category": "multimedia", "category": "multimedia",
"level": 2, "level": 4,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -1687,7 +1732,7 @@
"monica": { "monica": {
"branch": "master", "branch": "master",
"category": "wat", "category": "wat",
"level": 2, "level": 0,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"url": "https://github.com/YunoHost-Apps/monica_ynh" "url": "https://github.com/YunoHost-Apps/monica_ynh"
@ -1784,6 +1829,7 @@
"subtags": [ "subtags": [
"meeting" "meeting"
], ],
"maintained": false,
"url": "https://github.com/YunoHost-Apps/mumbleserver_ynh" "url": "https://github.com/YunoHost-Apps/mumbleserver_ynh"
}, },
"munin": { "munin": {
@ -1799,7 +1845,7 @@
"my-mind": { "my-mind": {
"branch": "master", "branch": "master",
"category": "office", "category": "office",
"level": 1, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -1852,6 +1898,12 @@
], ],
"url": "https://github.com/YunoHost-Apps/netdata_ynh" "url": "https://github.com/YunoHost-Apps/netdata_ynh"
}, },
"neutrinet": {
"branch": "stable",
"revision": "HEAD",
"state": "working",
"url": "https://gitlab.domainepublic.net/Neutrinet/neutrinet_ynh"
},
"nextcloud": { "nextcloud": {
"branch": "master", "branch": "master",
"category": "synchronization", "category": "synchronization",
@ -1889,6 +1941,7 @@
"branch": "master", "branch": "master",
"category": "communication", "category": "communication",
"level": 2, "level": 2,
"maintained": false,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -2044,6 +2097,7 @@
"subtags": [ "subtags": [
"forge" "forge"
], ],
"maintained": false,
"url": "https://github.com/YunoHost-Apps/pagure_ynh" "url": "https://github.com/YunoHost-Apps/pagure_ynh"
}, },
"peertube": { "peertube": {
@ -2060,6 +2114,7 @@
"pelican": { "pelican": {
"branch": "master", "branch": "master",
"category": "publishing", "category": "publishing",
"maintained": false,
"revision": "a2f37b8e277ba173b53f73320514f1fc7f3aa3ac", "revision": "a2f37b8e277ba173b53f73320514f1fc7f3aa3ac",
"state": "inprogress", "state": "inprogress",
"subtags": [ "subtags": [
@ -2732,7 +2787,7 @@
"strut": { "strut": {
"branch": "master", "branch": "master",
"category": "office", "category": "office",
"level": 8, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -2748,6 +2803,7 @@
"subtags": [ "subtags": [
"poll" "poll"
], ],
"maintained": false,
"url": "https://github.com/YunoHost-Apps/studs_ynh" "url": "https://github.com/YunoHost-Apps/studs_ynh"
}, },
"subscribe": { "subscribe": {
@ -2794,7 +2850,7 @@
"synapse": { "synapse": {
"branch": "master", "branch": "master",
"category": "communication", "category": "communication",
"level": 2, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -3027,7 +3083,7 @@
"wallabag2": { "wallabag2": {
"branch": "master", "branch": "master",
"category": "reading", "category": "reading",
"level": 8, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"url": "https://github.com/YunoHost-Apps/wallabag2_ynh" "url": "https://github.com/YunoHost-Apps/wallabag2_ynh"
@ -3038,6 +3094,7 @@
"level": 7, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"maintained": false,
"url": "https://github.com/YunoHost-Apps/weblate_ynh" "url": "https://github.com/YunoHost-Apps/weblate_ynh"
}, },
"webmin": { "webmin": {
@ -3168,6 +3225,7 @@
"yeswiki": { "yeswiki": {
"branch": "master", "branch": "master",
"category": "publishing", "category": "publishing",
"level": 5,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [
@ -3217,8 +3275,11 @@
"yunomonitor": { "yunomonitor": {
"branch": "master", "branch": "master",
"category": "system_tools", "category": "system_tools",
"revision": "63a22e81e0f334e04a14355b135167fe87338fad", "revision": "HEAD",
"state": "notworking", "state": "working",
"subtags": [
"monitoring"
],
"url": "https://github.com/YunoHost-Apps/yunomonitor_ynh" "url": "https://github.com/YunoHost-Apps/yunomonitor_ynh"
}, },
"z-push": { "z-push": {
@ -3290,7 +3351,7 @@
"ztncui": { "ztncui": {
"branch": "master", "branch": "master",
"category": "system_tools", "category": "system_tools",
"level": 2, "level": 7,
"revision": "HEAD", "revision": "HEAD",
"state": "working", "state": "working",
"subtags": [ "subtags": [

View file

@ -63,12 +63,12 @@ def refresh_all_caches():
try: try:
init_cache(app, infos) init_cache(app, infos)
except Exception as e: except Exception as e:
error("Could not init cache for %s: %s" % (app, e)) error("Failed to init cache for %s" % app)
else: else:
try: try:
refresh_cache(app, infos) refresh_cache(app, infos)
except Exception as e: 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): def init_cache(app, infos):
@ -80,7 +80,12 @@ def init_cache(app, infos):
else: else:
depth = 40 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): def refresh_cache(app, infos):
@ -90,9 +95,19 @@ def refresh_cache(app, infos):
if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 3600: if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 3600:
return return
branch=infos.get("branch", "master")
try:
git("remote set-url origin " + infos["url"], in_folder=app_cache_folder(app)) 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("fetch --quiet origin %s --force" % branch, in_folder=app_cache_folder(app))
git("reset origin/master --hard", 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
if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 24*3600:
pass
else:
raise
################################ ################################
@ -152,8 +167,6 @@ def build_catalog():
def build_app_dict(app, infos): def build_app_dict(app, infos):
assert infos["branch"] == "master"
# Make sure we have some cache # Make sure we have some cache
this_app_cache = app_cache_folder(app) this_app_cache = app_cache_folder(app)
assert os.path.exists(this_app_cache), "No cache yet for %s" % app assert os.path.exists(this_app_cache), "No cache yet for %s" % app