Skip to content

Sort alarms by severity #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lizy14 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Sort alarms by severity #10

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fab64c9
Add indexes_short attribute
lizy14 Apr 19, 2026
f58eadc
Sort alarms by severity desc, fix entity_picture and title ordering
Copilot Jun 16, 2026
748131a
Merge branch 'hasscc:main' into main
lizy14 Jun 16, 2026
90bd863
Merge pull request #1 from lizy14/copilot/sort-alarms-by-severity
lizy14 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions custom_components/tianqi/converters/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,21 +119,28 @@ def decode(self, client: "Client", payload: dict, value: Any):
code = None
titles = []
alarms = []
for v in client.data.get(self.prop) or []:
code = f'{v.get("w4")}{v.get("w6")}'
raw_alarms = sorted(
client.data.get(self.prop) or [],
key=lambda v: v.get('w6', ''),
reverse=True,
)
for v in raw_alarms:
alarm_code = f'{v.get("w4")}{v.get("w6")}'
if code is None:
code = alarm_code
title = v.get('w13', '')
titles.append(re.sub(r'.+发布的?(.+预警)', r'\1', title))
alarms.append({
'title': title,
'description': v.get('w9', ''),
'province': v.get('w1'),
'city': v.get('w2'),
'code': code,
'code': alarm_code,
'alertld': v.get('w16'),
'link': client.web_url('warning/publish_area.shtml?code=%s' % client.area_id),
})
payload['warning'] = len(alarms) > 0
payload['title'] = ', '.join(set(titles))
payload['title'] = ', '.join(dict.fromkeys(titles))
payload['alarms'] = alarms
src = client.web_url('m2/i/about/alarmpic/%s.gif' % code, 'www') if code else None
self.option['entity_picture'] = f'https://cfrp.hacs.vip/{src}' if src else None