From 5ef86e391461e94157b9560b1fea69084bb0b0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Thu, 15 Oct 2020 17:20:59 +0200 Subject: [PATCH 1/4] Added hr-iNFO news station (Hessen/Germany) --- __init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__init__.py b/__init__.py index e6d1b04..6fb8ca5 100644 --- a/__init__.py +++ b/__init__.py @@ -119,6 +119,8 @@ def gbp(): 'WDR': ('WDR', 'https://www1.wdr.de/mediathek/audio/' 'wdr-aktuell-news/wdr-aktuell-152.podcast', image_path('WDR')), + 'hr-iNFO': ('hr-iNFO', 'https://podcast.hr-online.de/der_tag_in_hessen/podcast.xml', + None), 'YLE': ('YLE', 'https://feeds.yle.fi/areena/v1/series/1-1440981.rss', image_path('Yle.png')), "GBP": ("Georgia Public Radio", gbp, None), From 5a931aadba95ff818c2ba377b7ba071890c9d764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Thu, 15 Oct 2020 17:24:14 +0200 Subject: [PATCH 2/4] Added hr-iNFO news radio --- settingsmeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settingsmeta.json b/settingsmeta.json index 7453171..c1962ec 100644 --- a/settingsmeta.json +++ b/settingsmeta.json @@ -12,7 +12,7 @@ "name": "station", "type": "select", "label": "Options", - "options": "Other URL (please define below)|not_set;AP Hourly Radio News|AP;[AU] ABC News|ABC;[CA] CBC|CBC;[BE] VRT Nieuws|VRT;[DE] DLF|DLF;[DE] WDR|WDR;[ES] RNE National Spanish Radio|RNE;[FI] YLE|YLE;[NL] NOS Journaal|NOS;[PT] RDP Africa|RDP;[PT] TSF|TSF;[SE] Ekot|Ekot;[UK] BBC News|BBC;[US] FOX News|FOX;[US] Georgia Public Radio|GPB;[US] NPR|NPR;[US] PBS NewsHour Daily|PBS", + "options": "Other URL (please define below)|not_set;AP Hourly Radio News|AP;[AU] ABC News|ABC;[CA] CBC|CBC;[BE] VRT Nieuws|VRT;[DE] DLF|DLF;[DE] WDR|WDR;[DE] hr-iNFO|hr-iNFO;[ES] RNE National Spanish Radio|RNE;[FI] YLE|YLE;[NL] NOS Journaal|NOS;[PT] RDP Africa|RDP;[PT] TSF|TSF;[SE] Ekot|Ekot;[UK] BBC News|BBC;[US] FOX News|FOX;[US] Georgia Public Radio|GPB;[US] NPR|NPR;[US] PBS NewsHour Daily|PBS", "value": "not_set" }, { From 5a0ded48af0d7b596532671760837755e0465946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Mon, 19 Oct 2020 22:51:58 +0200 Subject: [PATCH 3/4] Refactor intent handling, remove setting change --- __init__.py | 4 ++-- settingsmeta.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__init__.py b/__init__.py index 6fb8ca5..ebba71d 100644 --- a/__init__.py +++ b/__init__.py @@ -28,7 +28,7 @@ from adapt.intent import IntentBuilder from mycroft.audio import wait_while_speaking from mycroft.messagebus.message import Message -from mycroft.skills.core import intent_handler, intent_file_handler +from mycroft.skills.core import MycroftSkill, intent_handler from mycroft.skills.common_play_skill import CommonPlaySkill, CPSMatchLevel from mycroft.util import get_cache_directory, LOG from mycroft.util.parse import fuzzy_match @@ -326,7 +326,7 @@ def get_media_url(self, station_url): media_url = media_url.split('?')[0] return media_url - @intent_file_handler("PlayTheNews.intent") + @intent_handler("PlayTheNews.intent") def handle_latest_news_alt(self, message): # Capture some alternative ways of requesting the news via Padatious utt = message.data["utterance"] diff --git a/settingsmeta.json b/settingsmeta.json index c1962ec..7453171 100644 --- a/settingsmeta.json +++ b/settingsmeta.json @@ -12,7 +12,7 @@ "name": "station", "type": "select", "label": "Options", - "options": "Other URL (please define below)|not_set;AP Hourly Radio News|AP;[AU] ABC News|ABC;[CA] CBC|CBC;[BE] VRT Nieuws|VRT;[DE] DLF|DLF;[DE] WDR|WDR;[DE] hr-iNFO|hr-iNFO;[ES] RNE National Spanish Radio|RNE;[FI] YLE|YLE;[NL] NOS Journaal|NOS;[PT] RDP Africa|RDP;[PT] TSF|TSF;[SE] Ekot|Ekot;[UK] BBC News|BBC;[US] FOX News|FOX;[US] Georgia Public Radio|GPB;[US] NPR|NPR;[US] PBS NewsHour Daily|PBS", + "options": "Other URL (please define below)|not_set;AP Hourly Radio News|AP;[AU] ABC News|ABC;[CA] CBC|CBC;[BE] VRT Nieuws|VRT;[DE] DLF|DLF;[DE] WDR|WDR;[ES] RNE National Spanish Radio|RNE;[FI] YLE|YLE;[NL] NOS Journaal|NOS;[PT] RDP Africa|RDP;[PT] TSF|TSF;[SE] Ekot|Ekot;[UK] BBC News|BBC;[US] FOX News|FOX;[US] Georgia Public Radio|GPB;[US] NPR|NPR;[US] PBS NewsHour Daily|PBS", "value": "not_set" }, { From f70e7c6ae1e9495584779c63454d818981bc96bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Tue, 20 Oct 2020 15:44:47 +0200 Subject: [PATCH 4/4] Set Alias and remove dash in station name --- __init__.py | 2 +- dialog/de-de/alt.feed.name.value | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index ebba71d..805c11e 100644 --- a/__init__.py +++ b/__init__.py @@ -119,7 +119,7 @@ def gbp(): 'WDR': ('WDR', 'https://www1.wdr.de/mediathek/audio/' 'wdr-aktuell-news/wdr-aktuell-152.podcast', image_path('WDR')), - 'hr-iNFO': ('hr-iNFO', 'https://podcast.hr-online.de/der_tag_in_hessen/podcast.xml', + 'HRI': ('hr Info', 'https://podcast.hr-online.de/der_tag_in_hessen/podcast.xml', None), 'YLE': ('YLE', 'https://feeds.yle.fi/areena/v1/series/1-1440981.rss', image_path('Yle.png')), diff --git a/dialog/de-de/alt.feed.name.value b/dialog/de-de/alt.feed.name.value index d3267c9..88334e9 100644 --- a/dialog/de-de/alt.feed.name.value +++ b/dialog/de-de/alt.feed.name.value @@ -1,2 +1,3 @@ zugehörige Presse,AP Ö3 Nachrichten,OE3 +Hessenschau,HRI