From fc93b17640f5422a257ed648fc7c0b0969f25f11 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 4 May 2024 23:25:35 +0200 Subject: [PATCH] rename YOUTUBE_DEV_KEY => YOUTUBE_API_KEY Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4d01fa773ad32319994f762cbf56528ab93fac9f Author: vanhofen Date: 2024-05-04 (Sat, 04 May 2024) Origin message was: ------------------ - rename YOUTUBE_DEV_KEY => YOUTUBE_API_KEY ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 18 +++++++++--------- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 4 ++-- data/locale/slovak.locale | 4 ++-- src/gui/miscsettings_menu.cpp | 20 ++++++++++---------- src/gui/miscsettings_menu.h | 2 +- src/neutrino.cpp | 13 +++++++++---- src/system/locals.h | 4 ++-- src/system/locals_intern.h | 4 ++-- src/system/setting_helpers.h | 2 +- src/system/settings.h | 2 +- version_pseudo.h | 2 +- 12 files changed, 42 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 5e1792201..bf9243e69 100644 --- a/configure.ac +++ b/configure.ac @@ -251,12 +251,12 @@ AC_ARG_WITH(omdb-api-key, AC_DEFINE_UNQUOTED([OMDB_API_KEY], ["$OMDB_API_KEY"], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service]) AC_ARG_ENABLE([omdb-key-manage], - AS_HELP_STRING([--enable-omdb-key-manage], [enable manage omdb (imdb) api dev key via gui for additional movie informations @<:@default=yes@:>@]), + AS_HELP_STRING([--enable-omdb-key-manage], [enable manage omdb (imdb) api key via gui for additional movie informations @<:@default=yes@:>@]), [enable_omdb_key_manage="$enableval"], [enable_omdb_key_manage="yes"]) if test "$enable_omdb_key_manage" = "yes" ; then - AC_DEFINE([ENABLE_OMDB_KEY_MANAGE], 1, [enable manage omdb (imdb) api dev key via gui for additional movie informations]) + AC_DEFINE([ENABLE_OMDB_KEY_MANAGE], 1, [enable manage omdb (imdb) api key via gui for additional movie informations]) fi # omdb end @@ -278,19 +278,19 @@ fi # shoutcast end # youtube -AC_ARG_WITH(youtube-dev-key, - AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming]), - [YOUTUBE_DEV_KEY="$withval"], - [YOUTUBE_DEV_KEY=""]) -AC_DEFINE_UNQUOTED([YOUTUBE_DEV_KEY], ["$YOUTUBE_DEV_KEY"], [API dev key for YouTube streaming]) +AC_ARG_WITH(youtube-api-key, + AS_HELP_STRING([--with-youtube-api-key=KEY], [API key for YouTube streaming]), + [YOUTUBE_API_KEY="$withval"], + [YOUTUBE_API_KEY=""]) +AC_DEFINE_UNQUOTED([YOUTUBE_API_KEY], ["$YOUTUBE_API_KEY"], [API key for YouTube streaming]) AC_ARG_ENABLE([youtube-key-manage], - AS_HELP_STRING([--enable-youtube-key-manage], [enable manage YouTube dev key via gui @<:@default=yes@:>@]), + AS_HELP_STRING([--enable-youtube-key-manage], [enable manage YouTube api key via gui @<:@default=yes@:>@]), [enable_youtube_key_manage="$enableval"], [enable_youtube_key_manage="yes"]) if test "$enable_youtube_key_manage" = "yes" ; then - AC_DEFINE([ENABLE_YOUTUBE_KEY_MANAGE], 1, [enable manage YouTube dev key via gui]) + AC_DEFINE([ENABLE_YOUTUBE_KEY_MANAGE], 1, [enable manage YouTube api key via gui]) fi # youtube end diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index df68c1400..525a011a4 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1950,7 +1950,7 @@ menu.hint_webtv_setup Hier konfigurierte WebTV-Kanäle finden Sie in der Kanalve menu.hint_webtv_xml_auto Lädt automatisch alle WebTV-Dateien aus %s/ und %s/ menu.hint_window_size Kanalliste, EPG-Infos und einige andere Fenster werden mit diesem Faktor skaliert menu.hint_xmltv_setup Hier konfigurieren Sie XMLTV-Dateien, die EPG-Daten enthalten -menu.hint_youtube_dev_id Geben Sie die YouTube Dev ID ein. Eine leere Eingabe schaltet die YouTube-Unterstützung aus +menu.hint_youtube_api_key Geben Sie den YouTube API Schlüssel ein. Eine leere Eingabe schaltet die YouTube-Unterstützung aus menu.hint_youtube_enabled Schaltet die YouTube-Unterstützung (für Plugins) ein oder aus menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschaltet werden kann menu.next Weiter @@ -3118,7 +3118,7 @@ xmltv.xml.add Hinzufügen xmltv.xml.del Entfernen xmltv.xml.enter Eintragen xmltv.xml.reload Neu laden -youtube.dev_id YouTube Dev ID +youtube.api_key YouTube API Schlüssel youtube.enabled YouTube-Unterstützung (für Plugins) zapit.scantype Service-Auswahl zapit.scantype.all Alle Services diff --git a/data/locale/english.locale b/data/locale/english.locale index 997a7ba33..247c59135 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1950,7 +1950,7 @@ menu.hint_webtv_setup WebTV channels configured here will be available in the st menu.hint_webtv_xml_auto Auto-load all existing WebTV files from %s/ and %s/ menu.hint_window_size Channellist, EPG-infos and some other windows are scaled by this factor menu.hint_xmltv_setup Configure XMLTV files with EPG data to describe TV listings -menu.hint_youtube_dev_id Type your YouTube Dev ID. An empty input disables YouTube support +menu.hint_youtube_api_key Type your YouTube API key. An empty input disables YouTube support menu.hint_youtube_enabled Enable or disable YouTube support (for plugins) menu.hint_zap_cycle When swithing channels, stay in current bouquet menu.next Next @@ -3118,7 +3118,7 @@ xmltv.xml.add Add xmltv.xml.del Remove xmltv.xml.enter Enter xmltv.xml.reload Reload -youtube.dev_id YouTube Dev ID +youtube.api_key YouTube API key youtube.enabled YouTube support (for plugins) zapit.scantype scan for services zapit.scantype.all all services diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 62341adc2..adcbbab60 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -1888,7 +1888,7 @@ menu.hint_webtv_setup Tu nakonfigurované WebTV kanály budú k dispozícii v š menu.hint_webtv_xml_auto Automatické načítanie všetkých existujúcich XML súborov z %s/ a %s/ menu.hint_window_size Zoznam kanálov, EPG-Infp a niektoré iné okná sú zmenšené týmto faktorom menu.hint_xmltv_setup Nakonfigurujte súbory XMLTV s údajmi EPG na opis televíznych zoznamov -menu.hint_youtube_dev_id Zadajte vaše YouTube Dev ID. Prázdne zadanie zabranuje podpore YouTube +menu.hint_youtube_api_key Zadajte vaše YouTube API key. Prázdne zadanie zabranuje podpore YouTube menu.hint_youtube_enabled Povolenie alebo zakázanie podpory YouTube menu.hint_zap_cycle Pri prepínaní kanálov zotrvať v aktuálnom bukete menu.next Ďalej @@ -3003,7 +3003,7 @@ xmltv.xml.add Pridať xmltv.xml.del Odstrániť xmltv.xml.enter Zadať xmltv.xml.reload Obnoviť -youtube.dev_id YouTube Dev ID +youtube.api_key YouTube API key youtube.enabled YouTube podpora zapit.scantype Vyhľadávanie kanálov zapit.scantype.all Všetky diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 63b70fc09..1b2d9ba8f 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -685,15 +685,15 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices() ms_oservices->addItem(GenericMenuSeparator); // youtube - youtube_onoff = new CMenuOptionChooser(LOCALE_YOUTUBE_ENABLED, &g_settings.youtube_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_youtube_dev_id()); + youtube_onoff = new CMenuOptionChooser(LOCALE_YOUTUBE_ENABLED, &g_settings.youtube_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_youtube_api_key()); youtube_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_ENABLED); ms_oservices->addItem(youtube_onoff); #if ENABLE_YOUTUBE_KEY_MANAGE - changeNotify(LOCALE_YOUTUBE_DEV_ID, NULL); - CKeyboardInput youtube_dev_id_input(LOCALE_YOUTUBE_DEV_ID, &g_settings.youtube_dev_id, 39, this); - CMenuForwarder *mf_yt = new CMenuForwarder(LOCALE_YOUTUBE_DEV_ID, true, youtube_dev_id_short, &youtube_dev_id_input); - mf_yt->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_DEV_ID); + changeNotify(LOCALE_YOUTUBE_API_KEY, NULL); + CKeyboardInput youtube_api_key_input(LOCALE_YOUTUBE_API_KEY, &g_settings.youtube_api_key, 39, this); + CMenuForwarder *mf_yt = new CMenuForwarder(LOCALE_YOUTUBE_API_KEY, true, youtube_api_key_short, &youtube_api_key_input); + mf_yt->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_API_KEY); ms_oservices->addItem(mf_yt); #endif @@ -868,14 +868,14 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void */*data*/ shoutcast_dev_id_short.clear(); shoutcast_onoff->setActive(CApiKey::check_shoutcast_dev_id()); } - else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID)) + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_API_KEY)) { - g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_dev_id(); + g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_api_key(); if (g_settings.youtube_enabled) - youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "..."; + youtube_api_key_short = g_settings.youtube_api_key.substr(0, 8) + "..."; else - youtube_dev_id_short.clear(); - youtube_onoff->setActive(CApiKey::check_youtube_dev_id()); + youtube_api_key_short.clear(); + youtube_onoff->setActive(CApiKey::check_youtube_api_key()); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_STREAMING_PORT)) { diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index f4c45cc65..f40d4871b 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -70,7 +70,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver std::string tmdb_api_key_short; std::string omdb_api_key_short; - std::string youtube_dev_id_short; + std::string youtube_api_key_short; std::string shoutcast_dev_id_short; int showMiscSettingsMenu(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 91e191847..e4367cc3f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1129,12 +1129,12 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.weather_location = configfile.getString("weather_location", WEATHER_DEFAULT_LOCATION); g_settings.weather_postalcode = configfile.getString("weather_postalcode", WEATHER_DEFAULT_POSTALCODE); - g_settings.youtube_dev_id = YOUTUBE_DEV_KEY; + g_settings.youtube_api_key = YOUTUBE_API_KEY; #if ENABLE_YOUTUBE_KEY_MANAGE - g_settings.youtube_dev_id = configfile.getString("youtube_dev_id", g_settings.youtube_dev_id.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.youtube_dev_id); + g_settings.youtube_api_key = configfile.getString("youtube_api_key", g_settings.youtube_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.youtube_api_key); #endif g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); - g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_dev_id(); + g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_api_key(); g_settings.tmdb_api_key = TMDB_API_KEY; #if ENABLE_TMDB_KEY_MANAGE @@ -1500,6 +1500,11 @@ void CNeutrinoApp::upgradeSetup(const char * fname) configfile.deleteKey("glcd_weather_curr_x_position"); configfile.deleteKey("glcd_weather_next_x_position"); } + if (g_settings.version_pseudo < "20240405210000") + { + g_settings.youtube_api_key = configfile.getString("youtube_dev_id", g_settings.youtube_api_key); + configfile.deleteKey("youtube_dev_id"); + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); @@ -2029,7 +2034,7 @@ void CNeutrinoApp::saveSetup(const char *fname) configfile.setString("weather_postalcode", g_settings.weather_postalcode); #if ENABLE_YOUTUBE_KEY_MANAGE - configfile.setString("youtube_dev_id", g_settings.youtube_dev_id); + configfile.setString("youtube_api_key", g_settings.youtube_api_key); #endif configfile.setInt32("youtube_enabled", g_settings.youtube_enabled); diff --git a/src/system/locals.h b/src/system/locals.h index 1284ece01..89070f826 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1977,7 +1977,7 @@ typedef enum LOCALE_MENU_HINT_WEBTV_XML_AUTO, LOCALE_MENU_HINT_WINDOW_SIZE, LOCALE_MENU_HINT_XMLTV_SETUP, - LOCALE_MENU_HINT_YOUTUBE_DEV_ID, + LOCALE_MENU_HINT_YOUTUBE_API_KEY, LOCALE_MENU_HINT_YOUTUBE_ENABLED, LOCALE_MENU_HINT_ZAP_CYCLE, LOCALE_MENU_NEXT, @@ -3145,7 +3145,7 @@ typedef enum LOCALE_XMLTV_XML_DEL, LOCALE_XMLTV_XML_ENTER, LOCALE_XMLTV_XML_RELOAD, - LOCALE_YOUTUBE_DEV_ID, + LOCALE_YOUTUBE_API_KEY, LOCALE_YOUTUBE_ENABLED, LOCALE_ZAPIT_SCANTYPE, LOCALE_ZAPIT_SCANTYPE_ALL, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 028202794..e9e6e2872 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1977,7 +1977,7 @@ const char * locale_real_names[] = "menu.hint_webtv_xml_auto", "menu.hint_window_size", "menu.hint_xmltv_setup", - "menu.hint_youtube_dev_id", + "menu.hint_youtube_api_key", "menu.hint_youtube_enabled", "menu.hint_zap_cycle", "menu.next", @@ -3145,7 +3145,7 @@ const char * locale_real_names[] = "xmltv.xml.del", "xmltv.xml.enter", "xmltv.xml.reload", - "youtube.dev_id", + "youtube.api_key", "youtube.enabled", "zapit.scantype", "zapit.scantype.all", diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index a93fc4d49..daf972f95 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -166,7 +166,7 @@ class CApiKey return ((api_key_setting != api_key_pattern) && !api_key_setting.empty()); } static int check_shoutcast_dev_id() { return CApiKey::check_api_key(g_settings.shoutcast_dev_id, "XXXXXXXXXXXXXXXX"); } - static int check_youtube_dev_id() { return CApiKey::check_api_key(g_settings.youtube_dev_id, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } + static int check_youtube_api_key() { return CApiKey::check_api_key(g_settings.youtube_api_key, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } static int check_weather_api_key() { return CApiKey::check_api_key(g_settings.weather_api_key, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } static int check_tmdb_api_key() { return CApiKey::check_api_key(g_settings.tmdb_api_key, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } static int check_omdb_api_key() { return CApiKey::check_api_key(g_settings.omdb_api_key, "XXXXXXXX"); } diff --git a/src/system/settings.h b/src/system/settings.h index 6d5263afa..1e913a187 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -945,7 +945,7 @@ struct SNeutrinoSettings std::string weather_location; std::string weather_postalcode; - std::string youtube_dev_id; + std::string youtube_api_key; int youtube_enabled; std::string tmdb_api_key; diff --git a/version_pseudo.h b/version_pseudo.h index 21cf0ec6b..3307cc143 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20221129210000" +#define NEUTRINO_VERSION_PSEUDO "20240405210000"