purge code that modifies the repo descriptions
YAML now provides nice ways of handling blocks of text, including removing indents and newlines. Remove the custom hack.
This commit is contained in:
Hans-Christoph Steiner
parent
828d6015ef
commit
c98b15e72a
|
|
@ -54,7 +54,7 @@
|
|||
repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
|
||||
repo_name: My First F-Droid Repo Demo
|
||||
repo_icon: fdroid-icon.png
|
||||
repo_description: |
|
||||
repo_description: >-
|
||||
This is a repository of apps to be used with F-Droid. Applications in this
|
||||
repository are either official binaries built by the original application
|
||||
developers, or are binaries built from source by the admin of f-droid.org
|
||||
|
|
@ -68,7 +68,7 @@ archive_older: 3
|
|||
archive_url: https://f-droid.org/archive
|
||||
archive_name: My First F-Droid Archive Demo
|
||||
archive_icon: fdroid-icon.png
|
||||
archive_description: |
|
||||
archive_description: >-
|
||||
The repository of older versions of packages from the main demo repository.
|
||||
|
||||
# This allows a specific kind of insecure APK to be included in the
|
||||
|
|
|
|||
|
|
@ -355,10 +355,6 @@ def read_config(opts):
|
|||
|
||||
fill_config_defaults(config)
|
||||
|
||||
for k in ["repo_description", "archive_description"]:
|
||||
if k in config:
|
||||
config[k] = clean_description(config[k])
|
||||
|
||||
if 'serverwebroot' in config:
|
||||
if isinstance(config['serverwebroot'], str):
|
||||
roots = [config['serverwebroot']]
|
||||
|
|
@ -671,19 +667,6 @@ def get_extension(filename):
|
|||
publish_name_regex = re.compile(r"^(.+)_([0-9]+)\.(apk|zip)$")
|
||||
|
||||
|
||||
def clean_description(description):
|
||||
'Remove unneeded newlines and spaces from a block of description text'
|
||||
returnstring = ''
|
||||
# this is split up by paragraph to make removing the newlines easier
|
||||
for paragraph in re.split(r'\n\n', description):
|
||||
paragraph = re.sub('\r', '', paragraph)
|
||||
paragraph = re.sub('\n', ' ', paragraph)
|
||||
paragraph = re.sub(' {2,}', ' ', paragraph)
|
||||
paragraph = re.sub(r'^\s*(\w)', r'\1', paragraph)
|
||||
returnstring += paragraph + '\n\n'
|
||||
return returnstring.rstrip('\n')
|
||||
|
||||
|
||||
def publishednameinfo(filename):
|
||||
filename = os.path.basename(filename)
|
||||
m = publish_name_regex.match(filename)
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(1, os.path.join(os.getcwd(), '..', 'fdroidserver'))
|
||||
import common
|
||||
|
||||
config = common.get_default_config()
|
||||
|
||||
testtext = '''
|
||||
This is a block of text that has been wrapped to fit nicely in PEP8 style:
|
||||
|
||||
GnuPrivacyGuard extends the gpgcli command line tool to bring an integrated
|
||||
privacy engine to your Android. It gives you command line access to the entire
|
||||
GnuPG suite of encryption software. It also serves as the test bed for
|
||||
complete Android integration for all of GnuPG's crypto services, including
|
||||
OpenPGP, symmetric encryption, and more.
|
||||
|
||||
GPG is GNU’s tool for end-to-end secure communication and encrypted data
|
||||
storage. This trusted protocol is the free software alternative to PGP. This
|
||||
app is built upon GnuPG 2.1, the new modularized version of GnuPG that now
|
||||
supports S/MIME.
|
||||
|
||||
GPG aims to provide an integrated experience, so clicking on PGP files should
|
||||
"just work". You can also share files to GPG to encrypt them. GPG will also
|
||||
respond when you click on a PGP fingerprint URL (one that starts with
|
||||
openpgp4fpr:).
|
||||
|
||||
Before using GPG, be sure to launch the app and let it finish its installation
|
||||
process. Once it has completed, then you're ready to use it. The easiest way
|
||||
to get started with GPG is to install [[jackpal.androidterm]]. GPG will
|
||||
automatically configure Android Terminal Emulator as long as you have the
|
||||
"Allow PATH extensions" settings enabled.
|
||||
'''
|
||||
|
||||
archive_description = """
|
||||
The repository of older versions of applications from the main demo repository.
|
||||
"""
|
||||
|
||||
|
||||
print('\n\n\n----------------------------------------------------')
|
||||
print(common.clean_description(testtext))
|
||||
print('\n\n\n----------------------------------------------------')
|
||||
print(common.clean_description(archive_description))
|
||||
print('\n\n\n----------------------------------------------------')
|
||||
print(common.clean_description(config['repo_description']))
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
"name": "My First F-Droid Repo Demo",
|
||||
"icon": "fdroid-icon.png",
|
||||
"address": "https://MyFirstFDroidRepo.org/fdroid/repo",
|
||||
"description": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. ",
|
||||
"description": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid.",
|
||||
"mirrors": [
|
||||
"http://foobarfoobarfoobar.onion/fdroid/repo",
|
||||
"https://foo.bar/fdroid/repo"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<fdroid>
|
||||
<repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
|
||||
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. </description>
|
||||
<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid.</description>
|
||||
<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
|
||||
<mirror>https://foo.bar/fdroid/repo</mirror>
|
||||
</repo>
|
||||
|
|
|
|||
Loading…
Reference in New Issue