Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properties: Refactoring & Minor fix

Browse source 
- Extract functions for
* determining whether it's a file or dir
* showing stats for dir or file without id3

- Remove typedef for struct
- Fix unit string not being displayed correctly during scanning
(use %s instead of %cB)

Change-Id: I31440ebd96bca791a96c66511c3de9727608218a
This commit is contained in:
Christian Soffke 2022-04-15 19:12:37 +02:00 committed by William Wilgus
parent da2eaf3bf7
commit b7603adc64
1 changed files with 109 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
apps/plugins/properties.c
View file

@ -24,6 +24,14 @@
#define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0]))
#endif #endif
struct dir_stats {
char dirname[MAX_PATH];
int len;
unsigned int dir_count;
unsigned int file_count;
unsigned long long byte_count;
};
enum props_types { enum props_types {
PROPS_FILE = 0, PROPS_FILE = 0,
PROPS_ID3, PROPS_ID3,
@ -34,18 +42,17 @@ static int props_type = PROPS_FILE;
static struct mp3entry id3; static struct mp3entry id3;
char str_filename[MAX_PATH]; static char str_filename[MAX_PATH];
char str_dirname[MAX_PATH]; static char str_dirname[MAX_PATH];
char str_size[64]; static char str_size[64];
char str_dircount[64]; static char str_dircount[64];
char str_filecount[64]; static char str_filecount[64];
char str_date[64]; static char str_date[64];
char str_time[64]; static char str_time[64];
unsigned nseconds; static unsigned long nsize;
unsigned long nsize; static int32_t size_unit;
int32_t size_unit; static struct tm tm;
struct tm tm;
#define NUM_FILE_PROPERTIES 5 #define NUM_FILE_PROPERTIES 5
static const unsigned char* const props_file[] = static const unsigned char* const props_file[] =
@ -128,15 +135,7 @@ static bool file_properties(const char* selected_file)
return found; return found;
} }
typedef struct { static bool _dir_properties(struct dir_stats *stats)
char dirname[MAX_PATH];
int len;
unsigned int dc;
unsigned int fc;
unsigned long long bc;
} DPS;
static bool _dir_properties(DPS *dps)
{ {
/* recursively scan directories in search of files /* recursively scan directories in search of files
and informs the user of the progress */ and informs the user of the progress */
@ -147,11 +146,11 @@ static bool _dir_properties(DPS *dps)
struct dirent* entry; struct dirent* entry;
result = true; result = true;
dirlen = rb->strlen(dps->dirname); dirlen = rb->strlen(stats->dirname);
dir = rb->opendir(dps->dirname); dir = rb->opendir(stats->dirname);
if (!dir) if (!dir)
{ {
rb->splashf(HZ*2, "%s", dps->dirname); rb->splashf(HZ*2, "%s", stats->dirname);
return false; /* open error */ return false; /* open error */
} }
@ -160,7 +159,7 @@ static bool _dir_properties(DPS *dps)
{ {
struct dirinfo info = rb->dir_get_info(dir, entry); struct dirinfo info = rb->dir_get_info(dir, entry);
/* append name to current directory */ /* append name to current directory */
rb->snprintf(dps->dirname+dirlen, dps->len-dirlen, "/%s", rb->snprintf(stats->dirname+dirlen, stats->len-dirlen, "/%s",
entry->d_name); entry->d_name);
if (info.attribute & ATTR_DIRECTORY) if (info.attribute & ATTR_DIRECTORY)
@ -169,29 +168,30 @@ static bool _dir_properties(DPS *dps)
!rb->strcmp((char *)entry->d_name, "..")) !rb->strcmp((char *)entry->d_name, ".."))
continue; /* skip these */ continue; /* skip these */
dps->dc++; /* new directory */ stats->dir_count++; /* new directory */
if (*rb->current_tick - lasttick > (HZ/8)) if (*rb->current_tick - lasttick > (HZ/8))
{ {
unsigned log; unsigned log;
lasttick = *rb->current_tick; lasttick = *rb->current_tick;
rb->lcd_clear_display(); rb->lcd_clear_display();
rb->lcd_puts(0,0,"SCANNING..."); rb->lcd_puts(0,0,"SCANNING...");
rb->lcd_puts(0,1,dps->dirname); rb->lcd_puts(0,1,stats->dirname);
rb->lcd_putsf(0,2,"Directories: %d", dps->dc); rb->lcd_putsf(0,2,"Directories: %d", stats->dir_count);
rb->lcd_putsf(0,3,"Files: %d", dps->fc); rb->lcd_putsf(0,3,"Files: %d", stats->file_count);
log = human_size_log(dps->bc); log = human_size_log(stats->byte_count);
rb->lcd_putsf(0,4,"Size: %lu %cB", (unsigned long)(dps->bc >> (10*log)), rb->lcd_putsf(0,4,"Size: %lu %s",
(unsigned long)(stats->byte_count >> (10*log)),
rb->str(units[log])); rb->str(units[log]));
rb->lcd_update(); rb->lcd_update();
} }
/* recursion */ /* recursion */
result = _dir_properties(dps); result = _dir_properties(stats);
} }
else else
{ {
dps->fc++; /* new file */ stats->file_count++; /* new file */
dps->bc += info.size; stats->byte_count += info.size;
} }
if(ACTION_STD_CANCEL == rb->get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) if(ACTION_STD_CANCEL == rb->get_action(CONTEXT_STD,TIMEOUT_NOBLOCK))
result = false; result = false;
@ -201,17 +201,17 @@ static bool _dir_properties(DPS *dps)
return result; return result;
} }
static bool dir_properties(const char* selected_file, DPS *dps) static bool dir_properties(const char* selected_file, struct dir_stats *stats)
{ {
unsigned log; unsigned log;
rb->strlcpy(dps->dirname, selected_file, MAX_PATH); rb->strlcpy(stats->dirname, selected_file, MAX_PATH);
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true); rb->cpu_boost(true);
#endif #endif
if (!_dir_properties(dps)) if (!_dir_properties(stats))
{ {
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(false); rb->cpu_boost(false);
@ -224,10 +224,10 @@ static bool dir_properties(const char* selected_file, DPS *dps)
#endif #endif
rb->strlcpy(str_dirname, selected_file, MAX_PATH); rb->strlcpy(str_dirname, selected_file, MAX_PATH);
rb->snprintf(str_dircount, sizeof str_dircount, "%d", dps->dc); rb->snprintf(str_dircount, sizeof str_dircount, "%d", stats->dir_count);
rb->snprintf(str_filecount, sizeof str_filecount, "%d", dps->fc); rb->snprintf(str_filecount, sizeof str_filecount, "%d", stats->file_count);
log = human_size_log(dps->bc); log = human_size_log(stats->byte_count);
nsize = (long) (dps->bc >> (log*10)); nsize = (long) (stats->byte_count >> (log*10));
size_unit = units[log]; size_unit = units[log];
rb->snprintf(str_size, sizeof str_size, "%ld %s", nsize, rb->str(size_unit)); rb->snprintf(str_size, sizeof str_size, "%ld %s", nsize, rb->str(size_unit));
return true; return true;
@ -255,7 +255,7 @@ static const char * get_props(int selected_item, void* data,
static int speak_property_selection(int selected_item, void *data) static int speak_property_selection(int selected_item, void *data)
{ {
DPS *dps = data; struct dir_stats *stats = data;
int32_t id = P2ID((props_type == PROPS_DIR ? props_dir : props_file)[selected_item]); int32_t id = P2ID((props_type == PROPS_DIR ? props_dir : props_file)[selected_item]);
rb->talk_id(id, false); rb->talk_id(id, false);
switch (id) switch (id)
@ -295,10 +295,10 @@ static int speak_property_selection(int selected_item, void *data)
rb->talk_time(&tm, true); rb->talk_time(&tm, true);
break; break;
case LANG_PROPERTIES_SUBDIRS: case LANG_PROPERTIES_SUBDIRS:
rb->talk_number(dps->dc, true); rb->talk_number(stats->dir_count, true);
break; break;
case LANG_PROPERTIES_FILES: case LANG_PROPERTIES_FILES:
rb->talk_number(dps->fc, true); rb->talk_number(stats->file_count, true);
break; break;
default: default:
rb->talk_spell(props_file[selected_item + 1], true); rb->talk_spell(props_file[selected_item + 1], true);
@ -307,34 +307,49 @@ static int speak_property_selection(int selected_item, void *data)
return 0; return 0;
} }
enum plugin_status plugin_start(const void* parameter) static int browse_file_or_dir(struct dir_stats *stats)
{ {
struct gui_synclist properties_lists; struct gui_synclist properties_lists;
int button; int button;
bool quit = false, usb = false;
const char *file = parameter;
if(!parameter || (file[0] != '/')) return PLUGIN_ERROR;
#ifdef HAVE_TOUCHSCREEN rb->gui_synclist_init(&properties_lists, &get_props, stats, false, 2, NULL);
rb->touchscreen_set_mode(rb->global_settings->touch_mode); rb->gui_synclist_set_title(&properties_lists,
#endif rb->str(props_type == PROPS_DIR ?
LANG_PROPERTIES_DIRECTORY_PROPERTIES :
LANG_PROPERTIES_FILE_PROPERTIES),
NOICON);
rb->gui_synclist_set_icon_callback(&properties_lists, NULL);
if (rb->global_settings->talk_menu)
rb->gui_synclist_set_voice_callback(&properties_lists, speak_property_selection);
rb->gui_synclist_set_nb_items(&properties_lists,
2 * (props_type == PROPS_FILE ? NUM_FILE_PROPERTIES :
NUM_DIR_PROPERTIES));
rb->gui_synclist_select_item(&properties_lists, 0);
rb->gui_synclist_draw(&properties_lists);
rb->gui_synclist_speak_item(&properties_lists);
static DPS dps = { while(true)
.len = MAX_PATH, {
.dc = 0, button = rb->get_action(CONTEXT_LIST, HZ);
.fc = 0, /* HZ so the status bar redraws corectly */
.bc = 0, if (rb->gui_synclist_do_button(&properties_lists,&button))
}; continue;
switch(button)
{
case ACTION_STD_CANCEL:
return false;
default:
if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
return true;
break;
}
}
}
/* determine if it's a file or a directory */ static bool determine_file_or_dir(void)
bool found = false; {
DIR* dir; DIR* dir;
struct dirent* entry; struct dirent* entry;
char* ptr = rb->strrchr(file, '/') + 1;
int dirlen = (ptr - file);
rb->strlcpy(str_dirname, file, dirlen + 1);
rb->snprintf(str_filename, sizeof str_filename, "%s", file+dirlen);
dir = rb->opendir(str_dirname); dir = rb->opendir(str_dirname);
if (dir) if (dir)
@ -345,15 +360,39 @@ enum plugin_status plugin_start(const void* parameter)
{ {
struct dirinfo info = rb->dir_get_info(dir, entry); struct dirinfo info = rb->dir_get_info(dir, entry);
props_type = info.attribute & ATTR_DIRECTORY ? PROPS_DIR : PROPS_FILE; props_type = info.attribute & ATTR_DIRECTORY ? PROPS_DIR : PROPS_FILE;
found = true; rb->closedir(dir);
break; return true;
} }
} }
rb->closedir(dir); rb->closedir(dir);
} }
/* now we know if it's a file or a dir or maybe something failed */ return false;
}
if(!found) enum plugin_status plugin_start(const void* parameter)
{
static struct dir_stats stats =
{
.len = MAX_PATH,
.dir_count = 0,
.file_count = 0,
.byte_count = 0,
};
const char *file = parameter;
if(!parameter || (file[0] != '/')) return PLUGIN_ERROR;
#ifdef HAVE_TOUCHSCREEN
rb->touchscreen_set_mode(rb->global_settings->touch_mode);
#endif
const char* file_name = rb->strrchr(file, '/') + 1;
int dirlen = (file_name - file);
rb->strlcpy(str_dirname, file, dirlen + 1);
rb->snprintf(str_filename, sizeof str_filename, "%s", file+dirlen);
if(!determine_file_or_dir())
{ {
/* weird: we couldn't find the entry. This Should Never Happen (TM) */ /* weird: we couldn't find the entry. This Should Never Happen (TM) */
rb->splashf(0, "File/Dir not found: %s", file); rb->splashf(0, "File/Dir not found: %s", file);
@ -362,7 +401,7 @@ enum plugin_status plugin_start(const void* parameter)
} }
/* get the info depending on its_a_dir */ /* get the info depending on its_a_dir */
if(!(props_type == PROPS_DIR ? dir_properties(file, &dps) : file_properties(file))) if(!(props_type == PROPS_DIR ? dir_properties(file, &stats) : file_properties(file)))
{ {
/* something went wrong (to do: tell user what it was (nesting,...) */ /* something went wrong (to do: tell user what it was (nesting,...) */
rb->splash(0, ID2P(LANG_PROPERTIES_FAIL)); rb->splash(0, ID2P(LANG_PROPERTIES_FAIL));
@ -373,47 +412,8 @@ enum plugin_status plugin_start(const void* parameter)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
rb->viewportmanager_theme_enable(i, true, NULL); rb->viewportmanager_theme_enable(i, true, NULL);
if (props_type == PROPS_ID3) bool usb = props_type == PROPS_ID3 ? rb->browse_id3(&id3, 0, 0) :
usb = rb->browse_id3(&id3, 0, 0); browse_file_or_dir(&stats);
else
{
rb->gui_synclist_init(&properties_lists, &get_props, &dps, false, 2, NULL);
rb->gui_synclist_set_title(&properties_lists,
rb->str(props_type == PROPS_DIR ?
LANG_PROPERTIES_DIRECTORY_PROPERTIES :
LANG_PROPERTIES_FILE_PROPERTIES),
NOICON);
rb->gui_synclist_set_icon_callback(&properties_lists, NULL);
if (rb->global_settings->talk_menu)
rb->gui_synclist_set_voice_callback(&properties_lists, speak_property_selection);
rb->gui_synclist_set_nb_items(&properties_lists,
2 * (props_type == PROPS_FILE ? NUM_FILE_PROPERTIES :
NUM_DIR_PROPERTIES));
rb->gui_synclist_select_item(&properties_lists, 0);
rb->gui_synclist_draw(&properties_lists);
rb->gui_synclist_speak_item(&properties_lists);
while(!quit)
{
button = rb->get_action(CONTEXT_LIST, HZ);
/* HZ so the status bar redraws corectly */
if (rb->gui_synclist_do_button(&properties_lists, &button))
continue;
switch(button)
{
case ACTION_STD_CANCEL:
quit = true;
break;
default:
if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
{
quit = true;
usb = true;
}
break;
}
}
}
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
rb->viewportmanager_theme_undo(i, false); rb->viewportmanager_theme_undo(i, false);