Add `mode` option
parent
ea2ebedfcb
commit
8bdcd8f386
|
@ -395,8 +395,8 @@ usage: morss [-h] [--post STRING] [--xpath XPATH]
|
||||||
[--indent] [--cache] [--force] [--proxy]
|
[--indent] [--cache] [--force] [--proxy]
|
||||||
[--order {first,last,newest,oldest}] [--firstlink] [--resolve]
|
[--order {first,last,newest,oldest}] [--firstlink] [--resolve]
|
||||||
[--items XPATH] [--item_link XPATH] [--item_title XPATH]
|
[--items XPATH] [--item_link XPATH] [--item_title XPATH]
|
||||||
[--item_content XPATH] [--item_time XPATH] [--nolink] [--noref]
|
[--item_content XPATH] [--item_time XPATH]
|
||||||
[--silent]
|
[--mode {xml,html,json}] [--nolink] [--noref] [--silent]
|
||||||
url
|
url
|
||||||
|
|
||||||
Get full-text RSS feeds
|
Get full-text RSS feeds
|
||||||
|
@ -440,6 +440,8 @@ custom feeds:
|
||||||
--item_content XPATH entry's content
|
--item_content XPATH entry's content
|
||||||
--item_time XPATH entry's date & time (accepts a wide range of time
|
--item_time XPATH entry's date & time (accepts a wide range of time
|
||||||
formats)
|
formats)
|
||||||
|
--mode {xml,html,json}
|
||||||
|
parser to use for the custom feeds
|
||||||
|
|
||||||
misc:
|
misc:
|
||||||
--nolink drop links, but keeps links' inner text
|
--nolink drop links, but keeps links' inner text
|
||||||
|
|
|
@ -54,6 +54,7 @@ def cli_app():
|
||||||
group.add_argument('--item_title', action='store', type=str, metavar='XPATH', help='entry\'s title')
|
group.add_argument('--item_title', action='store', type=str, metavar='XPATH', help='entry\'s title')
|
||||||
group.add_argument('--item_content', action='store', type=str, metavar='XPATH', help='entry\'s content')
|
group.add_argument('--item_content', action='store', type=str, metavar='XPATH', help='entry\'s content')
|
||||||
group.add_argument('--item_time', action='store', type=str, metavar='XPATH', help='entry\'s date & time (accepts a wide range of time formats)')
|
group.add_argument('--item_time', action='store', type=str, metavar='XPATH', help='entry\'s date & time (accepts a wide range of time formats)')
|
||||||
|
group.add_argument('--mode', default=None, choices=('xml', 'html', 'json'), help='parser to use for the custom feeds')
|
||||||
|
|
||||||
group = parser.add_argument_group('misc')
|
group = parser.add_argument_group('misc')
|
||||||
group.add_argument('--nolink', action='store_true', help='drop links, but keeps links\' inner text')
|
group.add_argument('--nolink', action='store_true', help='drop links, but keeps links\' inner text')
|
||||||
|
|
|
@ -287,6 +287,9 @@ def FeedFetch(url, options):
|
||||||
|
|
||||||
ruleset['items'] = options.items
|
ruleset['items'] = options.items
|
||||||
|
|
||||||
|
if options.mode:
|
||||||
|
ruleset['mode'] = options.mode
|
||||||
|
|
||||||
ruleset['title'] = options.get('title', '//head/title')
|
ruleset['title'] = options.get('title', '//head/title')
|
||||||
ruleset['desc'] = options.get('desc', '//head/meta[@name="description"]/@content')
|
ruleset['desc'] = options.get('desc', '//head/meta[@name="description"]/@content')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue