From 4f2e6281b31af15c9cff15ca299d6512bd88fd21 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Tue, 18 May 2021 17:46:54 +0300
Subject: Nicer fixed-width formatting

---
 README.md          |  2 +-
 alarmpy/alarmpy.py | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2f377d2..13b1d76 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Pikud Ha'oref Alarm Tracking
 
 [![Build](https://github.com/yuvadm/alarmpy/workflows/Build/badge.svg)](https://github.com/yuvadm/alarmpy/actions/workflows/build.yml)
-[![Pypi](https://img.shields.io/pypi/v/alarmpy)](https://pypi.org/project/alarmpy/)
+[![PyPI](https://img.shields.io/pypi/v/alarmpy)](https://pypi.org/project/alarmpy/)
 
 A simple CLI tool for tracking Pikud Ha'oref alarms.
 
diff --git a/alarmpy/alarmpy.py b/alarmpy/alarmpy.py
index 0edec3a..1ee56ab 100644
--- a/alarmpy/alarmpy.py
+++ b/alarmpy/alarmpy.py
@@ -121,12 +121,10 @@ class Alarm:
 
     def output_alarms(self, cities, alarm_id):
         areas = self.group_areas_and_localize(cities)
-        multiple_areas = len(areas) > 1
-        self.output_leading_timestamp(nl=multiple_areas)
+        self.output_leading_timestamp(nl=True)
         for area, cities in areas.items():
             cities_str = ", ".join(cities)
-            leading_tab = "\t" if multiple_areas else ""
-            click.secho(f"{leading_tab}{area} ", fg="red", bold=True, nl=False)
+            click.secho(f"\t{area:<20} ", fg="red", bold=True, nl=False)
             click.secho(f"\t{cities_str} ", fg="red")
         if self.alarm_id:
             click.secho(f"({alarm_id})")
@@ -134,8 +132,9 @@ class Alarm:
     def group_areas_and_localize(self, cities):
         res = defaultdict(list)
         for city in cities:
-            area = self.labels.get(city, {}).get(f"areaname_{self.language}", "")
-            label = self.labels.get(city, {}).get(f"label_{self.language}", city)
+            labels = self.labels.get(city, {})
+            area = labels.get(f"areaname_{self.language}", "")
+            label = labels.get(f"label_{self.language}", city)
             res[area].append(label)
         return res
 
-- 
cgit v1.3.1