len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-07-10 13:29:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

shortcuts: eliminate unnecessary nesting

Browse source 
Reduces GNU Complexity scores for:

* shortcut_menu_speak_item: 66 -> 10
* do_shortcut_menu: 39 -> 20
* readline_cb: 29 -> 16

Change-Id: Ic648a7eb1e51d4a116bc8af61f1ed1c617cee024
This commit is contained in:
Christian Soffke 2026-06-05 13:42:43 +02:00
parent 86decaab9e
commit 1add6b0dd5
1 changed files with 235 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

481
apps/shortcuts.c
View file

@ -334,106 +334,102 @@ static int readline_cb(int n, char *buf, void *parameters)
return 1; return 1;
init_shortcut(sc); init_shortcut(sc);
*param = sc; *param = sc;
return 0;
} }
else if (sc && settings_parseline(buf, &name, &value))
{
static const char * const nm_options[] = {"type", "name", "data",
"icon", "talkclip", NULL};
int nm_op = string_option(name, nm_options, false);
if (nm_op == 0) /*type*/ if (!sc || !settings_parseline(buf, &name, &value))
return 0;
static const char * const nm_options[] = {"type", "name", "data",
"icon", "talkclip", NULL};
int nm_op = string_option(name, nm_options, false);
if (nm_op == 0) /*type*/
{
int t = 0;
for (t=0; t<SHORTCUT_TYPE_COUNT && sc->type == SHORTCUT_UNDEFINED; t++)
if (!strcmp(value, type_strings[t]))
sc->type = t;
}
else if (nm_op == 1) /*name*/
strmemccpy(sc->name, value, MAX_SHORTCUT_NAME);
else if (nm_op == 2) /*data*/
{
switch (sc->type)
{ {
int t = 0; case SHORTCUT_UNDEFINED:
for (t=0; t<SHORTCUT_TYPE_COUNT && sc->type == SHORTCUT_UNDEFINED; t++) case SHORTCUT_TYPE_COUNT:
if (!strcmp(value, type_strings[t])) *param = NULL;
sc->type = t; break;
} case SHORTCUT_BROWSER:
else if (nm_op == 1) /*name*/
{
strmemccpy(sc->name, value, MAX_SHORTCUT_NAME);
}
else if (nm_op == 2) /*data*/
{
switch (sc->type)
{ {
case SHORTCUT_UNDEFINED: char *p = strmemccpy(sc->u.path, value, MAX_PATH);
case SHORTCUT_TYPE_COUNT: if (p && dir_exists(value))
*param = NULL;
break;
case SHORTCUT_BROWSER:
{ {
char *p = strmemccpy(sc->u.path, value, MAX_PATH); /* ensure ending slash */
if (p && dir_exists(value)) *p = '\0';
{ if (*(p-2) != '/')
/* ensure ending slash */ *(p-1) = '/';
*p = '\0';
if (*(p-2) != '/')
*(p-1) = '/';
}
break;
} }
case SHORTCUT_FILE: break;
case SHORTCUT_DEBUGITEM: }
case SHORTCUT_PLAYLISTMENU: case SHORTCUT_FILE:
case SHORTCUT_DEBUGITEM:
case SHORTCUT_PLAYLISTMENU:
{
strmemccpy(sc->u.path, value, MAX_PATH);
break;
}
case SHORTCUT_SETTING_APPLY:
case SHORTCUT_SETTING:
/* can handle 'name: value' pair for either type */
if (settings_parseline(value, &name, &value))
{ {
sc->setting = find_setting_by_cfgname(name);
strmemccpy(sc->u.path, value, MAX_PATH); strmemccpy(sc->u.path, value, MAX_PATH);
break;
} }
case SHORTCUT_SETTING_APPLY: else /* force SHORTCUT_SETTING, no 'name: value' pair */
case SHORTCUT_SETTING: {
/* can handle 'name: value' pair for either type */ sc->type = SHORTCUT_SETTING;
if (settings_parseline(value, &name, &value)) sc->setting = find_setting_by_cfgname(value);
{ }
sc->setting = find_setting_by_cfgname(name); break;
strmemccpy(sc->u.path, value, MAX_PATH); case SHORTCUT_TIME:
}
else /* force SHORTCUT_SETTING, no 'name: value' pair */
{
sc->type = SHORTCUT_SETTING;
sc->setting = find_setting_by_cfgname(value);
}
break;
case SHORTCUT_TIME:
#if CONFIG_RTC #if CONFIG_RTC
sc->u.timedata.talktime = false; sc->u.timedata.talktime = false;
if (!strcasecmp(value, "talk")) if (!strcasecmp(value, "talk"))
sc->u.timedata.talktime = true; sc->u.timedata.talktime = true;
else else
#endif #endif
if (!strncasecmp(value, "sleep", sizeof("sleep")-1)) if (!strncasecmp(value, "sleep", sizeof("sleep")-1))
{ {
/* 'sleep' may appear alone or followed by number after a space */ /* 'sleep' may appear alone or followed by number after a space */
if (strlen(value) > sizeof("sleep")) /* sizeof 1 larger (+space chr..) */ if (strlen(value) > sizeof("sleep")) /* sizeof 1 larger (+space chr..) */
sc->u.timedata.sleep_timeout = atoi(&value[sizeof("sleep")-1]); sc->u.timedata.sleep_timeout = atoi(&value[sizeof("sleep")-1]);
else
sc->u.timedata.sleep_timeout = -1;
}
else else
sc->type = SHORTCUT_UNDEFINED; /* error */ sc->u.timedata.sleep_timeout = -1;
break; }
case SHORTCUT_SEPARATOR: else
case SHORTCUT_SHUTDOWN: sc->type = SHORTCUT_UNDEFINED; /* error */
case SHORTCUT_REBOOT: break;
break; case SHORTCUT_SEPARATOR:
} case SHORTCUT_SHUTDOWN:
} case SHORTCUT_REBOOT:
else if (nm_op == 3) /*icon*/ break;
{
if (!strcmp(value, "filetype") && sc->type != SHORTCUT_SETTING
&& sc->type != SHORTCUT_SETTING_APPLY && sc->u.path[0])
{
sc->icon = filetype_get_icon(filetype_get_attr(sc->u.path));
}
else
{
sc->icon = atoi(value);
}
}
else if (nm_op == 4) /*talkclip*/
{
strmemccpy(sc->talk_clip, value, MAX_PATH);
} }
} }
else if (nm_op == 3) /*icon*/
{
if (!strcmp(value, "filetype") && sc->type != SHORTCUT_SETTING
&& sc->type != SHORTCUT_SETTING_APPLY && sc->u.path[0])
{
sc->icon = filetype_get_icon(filetype_get_attr(sc->u.path));
}
else
sc->icon = atoi(value);
}
else if (nm_op == 4) /*talkclip*/
strmemccpy(sc->talk_clip, value, MAX_PATH);
return 0; return 0;
} }
@ -538,90 +534,86 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
{ {
(void)data; (void)data;
struct shortcut *sc = get_shortcut(selected_item, NULL); struct shortcut *sc = get_shortcut(selected_item, NULL);
if (sc)
if (!sc)
return 0;
if (sc->talk_clip[0])
{ {
if (sc->talk_clip[0]) talk_file(NULL, NULL, sc->talk_clip, NULL, NULL, false);
return 0;
}
switch (sc->type)
{
case SHORTCUT_BROWSER:;
DIR* dir;
struct dirent* entry;
char* slash = strrchr(sc->u.path, PATH_SEPCH);
char* filename = slash + 1;
if (!slash || *filename == '\0')
{ {
talk_file(NULL, NULL, sc->talk_clip, NULL, NULL, false); talk_dir_or_spell(sc->u.path, NULL, false);
break;
} }
else
*slash = '\0'; /* terminate the path to open the directory */
dir = opendir(sc->u.path);
*slash = PATH_SEPCH; /* restore fullpath */
if (dir)
{ {
switch (sc->type) while ((entry = readdir(dir)))
{ {
case SHORTCUT_BROWSER: if (strcmp(entry->d_name, filename))
{ continue;
DIR* dir;
struct dirent* entry;
char* slash = strrchr(sc->u.path, PATH_SEPCH);
char* filename = slash + 1;
if (slash && *filename != '\0')
{
*slash = '\0'; /* terminate the path to open the directory */
dir = opendir(sc->u.path);
*slash = PATH_SEPCH; /* restore fullpath */
if (dir)
{
while (0 != (entry = readdir(dir)))
{
if (!strcmp(entry->d_name, filename))
{
struct dirinfo info = dir_get_info(dir, entry);
if (info.attribute & ATTR_DIRECTORY) struct dirinfo info = dir_get_info(dir, entry);
talk_dir_or_spell(sc->u.path, NULL, false);
else
talk_file_or_spell(NULL, sc->u.path, NULL, false);
closedir(dir); if (info.attribute & ATTR_DIRECTORY)
return 0; talk_dir_or_spell(sc->u.path, NULL, false);
}
}
closedir(dir);
}
}
else
{
talk_dir_or_spell(sc->u.path, NULL, false);
break;
}
talk_spell(sc->u.path, false);
}
break;
case SHORTCUT_FILE:
case SHORTCUT_PLAYLISTMENU:
talk_file_or_spell(NULL, sc->u.path, NULL, false);
break;
case SHORTCUT_SETTING_APPLY:
case SHORTCUT_SETTING:
talk_id(sc->setting->lang_id, false);
if (sc->type == SHORTCUT_SETTING_APPLY)
talk_spell(sc->u.path, true);
break;
case SHORTCUT_TIME:
#if CONFIG_RTC
if (sc->u.timedata.talktime)
talk_timedate();
else else
#endif talk_file_or_spell(NULL, sc->u.path, NULL, false);
if (sc->name[0] && sc->u.timedata.sleep_timeout >= 0)
talk_spell(sc->name, false); closedir(dir);
else return 0;
talk_sleeptimer(sc->u.timedata.sleep_timeout);
break;
case SHORTCUT_SHUTDOWN:
case SHORTCUT_REBOOT:
if (!sc->name[0])
{
talk_spell(type_strings[sc->type], false);
break;
}
/* fall-through */
default:
talk_spell(sc->name[0] ? sc->name : sc->u.path, false);
break;
} }
closedir(dir);
} }
talk_spell(sc->u.path, false);
break;
case SHORTCUT_FILE:
case SHORTCUT_PLAYLISTMENU:
talk_file_or_spell(NULL, sc->u.path, NULL, false);
break;
case SHORTCUT_SETTING_APPLY:
case SHORTCUT_SETTING:
talk_id(sc->setting->lang_id, false);
if (sc->type == SHORTCUT_SETTING_APPLY)
talk_spell(sc->u.path, true);
break;
case SHORTCUT_TIME:
#if CONFIG_RTC
if (sc->u.timedata.talktime)
talk_timedate();
else
#endif
if (sc->name[0] && sc->u.timedata.sleep_timeout >= 0)
talk_spell(sc->name, false);
else
talk_sleeptimer(sc->u.timedata.sleep_timeout);
break;
case SHORTCUT_SHUTDOWN:
case SHORTCUT_REBOOT:
if (!sc->name[0])
{
talk_spell(type_strings[sc->type], false);
break;
}
/* fall-through */
default:
talk_spell(sc->name[0] ? sc->name : sc->u.path, false);
break;
} }
return 0; return 0;
} }
@ -721,6 +713,7 @@ static void apply_new_setting(const struct settings_list *setting)
int do_shortcut_menu(void *ignored) int do_shortcut_menu(void *ignored)
{ {
(void)ignored; (void)ignored;
char timer_buf[10];
struct simplelist_info list; struct simplelist_info list;
struct shortcut *sc; struct shortcut *sc;
int done = GO_TO_PREVIOUS; int done = GO_TO_PREVIOUS;
@ -750,104 +743,100 @@ int do_shortcut_menu(void *ignored)
list.get_talk = global_settings.talk_menu ? shortcut_menu_speak_item : NULL; list.get_talk = global_settings.talk_menu ? shortcut_menu_speak_item : NULL;
if (simplelist_show_list(&list)) if (simplelist_show_list(&list))
break; /* some error happened?! */ break; /* returning from USB screen */
if (list.selection == -1) if (list.selection == -1)
break; break; /* canceled */
else
sc = get_shortcut(list.selection, NULL);
if (!sc)
continue;
switch (sc->type)
{ {
sc = get_shortcut(list.selection, NULL); case SHORTCUT_PLAYLISTMENU:
if (!file_exists(sc->u.path))
if (!sc) splash(HZ, ID2P(LANG_NO_FILES));
continue; else
onplay_show_playlist_menu(sc->u.path,
switch (sc->type) dir_exists(sc->u.path) ?
{ ATTR_DIRECTORY :
case SHORTCUT_PLAYLISTMENU: filetype_get_attr(sc->u.path),
if (!file_exists(sc->u.path)) NULL);
splash(HZ, ID2P(LANG_NO_FILES)); break;
else case SHORTCUT_FILE:
onplay_show_playlist_menu(sc->u.path, if (!file_exists(sc->u.path))
dir_exists(sc->u.path) ? ATTR_DIRECTORY : {
filetype_get_attr(sc->u.path), splash(HZ, ID2P(LANG_NO_FILES));
NULL);
break; break;
case SHORTCUT_FILE: }
if (!file_exists(sc->u.path)) /* else fall through */
{ case SHORTCUT_BROWSER:
splash(HZ, ID2P(LANG_NO_FILES)); if (open_plugin_add_path(ID2P(LANG_SHORTCUTS),
break; sc->u.path, NULL) != 0)
} {
/* else fall through */ done = GO_TO_PLUGIN;
case SHORTCUT_BROWSER:
if (open_plugin_add_path(ID2P(LANG_SHORTCUTS),
sc->u.path, NULL) != 0)
{
done = GO_TO_PLUGIN;
break;
}
struct browse_context browse = {
.dirfilter = SHOW_ALL, /* ignored for SHORTCUT_BROWSER */
.icon = Icon_NOICON,
.root = sc->u.path,
};
if (sc->type == SHORTCUT_FILE)
browse.flags = BROWSE_RUNFILE | BROWSE_DIRFILTER;
done = rockbox_browse(&browse);
break; break;
case SHORTCUT_SETTING_APPLY:; }
bool theme_changed; struct browse_context browse = {
string_to_cfg(sc->setting->cfg_name, sc->u.path, &theme_changed); .dirfilter = SHOW_ALL, /* ignored for SHORTCUT_BROWSER */
settings_save(); .icon = Icon_NOICON,
apply_new_setting(sc->setting); .root = sc->u.path,
break; };
case SHORTCUT_SETTING: if (sc->type == SHORTCUT_FILE)
do_setting_screen(sc->setting, sc->name[0] ? browse.flags = BROWSE_RUNFILE | BROWSE_DIRFILTER;
sc->name : P2STR(ID2P(sc->setting->lang_id)), done = rockbox_browse(&browse);
NULL); break;
apply_new_setting(sc->setting); case SHORTCUT_SETTING_APPLY:;
break; bool theme_changed;
case SHORTCUT_DEBUGITEM: string_to_cfg(sc->setting->cfg_name, sc->u.path, &theme_changed);
run_debug_screen(sc->u.path); settings_save();
break; apply_new_setting(sc->setting);
case SHORTCUT_SHUTDOWN: break;
case SHORTCUT_SETTING:
do_setting_screen(sc->setting, sc->name[0] ?
sc->name : P2STR(ID2P(sc->setting->lang_id)),
NULL);
apply_new_setting(sc->setting);
break;
case SHORTCUT_DEBUGITEM:
run_debug_screen(sc->u.path);
break;
case SHORTCUT_SHUTDOWN:
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
if (charger_inserted()) if (charger_inserted())
charging_splash(); charging_splash();
else else
#endif #endif
sys_poweroff(); sys_poweroff();
break; break;
case SHORTCUT_REBOOT: case SHORTCUT_REBOOT:
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
if (charger_inserted()) if (charger_inserted())
charging_splash(); charging_splash();
else else
#endif #endif
sys_reboot(); sys_reboot();
break; break;
case SHORTCUT_TIME: case SHORTCUT_TIME:
#if CONFIG_RTC #if CONFIG_RTC
if (!sc->u.timedata.talktime) if (sc->u.timedata.talktime)
break;
#endif #endif
{ if (sc->u.timedata.sleep_timeout < 0)
char timer_buf[10]; {
if (sc->u.timedata.sleep_timeout >= 0) toggle_sleeptimer();
{
set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
format_sleeptimer(timer_buf, sizeof(timer_buf),
sc->u.timedata.sleep_timeout,
NULL));
}
else
toggle_sleeptimer();
}
break; break;
case SHORTCUT_UNDEFINED: }
default: set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
break; splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
} format_sleeptimer(timer_buf, sizeof(timer_buf),
sc->u.timedata.sleep_timeout,
NULL));
break;
case SHORTCUT_UNDEFINED:
default:
break;
} }
} }
if (GO_TO_PLUGIN == done) if (GO_TO_PLUGIN == done)