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

"json" arg to output json feed

master
pictuga 2013-12-21 20:14:10 +01:00
parent 47013c7948
commit afe31e695a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
morss.py
View File

@ -605,7 +605,7 @@ def Gather(url, cachePath, options):
log(len(rss.items)) log(len(rss.items))
log(time.time() - startTime) log(time.time() - startTime)
return rss.tostring(xml_declaration=True, encoding='UTF-8') return rss
if __name__ == '__main__': if __name__ == '__main__':
options = ParseOptions() options = ParseOptions()
@ -676,6 +676,8 @@ if __name__ == '__main__':
print 'Content-Type: text/plain' print 'Content-Type: text/plain'
elif options.progress: elif options.progress:
print 'Content-Type: application/octet-stream' print 'Content-Type: application/octet-stream'
elif options.json:
print 'Content-Type: application/json'
else: else:
print 'Content-Type: text/xml' print 'Content-Type: text/xml'
print '' print ''
@ -694,7 +696,13 @@ if __name__ == '__main__':
RSS = Gather(url, cachePath, options) RSS = Gather(url, cachePath, options)
if RSS is not False and not options.progress and not DEBUG and not options.silent: if RSS is not False and not options.progress and not DEBUG and not options.silent:
print RSS if options.json:
if options.indent:
print json.dumps(RSS, sort_keys=True, indent=4, default=lambda x: dict(x))
else:
print json.dumps(RSS, sort_keys=True, default=lambda x: dict(x))
else:
print RSS.tostring(xml_declaration=True, encoding='UTF-8')
if RSS is False and 'progress' not in options: if RSS is False and 'progress' not in options:
print 'Error fetching feed.' print 'Error fetching feed.'