5 files changed, 224 insertions, 14 deletions

diff --git a/apps/plugins/lib/arg_helper.c b/apps/plugins/lib/arg_helper.c
index 3ea5ba714d..63b7acbb2b 100644
--- a/apps/plugins/lib/arg_helper.c
+++ b/apps/plugins/lib/arg_helper.c
@@ -31,7 +31,7 @@
 #ifdef PLUGIN
     #define strchr rb->strchr
 #endif
-int string_parse(const char **parameter, char* buf, size_t buf_sz)
+int string_parse(const char **parameter, char *buf, size_t buf_sz)
 {
 /* fills buf with a string upto buf_sz, null terminates the buffer
  * strings break on WS by default but can be enclosed in single or double quotes
@@ -44,6 +44,11 @@ int string_parse(const char **parameter, char* buf, size_t buf_sz)
     char stopchars[] = "\'\"";
     int skipped = 0;
     int found = 0;
+    if (!parameter || !*parameter)
+    {
+        *buf = '\0';
+        return 0;
+    }
     const char* start = *parameter;
 
     if (strchr(stopchars, *start))
@@ -79,7 +84,7 @@ int string_parse(const char **parameter, char* buf, size_t buf_sz)
     return found + skipped;
 }
 
-int char_parse(const char **parameter, char* character)
+int char_parse(const char **parameter, char *character)
 {
 /* passes *character a single character eats remaining non-WS characters */
     char buf[2];
@@ -95,6 +100,8 @@ int bool_parse(const char **parameter, bool *choice)
 /* determine true false using the first character the rest are skipped/ignored */
     int found = 0;
     const char tf_val[]="fn0ty1";/* false chars on left f/t should be balanced fffttt */
+    if (!parameter || !*parameter)
+        return 0;
     const char* start = *parameter;
 
 
@@ -133,7 +140,9 @@ int longnum_parse(const char **parameter, long *number, long *decimal)
     int neg = 0;
     int digits = 0;
     //logf ("n: %s\n", *parameter);
-    const char *start = *parameter;
+    if (!parameter || !*parameter)
+        return 0;
+    const char* start = *parameter;
 
     if (*start == '-')
     {
@@ -209,7 +218,8 @@ int num_parse(const char **parameter, int *number, int *decimal)
 * Note: WS at beginning is stripped, **parameter starts at the first NON WS char
 * return 0 for arg_callback to quit parsing immediately
 */
-void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char argchar, const char **parameter))
+void argparse(const char *parameter, int parameter_len, void *userdata,
+        int (*arg_callback)(char argchar, const char **parameter, void *userdata))
 {
     bool lastchr;
     char argchar;
@@ -222,7 +232,10 @@ void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char
             {
                 if ((*parameter) == '\0')
                     return;
-                logf ("%s\n",parameter);
+
+                if (parameter_len < 0) { logf ("%s\n", parameter); }
+                else { logf ("%.*s\n", plen, parameter); }
+
                 argchar = *parameter;
                 lastchr = (*(parameter + 1) == '\0');
                 while (*++parameter || lastchr)
@@ -230,7 +243,7 @@ void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char
                     lastchr = false;
                     if (isspace(*parameter))
                         continue; /* eat spaces at beginning */
-                    if (!arg_callback(argchar, &parameter))
+                    if (!arg_callback(argchar, &parameter, userdata))
                         return;
                     break;
                 }
diff --git a/apps/plugins/lib/arg_helper.h b/apps/plugins/lib/arg_helper.h
index 2cf94ba1dd..638279ee42 100644
--- a/apps/plugins/lib/arg_helper.h
+++ b/apps/plugins/lib/arg_helper.h
@@ -54,7 +54,7 @@ int num_parse(const char **parameter, int *number, int *decimal);
 * Note: WS at beginning is stripped, **parameter starts at the first NON WS char
 * return 0 for arg_callback to quit parsing immediately
 */
-void argparse(const char *parameter, int parameter_len,
-              int (*arg_callback)(char argchar, const char **parameter));
+void argparse(const char *parameter, int parameter_len, void *userdata,
+         int (*arg_callback)(char argchar, const char **parameter, void *userdata));
 
 #endif /* _LIB_ARG_HELPER_H_ */
diff --git a/apps/plugins/lib/id3.c b/apps/plugins/lib/id3.c
index b0202b1d9c..6af715b1fb 100644
--- a/apps/plugins/lib/id3.c
+++ b/apps/plugins/lib/id3.c
@@ -35,5 +35,5 @@ bool retrieve_id3(struct mp3entry *id3, const char* file)
     }
 #endif
 
-    return !rb->mp3info(id3, file);
+    return rb->get_metadata(id3, -1, file);
 }
