pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

morss: make FeedFormat more flexible with encoding

master
pictuga 2020-03-21 23:26:35 +01:00
parent 758ff404a8
commit 68d920d4b5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
morss/morss.py
View File

@ -436,37 +436,38 @@ def FeedGather(rss, url, options):
return rss return rss
def FeedFormat(rss, options): def FeedFormat(rss, options, encoding='utf-8'):
if options.callback: if options.callback:
if re.match(r'^[a-zA-Z0-9\.]+$', options.callback) is not None: if re.match(r'^[a-zA-Z0-9\.]+$', options.callback) is not None:
return '%s(%s)' % (options.callback, rss.tojson()) out = '%s(%s)' % (options.callback, rss.tojson(encoding='unicode'))
return out if encoding == 'unicode' else out.encode(encoding)
else: else:
raise MorssException('Invalid callback var name') raise MorssException('Invalid callback var name')
elif options.json: elif options.json:
if options.indent: if options.indent:
return rss.tojson(encoding='UTF-8', indent=4) return rss.tojson(encoding=encoding, indent=4)
else: else:
return rss.tojson(encoding='UTF-8') return rss.tojson(encoding=encoding)
elif options.csv: elif options.csv:
return rss.tocsv(encoding='UTF-8') return rss.tocsv(encoding=encoding)
elif options.reader: elif options.reader:
if options.indent: if options.indent:
return rss.tohtml(encoding='UTF-8', pretty_print=True) return rss.tohtml(encoding=encoding, pretty_print=True)
else: else:
return rss.tohtml(encoding='UTF-8') return rss.tohtml(encoding=encoding)
else: else:
if options.indent: if options.indent:
return rss.torss(xml_declaration=True, encoding='UTF-8', pretty_print=True) return rss.torss(xml_declaration=True, encoding=encoding, pretty_print=True)
else: else:
return rss.torss(xml_declaration=True, encoding='UTF-8') return rss.torss(xml_declaration=True, encoding=encoding)
def process(url, cache=None, options=None): def process(url, cache=None, options=None):