mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Api keys: add class instead single functions to check api keys

Browse Source 
Without class build was broken, with static versions it should working.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d6a4db686
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2018-04-29 03:13:08 +02:00
committed by vanhofen
parent 0bca1ee7d8
commit 66532c9a5c
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/miscsettings_menu.cpp
View File

@@ -579,7 +579,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
CMenuForwarder *mf = NULL; CMenuForwarder *mf = NULL;
// tmdb // tmdb
tmdb_onoff = new CMenuOptionChooser(LOCALE_TMDB_ENABLED, &g_settings.tmdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_tmdb_api_key()); tmdb_onoff = new CMenuOptionChooser(LOCALE_TMDB_ENABLED, &g_settings.tmdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_tmdb_api_key());
tmdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_TMDB_ENABLED); tmdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_TMDB_ENABLED);
ms_oservices->addItem(tmdb_onoff); ms_oservices->addItem(tmdb_onoff);
@@ -594,7 +594,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
#endif #endif
// omdb // omdb
omdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_omdb_api_key()); omdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_omdb_api_key());
// omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED); // omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED);
ms_oservices->addItem(omdb_onoff); ms_oservices->addItem(omdb_onoff);
@@ -609,7 +609,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
#endif #endif
// youtube // youtube
youtube_onoff = new CMenuOptionChooser(LOCALE_YOUTUBE_ENABLED, &g_settings.youtube_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, 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_dev_id());
youtube_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_ENABLED); youtube_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_ENABLED);
ms_oservices->addItem(youtube_onoff); ms_oservices->addItem(youtube_onoff);
@@ -624,7 +624,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
#endif #endif
//shoutcast //shoutcast
shoutcast_onoff = new CMenuOptionChooser(LOCALE_SHOUTCAST_ENABLED, &g_settings.shoutcast_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, check_shoutcast_dev_id()); shoutcast_onoff = new CMenuOptionChooser(LOCALE_SHOUTCAST_ENABLED, &g_settings.shoutcast_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_shoutcast_dev_id());
shoutcast_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SHOUTCAST_ENABLED); shoutcast_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SHOUTCAST_ENABLED);
ms_oservices->addItem(shoutcast_onoff); ms_oservices->addItem(shoutcast_onoff);
@@ -749,39 +749,39 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
#endif #endif
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_TMDB_API_KEY)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_TMDB_API_KEY))
{ {
g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); g_settings.tmdb_enabled = g_settings.tmdb_enabled && CApiKey::check_tmdb_api_key();
if (g_settings.tmdb_enabled) if (g_settings.tmdb_enabled)
tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "..."; tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "...";
else else
tmdb_api_key_short.clear(); tmdb_api_key_short.clear();
tmdb_onoff->setActive(check_tmdb_api_key()); tmdb_onoff->setActive(CApiKey::check_tmdb_api_key());
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_IMDB_API_KEY)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_IMDB_API_KEY))
{ {
g_settings.omdb_enabled = g_settings.omdb_enabled && check_omdb_api_key(); g_settings.omdb_enabled = g_settings.omdb_enabled && CApiKey::check_omdb_api_key();
if (g_settings.omdb_enabled) if (g_settings.omdb_enabled)
omdb_api_key_short = g_settings.omdb_api_key.substr(0, 8) + "..."; omdb_api_key_short = g_settings.omdb_api_key.substr(0, 8) + "...";
else else
omdb_api_key_short.clear(); omdb_api_key_short.clear();
omdb_onoff->setActive(check_omdb_api_key()); omdb_onoff->setActive(CApiKey::check_omdb_api_key());
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID))
{ {
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_dev_id();
if (g_settings.youtube_enabled) if (g_settings.youtube_enabled)
youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "..."; youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "...";
else else
youtube_dev_id_short.clear(); youtube_dev_id_short.clear();
youtube_onoff->setActive(check_youtube_dev_id()); youtube_onoff->setActive(CApiKey::check_youtube_dev_id());
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SHOUTCAST_DEV_ID)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SHOUTCAST_DEV_ID))
{ {
g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && CApiKey::check_shoutcast_dev_id();
if (g_settings.shoutcast_enabled) if (g_settings.shoutcast_enabled)
shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "..."; shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "...";
else else
shoutcast_dev_id_short.clear(); shoutcast_dev_id_short.clear();
shoutcast_onoff->setActive(check_shoutcast_dev_id()); shoutcast_onoff->setActive(CApiKey::check_shoutcast_dev_id());
} }
return ret; return ret;
} }