diff --git a/apps/plugins/lib/mul_id3.c b/apps/plugins/lib/mul_id3.c
index edf44f7282..3ab3a438c8 100644
--- a/apps/plugins/lib/mul_id3.c
+++ b/apps/plugins/lib/mul_id3.c
@@ -40,6 +40,13 @@ struct multiple_tracks_id3 {
 
 static struct multiple_tracks_id3 mul_id3;
 
+static const int32_t units[] =
+{
+    LANG_BYTE,
+    LANG_KIBIBYTE,
+    LANG_MEBIBYTE,
+    LANG_GIBIBYTE
+};
 
 /* Calculate modified FNV hash of string
  * has good avalanche behaviour and uniform distribution
@@ -130,9 +137,7 @@ void collect_id3(struct mp3entry *id3, bool is_first_track)
     mul_id3.filesize += id3->filesize;
 }
 
-/* (!) Note scale factor applied to returned metadata:
- *     - Unit for filesize will be KiB instead of Bytes
- *     - Unit for length will be s instead of ms
+/* (!) Note unit conversion below
  *
  *     Use result only as input for browse_id3,
  *     with the track_ct parameter set to  > 1.
@@ -159,8 +164,8 @@ void finalize_id3(struct mp3entry *id3)
     id3->track_string = NULL;
     id3->year_string = NULL;
     id3->year = mul_id3.year;
-    mul_id3.length /= 1000;
-    mul_id3.filesize >>= 10;
+    mul_id3.length /= 1000;  /* convert from ms to s */
+    mul_id3.filesize >>= 10; /* convert from B to KiB */
     id3->length = mul_id3.length > ULONG_MAX ? 0 : mul_id3.length;
     id3->filesize = mul_id3.filesize > INT_MAX ? 0 : mul_id3.filesize;
     id3->frequency = mul_id3.frequency;
@@ -172,3 +177,163 @@ void finalize_id3(struct mp3entry *id3)
     id3->track_level = 0;
     id3->album_level = 0;
 }
