From 19a83b6219258f7db08f19303fcf8e687d5ee6f9 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Tue, 12 Dec 2017 10:53:34 +0100 Subject: [PATCH] Add Liberapay support --- fdroidserver/index.py | 1 + fdroidserver/lint.py | 2 ++ fdroidserver/metadata.py | 8 ++++++++ fdroidserver/update.py | 3 ++- locale/fdroidserver.pot | 4 ++++ tests/metadata/dump/com.politedroid.yaml | 1 + tests/metadata/dump/org.adaway.yaml | 1 + tests/metadata/dump/org.smssecure.smssecure.yaml | 1 + tests/metadata/dump/org.videolan.vlc.yaml | 1 + 9 files changed, 21 insertions(+), 1 deletion(-) diff --git a/fdroidserver/index.py b/fdroidserver/index.py index 82b5ff33..6dd30856 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -431,6 +431,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing addElementNonEmpty('bitcoin', app.Bitcoin, doc, apel) addElementNonEmpty('litecoin', app.Litecoin, doc, apel) addElementNonEmpty('flattr', app.FlattrID, doc, apel) + addElementNonEmpty('liberapay', app.LiberapayID, doc, apel) # These elements actually refer to the current version (i.e. which # one is recommended. They are historically mis-named, and need diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index 18bd3d47..a5ed3637 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -135,6 +135,8 @@ regex_checks = { 'Donate': http_checks + [ (re.compile(r'.*flattr\.com'), _("Flattr donation methods belong in the FlattrID flag")), + (re.compile(r'.*liberapay\.com'), + _("Liberapay donation methods belong in the LiberapayID flag")), ], 'Changelog': http_checks, 'Author Name': [ diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index c066d499..3c03df72 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -70,6 +70,7 @@ app_fields = set([ 'Changelog', 'Donate', 'FlattrID', + 'LiberapayID', 'Bitcoin', 'Litecoin', 'Name', @@ -120,6 +121,7 @@ class App(dict): self.Changelog = '' self.Donate = None self.FlattrID = None + self.LiberapayID = None self.Bitcoin = None self.Litecoin = None self.Name = None @@ -391,6 +393,10 @@ valuetypes = { r'^[0-9a-z]+$', ['FlattrID']), + FieldValidator("Liberapay ID", + r'^[0-9]+$', + ['LiberapayID']), + FieldValidator("HTTP link", r'^http[s]?://', ["WebSite", "SourceCode", "IssueTracker", "Changelog", "Donate"]), @@ -1138,6 +1144,7 @@ def write_yaml(mf, app): 'Changelog', 'Donate', 'FlattrID', + 'LiberapayID', 'Bitcoin', 'Litecoin', '\n', @@ -1429,6 +1436,7 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build): w_field_nonempty('Changelog') w_field_nonempty('Donate') w_field_nonempty('FlattrID') + w_field_nonempty('LiberapayID') w_field_nonempty('Bitcoin') w_field_nonempty('Litecoin') mf.write('\n') diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 097513bf..02382d2b 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -138,7 +138,7 @@ def update_wiki(apps, sortedids, apks): requiresroot = 'Yes' else: requiresroot = 'No' - wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s|author=%s|email=%s}}\n' % ( + wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|liberapay=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s|author=%s|email=%s}}\n' % ( appid, app.Name, app.added.strftime('%Y-%m-%d') if app.added else '', @@ -149,6 +149,7 @@ def update_wiki(apps, sortedids, apks): app.Changelog, app.Donate, app.FlattrID, + app.LiberapayID, app.Bitcoin, app.Litecoin, app.License, diff --git a/locale/fdroidserver.pot b/locale/fdroidserver.pot index 2e9775c4..35da3557 100644 --- a/locale/fdroidserver.pot +++ b/locale/fdroidserver.pot @@ -586,6 +586,10 @@ msgstr "" msgid "Flattr donation methods belong in the FlattrID flag" msgstr "" +#: ../fdroidserver/lint.py +msgid "Liberapay donation methods belong in the LiberapayID flag" +msgstr "" + #: ../fdroidserver/build.py msgid "" "Force build of disabled apps, and carries on regardless of scan problems. " diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index 90e20bb0..8d6ba982 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -17,6 +17,7 @@ Disabled: null Donate: null FlattrID: null IssueTracker: https://github.com/miguelvps/PoliteDroid/issues +LiberapayID: null License: GPL-3.0 Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index 1406fdfd..89595b82 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -40,6 +40,7 @@ Disabled: null Donate: http://sufficientlysecure.org/index.php/adaway FlattrID: '369138' IssueTracker: https://github.com/dschuermann/ad-away/issues +LiberapayID: null License: GPL-3.0 Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 86005af2..b8f9927f 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -37,6 +37,7 @@ Disabled: null Donate: null FlattrID: null IssueTracker: https://github.com/SMSSecure/SMSSecure/issues +LiberapayID: null License: GPL-3.0 Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index f8295373..e47d51b4 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -24,6 +24,7 @@ Disabled: null Donate: http://www.videolan.org/contribute.html#money FlattrID: null IssueTracker: http://www.videolan.org/support/index.html#bugs +LiberapayID: null License: GPL-3.0 Litecoin: null MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile -- 2.30.2