Merge pull request #906 from mataha/feat/fallback-glyphs

Introduce 'dumb' mode for terminals without fallback glyphs

lib/globals.py

@@ -95,6 +95,14 @@ PLAIN_TEXT_AGENTS = [
 
 PLAIN_TEXT_PAGES = [':help', ':bash.function', ':translation', ':iterm2']
 
+TRANSLATION_TABLE = str.maketrans({
+    '\u2196': '\u256E',  # '↖' -> '╮'
+    '\u2197': '\u256D',  # '↗' -> '╭'
+    '\u2198': '\u2570',  # '↘' -> '╰'
+    '\u2199': '\u256F',  # '↙' -> '╯'
+    '\u26A1': '\u250C\u2518'
+})
+
 _IPLOCATION_ORDER = os.environ.get(
     "WTTR_IPLOCATION_ORDER",
     'geoip,ip2location,ipinfo')

lib/parse_query.py

@@ -79,6 +79,8 @@ def parse_query(args):
         return result
     if 'A' in q:
         result['force-ansi'] = True
+    if 'd' in q:
+        result['dumb'] = True
     if 'n' in q:
         result['narrow'] = True
     if 'm' in q:

lib/view/moon.py

@@ -44,6 +44,9 @@ def get_moon(parsed_query):
     if parsed_query.get('no-terminal', False):
         stdout = globals.remove_ansi(stdout)
 
+    if parsed_query.get('dumb', False):
+        stdout = stdout.translate(globals.TRANSLATION_TABLE)
+
     if html:
         p = Popen(
             ["bash", globals.ANSI2HTML, "--palette=solarized", "--bg=dark"],

lib/view/v2.py

@@ -38,7 +38,7 @@ from astral import moon, sun
 from scipy.interpolate import interp1d
 from babel.dates import format_datetime
 
-from globals import WWO_KEY, remove_ansi
+from globals import WWO_KEY, TRANSLATION_TABLE, remove_ansi
 import constants
 import translations
 import parse_query
@@ -638,6 +638,8 @@ def main(query, parsed_query, data):
             output += textual_information(data_parsed, geo_data, parsed_query)
         if parsed_query.get('no-terminal', False):
             output = remove_ansi(output)
+        if parsed_query.get('dumb', False):
+            output = output.translate(TRANSLATION_TABLE)
     return output
 
 if __name__ == '__main__':

lib/view/wttr.py

@@ -13,8 +13,8 @@ from gevent.subprocess import Popen, PIPE
 
 sys.path.insert(0, "..")
 from translations import get_message, SUPPORTED_LANGS
-from globals import WEGO, NOT_FOUND_LOCATION, DEFAULT_LOCATION, ANSI2HTML, \
-                    error, remove_ansi
+from globals import WEGO, TRANSLATION_TABLE, NOT_FOUND_LOCATION, \
+                    DEFAULT_LOCATION, ANSI2HTML, error, remove_ansi
 
 
 def get_wetter(parsed_query):
@@ -126,6 +126,9 @@ def _wego_postprocessing(location, parsed_query, stdout):
     if parsed_query.get('no-city', False):
         stdout = "\n".join(stdout.splitlines()[2:]) + "\n"
 
+    if parsed_query.get('dumb', False):
+        stdout = stdout.translate(TRANSLATION_TABLE)
+
     if full_address \
         and parsed_query.get('format', 'txt') != 'png' \
         and (not parsed_query.get('no-city')

lib/wttr_srv.py

@@ -17,7 +17,7 @@ import fmt.png
 import parse_query
 from translations import get_message, FULL_TRANSLATION, PARTIAL_TRANSLATION, SUPPORTED_LANGS
 from buttons import add_buttons
-from globals import get_help_file, remove_ansi, \
+from globals import get_help_file, remove_ansi, TRANSLATION_TABLE, \
                     BASH_FUNCTION_FILE, TRANSLATION_FILE, LOG_FILE, \
                     NOT_FOUND_LOCATION, \
                     MALFORMED_RESPONSE_HTML_PAGE, \
@@ -239,6 +239,8 @@ def _response(parsed_query, query, fast_mode=False):
                 message = get_message('FOLLOW_ME', parsed_query['lang'])
                 if parsed_query.get('no-terminal', False):
                     message = remove_ansi(message)
+                if parsed_query.get('dumb', False):
+                    message = message.translate(TRANSLATION_TABLE)
                 output += '\n' + message + '\n'
 
     return cache.store(cache_signature, output)