+
+unsigned long human_size(unsigned long long byte_count, int32_t *unit_lang_id)
+{
+    const size_t n = sizeof(units)/sizeof(units[0]);
+    unsigned int i;
+
+    /* margin set at 10K boundary: 10239 B +1 => 10 KB */
+    for(i = 0; i < n-1 && byte_count >= 10*1024; i++)
+        byte_count >>= 10; /* div by 1024 */
+
+    *unit_lang_id = units[i];
+    return (unsigned long)byte_count;
+}
+
+/* missing filetype attribute for images */
+static const char *image_exts[] = {"bmp","jpg","jpe","jpeg","png","ppm"};
+/* and videos */
+static const char *video_exts[] = {"mpg","mpeg","mpv","m2v"};
+
+static void display_dir_stats_vp(struct dir_stats *stats, struct viewport *vp,
+                                 struct screen *display)
+{
+    int32_t lang_size_unit;
+    unsigned long display_size = human_size(stats->byte_count, &lang_size_unit);
+    struct viewport *last_vp = display->set_viewport(vp);
+    display->clear_viewport();
+    display->putsf(0, 0, "Files: %d (%lu %s)", stats->file_count,
+                   display_size, rb->str(lang_size_unit));
+    display->putsf(0, 1, "Audio: %d", stats->audio_file_count);
+    if (stats->count_all)
+    {
+        display->putsf(0, 2, "Playlists: %d", stats->m3u_file_count);
+        display->putsf(0, 3, "Images: %d", stats->img_file_count);
+        display->putsf(0, 4, "Videos: %d", stats->vid_file_count);
+        display->putsf(0, 5, "Directories: %d", stats->dir_count);
+        display->putsf(0, 6, "Max files in Dir: %d", stats->max_files_in_dir);
+    }
+    else
+        display->putsf(0, 2, "Directories: %d", stats->dir_count);
+
+    display->update_viewport();
+    display->set_viewport(last_vp);
+}
+
+void display_dir_stats(struct dir_stats *stats)
+{
+    struct viewport vps[NB_SCREENS];
+    FOR_NB_SCREENS(i)
+    {
+        rb->viewport_set_defaults(&vps[i], i);
+        display_dir_stats_vp(stats, &vps[i], rb->screens[i]);
+    }
+}
+
+/* Recursively scans directories in search of files
+ * and informs the user of the progress.
+ */
+bool collect_dir_stats(struct dir_stats *stats, bool (*id3_cb)(const char*))
+{
+    bool result = true;
+    unsigned int files_in_dir = 0;
+    static unsigned int id3_count;
+    static unsigned long last_displayed, last_get_action;
+    struct dirent* entry;
+    int dirlen = rb->strlen(stats->dirname);
+    DIR* dir =  rb->opendir(stats->dirname);
+    if (!dir)
+    {
+        rb->splashf(HZ*2, "open error: %s", stats->dirname);
+        return false;
+    }
+    else if (!stats->dirname[1]) /* root dir */
+        stats->dirname[0] = dirlen = 0;
+
+    /* walk through the directory content */
+    while(result && (0 != (entry = rb->readdir(dir))))
+    {
+        struct dirinfo info = rb->dir_get_info(dir, entry);
+        if (info.attribute & ATTR_DIRECTORY)
+        {
+            if (!rb->strcmp((char *)entry->d_name, ".") ||
+                !rb->strcmp((char *)entry->d_name, ".."))
+                continue; /* skip these */
+
+            rb->snprintf(stats->dirname + dirlen, sizeof(stats->dirname) - dirlen,
+                         "/%s", entry->d_name); /* append name to current directory */
+            if (!id3_cb)
+            {
+                stats->dir_count++; /* new directory */
+                if (*rb->current_tick - last_displayed > (HZ/2))
+                {
+                    if (last_displayed)
+                        display_dir_stats(stats);
+                    last_displayed = *(rb->current_tick);
+                }
+            }
+            result = collect_dir_stats(stats, id3_cb); /* recursion */
+        }
+        else if (!id3_cb)
+        {
+            char *ptr;
+            stats->file_count++; /* new file */
+            files_in_dir++;
+            stats->byte_count += info.size;
+
+            int attr = rb->filetype_get_attr(entry->d_name);
+            if (attr == FILE_ATTR_AUDIO)
+                stats->audio_file_count++;
+            else if (attr == FILE_ATTR_M3U)
+                stats->m3u_file_count++;
+            /* image or video file attributes have to be compared manually */
+            else if (stats->count_all &&
+                     (ptr = rb->strrchr(entry->d_name,'.')))
+            {
+                unsigned int i;
+                ptr++;
+                for(i = 0; i < ARRAYLEN(image_exts); i++)
+                {
+                    if(!rb->strcasecmp(ptr, image_exts[i]))
+                    {
+                        stats->img_file_count++;
+                        break;
+                    }
+                }
+                if (i >= ARRAYLEN(image_exts)) {
+                    for(i = 0; i < ARRAYLEN(video_exts); i++) {
+                        if(!rb->strcasecmp(ptr, video_exts[i])) {
+                            stats->vid_file_count++;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        else if (rb->filetype_get_attr(entry->d_name) == FILE_ATTR_AUDIO)
+        {
+            rb->splash_progress(id3_count++, stats->audio_file_count,
+                                "%s (%s)",
+                                rb->str(LANG_WAIT), rb->str(LANG_OFF_ABORT));
+            rb->snprintf(stats->dirname + dirlen, sizeof(stats->dirname) - dirlen,
+                         "/%s", entry->d_name); /* append name to current directory */
+            id3_cb(stats->dirname); /* allow metadata to be collected */
+        }
+
+        if (TIME_AFTER(*(rb->current_tick), last_get_action + HZ/8))
+        {
+            if(ACTION_STD_CANCEL == rb->get_action(CONTEXT_STD,TIMEOUT_NOBLOCK))
+            {
+                stats->canceled = true;
+                result = false;
+            }
+            last_get_action = *(rb->current_tick);
+        }
+        rb->yield();
+    }
+    rb->closedir(dir);
+    if (stats->max_files_in_dir < files_in_dir)
+        stats->max_files_in_dir = files_in_dir;
+    return result;
+}
diff --git a/apps/plugins/lib/mul_id3.h b/apps/plugins/lib/mul_id3.h
index d08095de5c..1bb311c441 100644
--- a/apps/plugins/lib/mul_id3.h
+++ b/apps/plugins/lib/mul_id3.h
@@ -21,7 +21,39 @@
 #ifndef MUL_ID3_H
 #define MUL_ID3_H
 
+struct dir_stats {
+    char dirname[MAX_PATH];
+    unsigned int dir_count;
+    unsigned int file_count;
+    unsigned int audio_file_count;
+    unsigned int m3u_file_count;
+    unsigned int img_file_count;
+    unsigned int vid_file_count;
+    unsigned int max_files_in_dir;
+    unsigned long long byte_count;
+    bool count_all;
+    bool canceled;
+};
+
+/* create mp3entry that contains matching metadata from multiple tracks */
 void collect_id3(struct mp3entry *id3, bool is_first_track);
 void finalize_id3(struct mp3entry *id3);
 
+/* Traverse directory, collecting stats/track metadata.
+ *
+ * 1) If id3_cb is null, dir_properties calculates all dir stats, including the
+ * audio file count.
+ *
+ * 2) If id3_cb points to a function, dir_properties will call it for every audio
+ * file encountered, to allow the file's metadata to be collected. The displayed
+ * progress bar's maximum value is set to the audio file count.
+ * Stats are assumed to have already been generated by a preceding run.
+ *
+ * If the count_all parameter is set to false, images and videos are not counted,
+ * nor is the playlist, image, video or max file in dir count displayed.
+ */
+bool collect_dir_stats(struct dir_stats *stats, bool (*id3_cb)(const char*));
+void display_dir_stats(struct dir_stats *stats);
+unsigned long human_size(unsigned long long byte_count, int32_t *unit_lang_id);
+
 #endif /* MUL_ID3_H */