8
src/neutrino.cpp
View File

@@ -946,19 +946,19 @@ int CNeutrinoApp::loadSetup(const char * fname)
std::string yt_api_key = YT_DEV_KEY; std::string yt_api_key = YT_DEV_KEY;
g_settings.youtube_dev_id = configfile.getString("youtube_dev_id", yt_api_key.empty() ? "AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM" : yt_api_key); g_settings.youtube_dev_id = configfile.getString("youtube_dev_id", yt_api_key.empty() ? "AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM" : yt_api_key);
g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_dev_id();
std::string tmdb_api_key = TMDB_DEV_KEY; std::string tmdb_api_key = TMDB_DEV_KEY;
g_settings.tmdb_api_key = configfile.getString("tmdb_api_key", tmdb_api_key.empty() ? "7270f1b571c4ecbb5b204ddb7f8939b1" : tmdb_api_key); g_settings.tmdb_api_key = configfile.getString("tmdb_api_key", tmdb_api_key.empty() ? "7270f1b571c4ecbb5b204ddb7f8939b1" : tmdb_api_key);
g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1); g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1);
g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); g_settings.tmdb_enabled = g_settings.tmdb_enabled && CApiKey::check_tmdb_api_key();
std::string omdb_api_key = OMDB_API_KEY; std::string omdb_api_key = OMDB_API_KEY;
g_settings.omdb_api_key = configfile.getString("omdb_api_key", omdb_api_key.empty() ? "XXXXXXXX" : omdb_api_key); g_settings.omdb_api_key = configfile.getString("omdb_api_key", omdb_api_key.empty() ? "XXXXXXXX" : omdb_api_key);
g_settings.omdb_enabled = configfile.getInt32("omdb_enabled", 1); g_settings.omdb_enabled = configfile.getInt32("omdb_enabled", 1);
g_settings.omdb_enabled = g_settings.omdb_enabled && check_omdb_api_key(); g_settings.omdb_enabled = g_settings.omdb_enabled && CApiKey::check_omdb_api_key();
std::string sc_api_key = SHOUTCAST_DEV_KEY; std::string sc_api_key = SHOUTCAST_DEV_KEY;
g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id", sc_api_key.empty() ? "fa1669MuiRPorUBw" : sc_api_key); g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id", sc_api_key.empty() ? "fa1669MuiRPorUBw" : sc_api_key);
g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1);
g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && CApiKey::check_shoutcast_dev_id();
//Filebrowser //Filebrowser
g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1); g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1);

19
src/system/setting_helpers.h
View File

@@ -158,14 +158,17 @@ class CAutoModeNotifier : public CChangeObserver
bool changeNotify(const neutrino_locale_t, void * data); bool changeNotify(const neutrino_locale_t, void * data);
}; };
//do we need a class? class CApiKey
int check_api_key(const std::string& api_key_setting, const std::string& api_key_pattern)
{ {
return ((api_key_setting != api_key_pattern) && !api_key_setting.empty()); public:
} static int check_api_key(const std::string& api_key_setting, const std::string& api_key_pattern)
inline int check_shoutcast_dev_id() { return check_api_key(g_settings.shoutcast_dev_id, "XXXXXXXXXXXXXXXX"); } {
inline int check_youtube_dev_id() { return check_api_key(g_settings.youtube_dev_id, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } return ((api_key_setting != api_key_pattern) && !api_key_setting.empty());
inline int check_tmdb_api_key() { return check_api_key(g_settings.tmdb_api_key, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } }
inline int check_omdb_api_key() { return check_api_key(g_settings.omdb_api_key, "XXXXXXXX"); } 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_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"); }
};
#endif #endif