metadata: set mapping indentation to 2

fdroidserver/metadata.py

@@ -1267,7 +1267,7 @@ def write_yaml(mf, app):
     _del_duplicated_NoSourceSince(app)
     yaml_app = _app_to_yaml(app)
     yaml = ruamel.yaml.YAML()
-    yaml.indent(mapping=4, sequence=4, offset=2)
+    yaml.indent(mapping=2, sequence=4, offset=2)
     yaml.dump(yaml_app, stream=mf)
 
 

tests/metadata-rewrite-yml/app.with.special.build.params.yml

@@ -9,13 +9,13 @@ IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 AutoName: UberSync for Facebook
 Summary: Sync your Facebook Contacts
 Description: |-
-    To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
+  To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
-    how many friends you have, the first import might take a while, so be patient.
+  how many friends you have, the first import might take a while, so be patient.
 
-    * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
+  * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
-    * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
+  * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
 
-    Appbrain SDK was removed before building.
+  Appbrain SDK was removed before building.
 
 RepoType: git
 Repo: https://github.com/loadrunner/Facebook-Contact-Sync.git
@@ -78,8 +78,8 @@ Builds:
     srclibs:
       - FacebookSDK@sdk-version-3.0.2
     antifeatures:
-        Tracking:
+      Tracking:
-            en-US: Uses the Facebook SDK.
+        en-US: Uses the Facebook SDK.
 
   - versionName: 2.1.1-c
     versionCode: 50

tests/metadata-rewrite-yml/fake.ota.update.yml

@@ -9,24 +9,24 @@ Donate: https://f-droid.org/about
 AutoName: Fake OTA Update
 Summary: Tests whether OTA ZIP files are being include
 Description: |-
-    F-Droid can make use of system privileges or permissions to
+  F-Droid can make use of system privileges or permissions to
-    install, update and remove applications on its own. The only way to obtain those
+  install, update and remove applications on its own. The only way to obtain those
-    privileges is to become a system app.
+  privileges is to become a system app.
 
-    This is where the Privileged Extension comes in - being a separate app and much
+  This is where the Privileged Extension comes in - being a separate app and much
-    smaller, it can be installed as a system app and communicate with the main app
+  smaller, it can be installed as a system app and communicate with the main app
-    via AIDL IPC.
+  via AIDL IPC.
 
-    This has several advantages:
+  This has several advantages:
 
-    * Reduced disk usage in the system partition
+  * Reduced disk usage in the system partition
-    * System updates don't remove F-Droid
+  * System updates don't remove F-Droid
-    * The process of installing into system via root is safer
+  * The process of installing into system via root is safer
 
-    This is packaged as an OTA (Over-The-Air) update ZIP file.  It must be installed
+  This is packaged as an OTA (Over-The-Air) update ZIP file.  It must be installed
-    using TWRP or other Android recovery that can flash updates to the system from
+  using TWRP or other Android recovery that can flash updates to the system from
-    the /data/data/org.fdroid.fdroid folder on the /data partition. The standalone
+  the /data/data/org.fdroid.fdroid folder on the /data partition. The standalone
-    APK is called F-Droid Privileged Extension.
+  APK is called F-Droid Privileged Extension.
 
 RepoType: git
 Repo: https://gitlab.com/fdroid/privileged-extension.git

tests/metadata-rewrite-yml/org.fdroid.fdroid.yml

@@ -13,18 +13,18 @@ Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 AutoName: F-Droid
 Summary: Application manager
 Description: |-
-    Connects to F-Droid compatible repositories. The default repo is hosted at
+  Connects to F-Droid compatible repositories. The default repo is hosted at
-    f-droid.org, which contains only bona fide FOSS.
+  f-droid.org, which contains only bona fide FOSS.
 
-    Android is open in the sense that you are free to install apks from anywhere you
+  Android is open in the sense that you are free to install apks from anywhere you
-    wish, but there are many good reasons for using a client/repository setup:
+  wish, but there are many good reasons for using a client/repository setup:
 
-    * Be notified when updates are available
+  * Be notified when updates are available
-    * Keep track of older and beta versions
+  * Keep track of older and beta versions
-    * Filter apps that aren't compatible with the device
+  * Filter apps that aren't compatible with the device
-    * Find apps via categories and searchable descriptions
+  * Find apps via categories and searchable descriptions
-    * Access associated urls for donations, source code etc.
+  * Access associated urls for donations, source code etc.
-    * Stay safe by checking repo index signatures and apk hashes
+  * Stay safe by checking repo index signatures and apk hashes
 
 RepoType: srclib
 Repo: fdroidclient

tests/metadata.TestCase

@@ -1462,10 +1462,10 @@ class MetadataTest(unittest.TestCase):
                     gradle:
                       - yes
                     antifeatures:
-                        a: {}
+                      a: {}
-                        b:
+                      b:
-                            de: Probe
+                        de: Probe
-                            en-US: test
+                        en-US: test
                 """
             ),
         )

tests/metadata/app.with.special.build.params.yml

@@ -9,13 +9,13 @@ IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 AutoName: UberSync for Facebook
 Summary: Sync your Facebook Contacts
 Description: |-
-    To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
+  To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
-    how many friends you have, the first import might take a while, so be patient.
+  how many friends you have, the first import might take a while, so be patient.
 
-    * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
+  * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
-    * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
+  * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
 
-    Appbrain SDK was removed before building.
+  Appbrain SDK was removed before building.
 
 RepoType: git
 Repo: https://github.com/loadrunner/Facebook-Contact-Sync.git