kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 18:50:11 +02:00
Code Activity

Wrap descriptions to 80 chars

Browse Source
This commit is contained in:
Daniel Martí 2015-09-11 21:36:18 -07:00
parent ade5036e23
commit 3413965eaa
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/metadata.py
View File

@ -24,6 +24,7 @@ import sys
import glob import glob
import cgi import cgi
import logging import logging
import textwrap
import yaml import yaml
# use libyaml if it is available # use libyaml if it is available
@ -266,6 +267,7 @@ class DescriptionFormatter:
text_wiki = '' text_wiki = ''
text_html = '' text_html = ''
text_txt = '' text_txt = ''
para_lines = []
linkResolver = None linkResolver = None
def __init__(self, linkres): def __init__(self, linkres):
@ -284,13 +286,18 @@ class DescriptionFormatter:
def endpara(self): def endpara(self):
self.text_html += '</p>' self.text_html += '</p>'
self.state = self.stNONE self.state = self.stNONE
self.text_txt += textwrap.fill(' '.join(self.para_lines), 80)
self.text_txt += '\n\n'
del self.para_lines[:]
def endul(self): def endul(self):
self.text_html += '</ul>' self.text_html += '</ul>'
self.text_txt += '\n'
self.state = self.stNONE self.state = self.stNONE
def endol(self): def endol(self):
self.text_html += '</ol>' self.text_html += '</ol>'
self.text_txt += '\n'
self.state = self.stNONE self.state = self.stNONE
def formatted(self, txt, html): def formatted(self, txt, html):
@ -367,11 +374,11 @@ class DescriptionFormatter:
def parseline(self, line): def parseline(self, line):
self.text_wiki += "%s\n" % line self.text_wiki += "%s\n" % line
self.text_txt += "%s\n" % line
if not line: if not line:
self.endcur() self.endcur()
elif line.startswith('* '): elif line.startswith('* '):
self.endcur([self.stUL]) self.endcur([self.stUL])
self.text_txt += "%s\n" % line
if self.state != self.stUL: if self.state != self.stUL:
self.text_html += '<ul>' self.text_html += '<ul>'
self.state = self.stUL self.state = self.stUL
@ -380,6 +387,7 @@ class DescriptionFormatter:
self.text_html += '</li>' self.text_html += '</li>'
elif line.startswith('# '): elif line.startswith('# '):
self.endcur([self.stOL]) self.endcur([self.stOL])
self.text_txt += "%s\n" % line
if self.state != self.stOL: if self.state != self.stOL:
self.text_html += '<ol>' self.text_html += '<ol>'
self.state = self.stOL self.state = self.stOL
@ -387,6 +395,7 @@ class DescriptionFormatter:
self.addtext(line[1:]) self.addtext(line[1:])
self.text_html += '</li>' self.text_html += '</li>'
else: else:
self.para_lines.append(line)
self.endcur([self.stPARA]) self.endcur([self.stPARA])
if self.state == self.stNONE: if self.state == self.stNONE:
self.text_html += '<p>' self.text_html += '<p>'
@ -397,6 +406,7 @@ class DescriptionFormatter:
def end(self): def end(self):
self.endcur() self.endcur()
self.text_txt = self.text_txt.strip()
# Parse multiple lines of description as written in a metadata file, returning # Parse multiple lines of description as written in a metadata file, returning
@ -1060,7 +1070,7 @@ def write_metadata(dest, app):
if type(value) == list: if type(value) == list:
value = '\n' + '\n'.join(value) + '\n.' value = '\n' + '\n'.join(value) + '\n.'
else: else:
value = '\n' + value + '.' value = '\n' + value + '\n.'
mf.write("%s:%s\n" % (field, value)) mf.write("%s:%s\n" % (field, value))
def writefield_nonempty(field, value=None): def writefield_nonempty(field, value=None):