Commit 44b92f12 authored by Sunil Mohan Adapa's avatar Sunil Mohan Adapa Committed by James Valleroy

clients: Update all manifest due to use updated framework

- Validate all the client data using the validation function.

- No need for enums anymore. Easier to read.

- Use the combined store URL method.
Signed-off-by: Sunil Mohan Adapa's avatarSunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy's avatarJames Valleroy <jvalleroy@mailbox.org>
parent acd248e5
......@@ -17,19 +17,19 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import Package
from plinth.clients import validate
clients = [{
clients = validate([{
'name':
_('Deluge'),
'description':
_('Bittorrent client written in Python/PyGTK '),
_('Bittorrent client written in Python/PyGTK'),
'platforms': [{
'type': 'web',
'url': '/deluge'
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'deluge',
}]
}]
}])
......@@ -17,13 +17,11 @@
from django.utils.translation import ugettext_lazy as _
from plinth.clients import store_url, validate
from plinth.modules import diaspora
from plinth.templatetags.plinth_extras import Mobile_OS, Store
from plinth.utils import f_droid_url, format_lazy
from plinth.utils import format_lazy
dandelion_package_id = 'com.github.dfa.diaspora_android'
clients = [{
clients = validate([{
'name':
_('dandelion*'),
'description':
......@@ -31,9 +29,9 @@ clients = [{
'community-run, distributed social network diaspora*'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.F_DROID.value,
'url': f_droid_url(dandelion_package_id),
'os': 'android',
'store_name': 'f-droid',
'url': store_url('f-droid', 'com.github.dfa.diaspora_android'),
}]
}, {
'name':
......@@ -46,4 +44,4 @@ clients = [{
host=diaspora.get_configured_domain_name() if
diaspora.is_setup() else "<please-setup-domain-name>")
}]
}]
}])
......@@ -18,22 +18,16 @@
from django.utils.translation import ugettext_lazy as _
from plinth.modules.jsxc import manifest as jsxc_manifest
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.utils import play_store_url
from plinth.clients import store_url, validate
yaxim_package_id = 'org.yaxim.androidclient'
bruno_package_id = 'org.yaxim.bruno'
conversations_package_id = 'eu.siacs.conversations'
_clients = [{
_clients = validate([{
'name':
_('yaxim'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(yaxim_package_id),
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'org.yaxim.androidclient'),
}]
}, {
'name':
......@@ -43,9 +37,9 @@ _clients = [{
'yaxim app.'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(bruno_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'org.yaxim.bruno')
}]
}, {
'name':
......@@ -60,8 +54,8 @@ _clients = [{
'extra security.'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.IOS.value,
'store_name': Store.APP_STORE.value,
'os': 'ios',
'store_name': 'app-store',
'url': 'https://itunes.apple.com/us/app/chatsecure'
'/id464200063 '
}]
......@@ -70,16 +64,16 @@ _clients = [{
_('Conversations'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(conversations_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'eu.siacs.conversations')
}]
}, {
'name':
_('Dino'),
'platforms': [{
'type': 'download',
'os': Desktop_OS.GNU_LINUX,
'os': 'gnu-linux',
'url': 'https://github.com/dino/dino/wiki/Distribution-Packages',
}]
}, {
......@@ -87,14 +81,14 @@ _clients = [{
_('Gajim'),
'platforms': [{
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'gajim'
}, {
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'os': 'windows',
'url': 'https://gajim.org/downloads.php'
}]
}]
}])
_clients.extend(jsxc_manifest.clients)
......
......@@ -17,10 +17,12 @@
from django.utils.translation import ugettext_lazy as _
clients = [{
from plinth.clients import validate
clients = validate([{
'name': _('ikiwiki'),
'platforms': [{
'type': 'web',
'url': '/ikiwiki'
}]
}]
}])
......@@ -18,26 +18,26 @@
from django.utils.translation import ugettext_lazy as _
from plinth import cfg
from plinth.templatetags.plinth_extras import Desktop_OS, Package
from plinth.clients import validate
from plinth.utils import format_lazy
clients = [{
clients = validate([{
'name':
_('Gobby'),
'description':
_('Gobby is a collaborative text editor'),
'usage':
format_lazy(
_('start Gobby and select "Connect to Server" and '
_('Start Gobby and select "Connect to Server" and '
'enter your {box_name}\'s domain name.'),
box_name=_(cfg.box_name)),
'platforms': [{
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'os': 'windows',
'url': 'https://github.com/gobby/gobby/wiki/Download'
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'gobby'
}]
}]
}])
......@@ -17,17 +17,13 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import Package
from plinth.clients import validate
clients = [{
clients = validate([{
'name':
_('JSXC'),
'platforms': [{
'type': 'package',
'format': Package.DEB.value,
'name': 'libjs-jsxc'
}, {
'type': 'web',
'url': '/jsxc'
}]
}]
}])
......@@ -17,46 +17,38 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import Desktop_OS, Mobile_OS, Store
from plinth.utils import f_droid_url, play_store_url
from plinth.clients import store_url, validate
android_package_id = 'im.vector.alpha'
riot_desktop_download_url = 'https://riot.im/desktop.html'
_android_package_id = 'im.vector.alpha'
_riot_desktop_download_url = 'https://riot.im/desktop.html'
clients = [{
clients = validate([{
'name':
_('Riot'),
'platforms': [
{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(android_package_id)
},
{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.F_DROID.value,
'url': f_droid_url(android_package_id)
},
{
'type': 'web',
'url': 'https://riot.im/app/#/home'
},
{
'type': 'download',
'os': Desktop_OS.GNU_LINUX.value,
'url': riot_desktop_download_url,
},
{
'type': 'download',
'os': Desktop_OS.MAC_OS.value,
'url': riot_desktop_download_url,
},
{
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'url': riot_desktop_download_url,
},
]
}]
'platforms': [{
'type': 'store',
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', _android_package_id)
}, {
'type': 'store',
'os': 'android',
'store_name': 'f-droid',
'url': store_url('f-droid', _android_package_id)
}, {
'type': 'web',
'url': 'https://riot.im/app/#/home'
}, {
'type': 'download',
'os': 'gnu-linux',
'url': _riot_desktop_download_url,
}, {
'type': 'download',
'os': 'macos',
'url': _riot_desktop_download_url,
}, {
'type': 'download',
'os': 'windows',
'url': _riot_desktop_download_url,
}]
}])
......@@ -17,31 +17,28 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.clients import store_url, validate
clients = [{
clients = validate([{
'name':
_('Minetest'),
'platforms': [{
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'os': 'windows',
'url': 'https://github.com/minetest/minetest/releases'
'/download/0.4.16/minetest-0.4.16-win64.zip '
}, {
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': 'https://play.google.com/store/apps/details?id=net'
'.minetest.minetest '
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'net.minetest.minetest')
}, {
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.F_DROID.value,
'url': 'https://f-droid.org/packages/net.minetest.minetest/ '
'os': 'android',
'store_name': 'f-droid',
'url': store_url('f-droid', 'net.minetest.minetest')
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'minetest'
}]
}]
}])
......@@ -17,31 +17,29 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.utils import f_droid_url, play_store_url
from plinth.clients import store_url, validate
plumble_package_id = 'com.morlunk.mumbleclient.free'
_plumble_package_id = 'com.morlunk.mumbleclient.free'
clients = [{
clients = validate([{
'name':
_('Mumble'),
'platforms': [{
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'os': 'windows',
'url': 'https://wiki.mumble.info/wiki/Main_Page'
}, {
'type': 'download',
'os': Desktop_OS.MAC_OS.value,
'os': 'macos',
'url': 'https://wiki.mumble.info/wiki/Main_Page'
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'mumble'
}, {
'type': 'store',
'os': Mobile_OS.IOS.value,
'store_name': Store.APP_STORE.value,
'os': 'ios',
'store_name': 'app-store',
'url': 'https://itunes.apple.com/us/app/mumble/id443472808'
}]
}, {
......@@ -49,22 +47,22 @@ clients = [{
_('Plumble'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(plumble_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', _plumble_package_id)
}, {
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.F_DROID.value,
'url': f_droid_url(plumble_package_id)
'os': 'android',
'store_name': 'f-droid',
'url': store_url('f-droid', _plumble_package_id)
}]
}, {
'name':
_('Mumblefly'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.IOS.value,
'store_name': Store.APP_STORE.value,
'os': 'ios',
'store_name': 'app-store',
'url': 'https://itunes.apple.com/dk/app/mumblefy/id858752232'
}]
}]
}])
......@@ -17,32 +17,27 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.utils import play_store_url
from plinth.clients import store_url, validate
quasseldroid_package_id = 'com.iskrembilen.quasseldroid',
quassel_download_url = 'http://quassel-irc.org/downloads'
clients = [{
clients = validate([{
'name':
_('Quassel'),
'platforms': [{
'type': 'download',
'os': Desktop_OS.MAC_OS.value,
'url': quassel_download_url,
'os': 'macos',
'url': 'http://quassel-irc.org/downloads'
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'quassel-client',
}]
}, {
'name':
_('Quassseldroid'),
_('Quasseldroid'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(quasseldroid_package_id),
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'com.iskrembilen.quasseldroid'),
}]
}]
}])
......@@ -17,12 +17,9 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import Mobile_OS, Package, Store
from plinth.utils import play_store_url
from plinth.clients import store_url, validate
davdroid_package_id = 'at.bitfire.davdroid'
clients = [{
clients = validate([{
'name':
_('DAVDroid'),
'usage':
......@@ -32,16 +29,16 @@ clients = [{
'create new.'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(davdroid_package_id),
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', 'at.bitfire.davdroid'),
}]
}, {
'name':
_('GNOME Calendar'),
'platforms': [{
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'gnome-calendar'
}]
}, {
......@@ -59,7 +56,7 @@ clients = [{
'calendars and address books.'),
'platforms': [{
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'evolution'
}]
}]
}])
......@@ -17,16 +17,14 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.utils import play_store_url
from plinth.clients import store_url, validate
jitsi_package_id = 'org.jitsi.meet'
csipsimple_package_id = 'com.csipsimple'
_jitsi_package_id = 'org.jitsi.meet'
_csipsimple_package_id = 'com.csipsimple'
jitsi_download_url = 'https://download.jitsi.org/jitsi/'
_jitsi_download_url = 'https://download.jitsi.org/jitsi/'
clients = [{
clients = validate([{
'name':
_('Jitsi Meet'),
'description':
......@@ -40,38 +38,38 @@ clients = [{
'and simulcasting.'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(jitsi_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', _jitsi_package_id)
}, {
'type': 'store',
'os': Mobile_OS.IOS.value,
'store_name': Store.APP_STORE.value,
'os': 'ios',
'store_name': 'app-store',
'url': 'https://itunes.apple.com/in/app/jitsi-meet/id1165103905'
}, {
'type': 'download',
'os': Desktop_OS.GNU_LINUX.value,
'url': jitsi_download_url
'os': 'gnu-linux',
'url': _jitsi_download_url
}, {
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'jitsi'
}, {
'type': 'download',
'os': Desktop_OS.MAC_OS.value,
'url': jitsi_download_url
'os': 'macos',
'url': _jitsi_download_url
}, {
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'url': jitsi_download_url
'os': 'windows',
'url': _jitsi_download_url
}]
}, {
'name':
_('CSipSimple'),
'platforms': [{
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(csipsimple_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', _csipsimple_package_id)
}]
}]
}])
......@@ -17,10 +17,12 @@
from django.utils.translation import ugettext_lazy as _
clients = [{
from plinth.clients import validate
clients = validate([{
'name': _('reStore'),
'platforms': [{
'type': 'web',
'url': '/restore'
}]
}]
}])
......@@ -17,10 +17,12 @@
from django.utils.translation import ugettext_lazy as _
clients = [{
from plinth.clients import validate
clients = validate([{
'name': _('Roundcube'),
'platforms': [{
'type': 'web',
'url': '/roundcube'
}]
}]
}])
......@@ -17,10 +17,12 @@
from django.utils.translation import ugettext_lazy as _
clients = [{
from plinth.clients import validate
clients = validate([{
'name': _('Shaarli'),
'platforms': [{
'type': 'web',
'url': '/shaarli'
}]
}]
}])
......@@ -17,48 +17,46 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import (Desktop_OS, Mobile_OS, Package,
Store)
from plinth.utils import f_droid_url, play_store_url
from plinth.clients import store_url, validate
syncthing_package_id = 'com.nutomic.syncthingandroid'
syncthing_download_url = 'https://syncthing.net/'
_package_id = 'com.nutomic.syncthingandroid'
_download_url = 'https://syncthing.net/'
clients = [{
clients = validate([{
'name':
_('Syncthing'),
'platforms': [{
'type': 'package',
'format': Package.DEB.value,
'format': 'deb',
'name': 'syncthing',
}, {
'type': 'package',
'format': Package.HOMEBREW.value,
'format': 'brew',
'name': 'syncthing',
}, {
'type': 'download',
'os': Desktop_OS.GNU_LINUX.value,
'url': syncthing_download_url,
'os': 'gnu-linux',
'url': _download_url,
}, {
'type': 'download',
'os': Desktop_OS.MAC_OS.value,
'url': syncthing_download_url,
'os': 'macos',
'url': _download_url,
}, {
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'url': syncthing_download_url,
'os': 'windows',
'url': _download_url,
}, {
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.GOOGLE_PLAY.value,
'url': play_store_url(syncthing_package_id)
'os': 'android',
'store_name': 'google-play',
'url': store_url('google-play', _package_id)
}, {
'type': 'store',
'os': Mobile_OS.ANDROID.value,
'store_name': Store.F_DROID.value,
'url': f_droid_url(syncthing_package_id)
'os': 'android',
'store_name': 'f-droid',
'url': store_url('f-droid', _package_id)
}, {
'type': 'web',
'url': '/syncthing'
}]
}]
}])
......@@ -17,40 +17,40 @@
from django.utils.translation import ugettext_lazy as _
from plinth.templatetags.plinth_extras import Desktop_OS, Mobile_OS, Store
from plinth.utils import f_droid_url, play_store_url
from plinth.clients import store_url, validate
orbot_package_id = 'org.torproject.android'
tor_browser_download_url = 'https://www.torproject.org/download/download-easy.html'
_orbot_package_id = 'org.torproject.android'
_tor_browser_download_url = \
'https://www.torproject.org/download/download-easy.html'
clients = [{
clients = validate([{
'name':
_('Tor Browser'),
'platforms': [{
'type': 'download',
'os': Desktop_OS.WINDOWS.value,
'url': tor_browser_download_url,
'os': 'windows',
'url': _tor_browser_download_url,
}, {