diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73614d2a..9f597f64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,7 @@ metadata_v0: - ../tests/dump_internal_metadata_format.py - sed -i -e '/kivy:\sfalse/d' + -e '/OpenCollective/d' metadata/dump_*/*.yaml - diff -uw metadata/dump_* diff --git a/fdroidserver/index.py b/fdroidserver/index.py index 95f7f256..87ab340e 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -442,6 +442,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing addElementNonEmpty('litecoin', app.Litecoin, doc, apel) addElementNonEmpty('flattr', app.FlattrID, doc, apel) addElementNonEmpty('liberapay', app.LiberapayID, doc, apel) + addElementNonEmpty('openCollective', app.OpenCollective, 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/metadata.py b/fdroidserver/metadata.py index 18fe6318..0a8bf5ff 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -71,6 +71,7 @@ app_fields = set([ 'Donate', 'FlattrID', 'LiberapayID', + 'OpenCollective', 'Bitcoin', 'Litecoin', 'Name', @@ -114,6 +115,7 @@ yaml_app_field_order = [ 'Donate', 'FlattrID', 'LiberapayID', + 'OpenCollective', 'Bitcoin', 'Litecoin', '\n', @@ -173,6 +175,7 @@ class App(dict): self.Donate = None self.FlattrID = None self.LiberapayID = None + self.OpenCollective = None self.Bitcoin = None self.Litecoin = None self.Name = None @@ -448,6 +451,10 @@ valuetypes = { r'^[0-9]+$', ['LiberapayID']), + FieldValidator("Open Collective", + r'^[0-9a-z-]+$', + ['OpenCollective']), + FieldValidator("HTTP link", r'^http[s]?://', ["WebSite", "SourceCode", "IssueTracker", "Translation", "Changelog", "Donate"]), @@ -1464,6 +1471,7 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build): w_field_nonempty('Donate') w_field_nonempty('FlattrID') w_field_nonempty('LiberapayID') + w_field_nonempty('OpenCollective') w_field_nonempty('Bitcoin') w_field_nonempty('Litecoin') mf.write('\n') diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index cc1bebbe..5d80e30e 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -23,6 +23,7 @@ Litecoin: null MaintainerNotes: '' Name: null NoSourceSince: '1.5' +OpenCollective: null Provides: null Repo: https://github.com/miguelvps/PoliteDroid.git RepoType: git diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index 577d0449..6412aaa3 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -46,6 +46,7 @@ Litecoin: null MaintainerNotes: '' Name: null NoSourceSince: '' +OpenCollective: null Provides: org.sufficientlysecure.adaway Repo: https://github.com/dschuermann/ad-away.git RepoType: git diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 42e59f07..688e7d26 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -43,6 +43,7 @@ Litecoin: null MaintainerNotes: '' Name: null NoSourceSince: '' +OpenCollective: null Provides: null Repo: https://github.com/SMSSecure/SMSSecure RepoType: git diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index 70638ad5..5ab8783d 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -45,6 +45,7 @@ MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/A ' Name: null NoSourceSince: '' +OpenCollective: null Provides: null Repo: git://git.videolan.org/vlc-ports/android.git RepoType: git diff --git a/tests/metadata/info.guardianproject.urzip.yml b/tests/metadata/info.guardianproject.urzip.yml index 8bb3cd1e..bab1d763 100644 --- a/tests/metadata/info.guardianproject.urzip.yml +++ b/tests/metadata/info.guardianproject.urzip.yml @@ -1,6 +1,8 @@ AutoName: Urzip：本地应用的信息 AutoUpdateMode: None Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk +LiberapayID: '9999999' +OpenCollective: f-droid-just-testing Categories: - Development - GuardianProject diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json index 32d76b7d..bf6626d1 100644 --- a/tests/repo/index-v1.json +++ b/tests/repo/index-v1.json @@ -184,8 +184,10 @@ "suggestedVersionCode": "2147483647", "description": "

It\u2019s Urzip \u662f\u4e00\u4e2a\u83b7\u5f97\u5df2\u5b89\u88c5 APK \u76f8\u5173\u4fe1\u606f\u7684\u5b9e\u7528\u5de5\u5177\u3002\u5b83\u4ece\u60a8\u7684\u8bbe\u5907\u4e0a\u5df2\u5b89\u88c5\u7684\u6240\u6709\u5e94\u7528\u5f00\u59cb\uff0c\u4e00\u952e\u89e6\u6478\u5373\u53ef\u663e\u793a APK \u7684\u6307\u7eb9\uff0c\u5e76\u4e14\u63d0\u4f9b\u5230\u8fbe virustotal.com \u548c androidobservatory.org \u7684\u5feb\u6377\u94fe\u63a5\uff0c\u8ba9\u60a8\u65b9\u4fbf\u5730\u4e86\u89e3\u7279\u5b9a APK \u7684\u6863\u6848\u3002\u5b83\u8fd8\u53ef\u4ee5\u8ba9\u60a8\u5bfc\u51fa\u7b7e\u540d\u8bc1\u4e66\u548c\u751f\u6210 ApkSignaturePin Pin \u6587\u4ef6\u4f9b TrustedIntents \u5e93\u4f7f\u7528\u3002

\u2605 Urzip \u652f\u6301\u4e0b\u5217\u8bed\u8a00\uff1a Deutsch, English, espa\u00f1ol, suomi, \u65e5\u672c\u8a9e, \ud55c\uad6d\uc5b4, Norsk, portugu\u00eas (Portugal), \u0420\u0443\u0441\u0441\u043a\u0438\u0439, Sloven\u0161\u010dina, T\u00fcrk\u00e7e \u6ca1\u770b\u5230\u60a8\u7684\u8bed\u8a00\uff1f\u5e2e\u5fd9\u7ffb\u8bd1\u672c\u5e94\u7528\u5427\uff1a https://www.transifex.com/projects/p/urzip

\u2605 \u81f4\u7528\u6237\uff1a\u6211\u4eec\u8fd8\u7f3a\u5c11\u4f60\u559c\u6b22\u7684\u529f\u80fd\uff1f\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff1f\u8bf7\u544a\u8bc9\u6211\u4eec\uff01\u6211\u4eec\u4e50\u4e8e\u542c\u53d6\u60a8\u7684\u610f\u89c1\u3002\u8bf7\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u81f3: support@guardianproject.info \u6216\u8005\u52a0\u5165\u6211\u4eec\u7684\u804a\u5929\u5ba4 https://guardianproject.info/contact

", "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues", + "liberapayID": "9999999", "license": "GPL-3.0-only", "name": "urzip-\u03c0\u00c7\u00c7\u03c0\u00c7\u00c7\u73b0\u4ee3\u6c49\u8bed\u901a\u7528\u5b57-\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438-\u0639\u0631\u0628\u064a1234", + "openCollective": "f-droid-just-testing", "sourceCode": "https://github.com/guardianproject/urzip", "summary": "\u4e00\u4e2a\u5b9e\u7528\u5de5\u5177\uff0c\u83b7\u53d6\u5df2\u5b89\u88c5\u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u7684\u5e94\u7528\u7684\u6709\u5173\u4fe1\u606f", "webSite": "https://dev.guardianproject.info/projects/urzip", @@ -677,4 +679,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/repo/index.xml b/tests/repo/index.xml index 313e8876..20b526dc 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -357,6 +357,8 @@ https://github.com/guardianproject/urzip https://dev.guardianproject.info/projects/urzip/issues 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk + 9999999 + f-droid-just-testing 2147483647