From 6dfd809694c05dbe949f060eeafe6cb96ea79351 Mon Sep 17 00:00:00 2001 From: Igor Chubin Date: Fri, 11 Jan 2019 12:48:00 +0100 Subject: [PATCH] new option: F (no follow line) (fixes #214) --- lib/parse_query.py | 2 ++ lib/wttr_srv.py | 8 ++++---- share/help.txt | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/parse_query.py b/lib/parse_query.py index 9a7e5b1..e9700d4 100644 --- a/lib/parse_query.py +++ b/lib/parse_query.py @@ -72,6 +72,8 @@ def parse_query(args): result['no-caption'] = True if 'Q' in q: result['no-city'] = True + if 'F' in q: + result['no-follow-line'] = True for key, val in args.items(): if val == 'True': diff --git a/lib/wttr_srv.py b/lib/wttr_srv.py index a4e6dd6..adef8c2 100644 --- a/lib/wttr_srv.py +++ b/lib/wttr_srv.py @@ -241,10 +241,10 @@ def wttr(location, request): url=request.url, ) - if html_output: - output = add_buttons(output) - else: - if query.get('days', '3') != '0': + if query.get('days', '3') != '0' and not query.get('no-follow-line'): + if html_output: + output = add_buttons(output) + else: #output += '\n' + get_message('NEW_FEATURE', lang).encode('utf-8') output += '\n' + get_message('FOLLOW_ME', lang).encode('utf-8') + '\n' return output diff --git a/share/help.txt b/share/help.txt index 2341cb0..2a6add0 100644 --- a/share/help.txt +++ b/share/help.txt @@ -29,6 +29,7 @@ View options: 0 # only current weather 1 # current weather + 1 day 2 # current weather + 2 days + F # do not show the "Follow" line n # narrow version (only day and night) q # quiet version (no "Weather report" text) Q # superquiet version (no "Weather report", no city name)