mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename YOUTUBE_DEV_KEY => YOUTUBE_API_KEY

Browse Source 
Origin commit data
------------------
Commit: 4d01fa773a
Author: vanhofen <vanhofen@gmx.de>
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
# Conflicts:
#	data/locale/slovak.locale
This commit is contained in:
vanhofen
2024-05-04 23:25:35 +02:00
committed by Thilo Graf
parent 8254c984e3
commit e58aea8b6d
12 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/neutrino.cpp
View File

@@ -1125,12 +1125,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
@@ -1496,6 +1496,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);
@@ -2025,7 +2030,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);