diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | alarmpy/alarmpy.py | 11 |
2 files changed, 6 insertions, 7 deletions
@@ -1,7 +1,7 @@ # Pikud Ha'oref Alarm Tracking [](https://github.com/yuvadm/alarmpy/actions/workflows/build.yml) -[](https://pypi.org/project/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 |