4 files changed, 25 insertions, 38 deletions

diff --git a/apps/plugins/lib/mul_id3.c b/apps/plugins/lib/mul_id3.c
index 5c8f4d9d9c..c40a495ecd 100644
--- a/apps/plugins/lib/mul_id3.c
+++ b/apps/plugins/lib/mul_id3.c
@@ -22,8 +22,8 @@
 #include "mul_id3.h"
 
 struct multiple_tracks_id3 {
-    unsigned long length;
-    unsigned long filesize;
+    unsigned long long filesize;
+    unsigned long long length;
     unsigned long frequency;
     unsigned int artist_hash;
     unsigned int composer_hash;
@@ -35,8 +35,6 @@ struct multiple_tracks_id3 {
     unsigned int codectype;
     unsigned int bitrate;
     int year;
-    bool filesize_ovf;
-    bool length_ovf;
     bool vbr;
 };
 
@@ -64,7 +62,7 @@ static unsigned int mfnv(char *str)
     return hash;
 }
 
-void init_mul_id3(void)
+static void init_mul_id3(void)
 {
     mul_id3.artist_hash = 0;
     mul_id3.album_hash = 0;
@@ -80,14 +78,13 @@ void init_mul_id3(void)
     mul_id3.length = 0;
     mul_id3.filesize = 0;
     mul_id3.year = 0;
-    mul_id3.length_ovf = false;
-    mul_id3.filesize_ovf = false;
 }
 
 void collect_id3(struct mp3entry *id3, bool is_first_track)
 {
     if (is_first_track)
     {
+        init_mul_id3();
         mul_id3.artist_hash = mfnv(id3->artist);
         mul_id3.album_hash = mfnv(id3->album);
         mul_id3.genre_hash = mfnv(id3->genre_string);
@@ -129,25 +126,18 @@ void collect_id3(struct mp3entry *id3, bool is_first_track)
         if (mul_id3.year && (id3->year != mul_id3.year))
             mul_id3.year = 0;
     }
-
-    if (ULONG_MAX - mul_id3.length < id3->length)
-    {
-        mul_id3.length_ovf = true;
-        mul_id3.length = 0;
-    }
-    else if (!mul_id3.length_ovf)
-        mul_id3.length += id3->length;
-
-    if (INT_MAX - mul_id3.filesize < id3->filesize) /* output_dyn_value expects int */
-    {
-        mul_id3.filesize_ovf = true;
-        mul_id3.filesize = 0;
-    }
-    else if (!mul_id3.filesize_ovf)
-        mul_id3.filesize += id3->filesize;
+    mul_id3.length += id3->length;
+    mul_id3.filesize += id3->filesize;
 }
 
-void write_id3_mul_tracks(struct mp3entry *id3)
+/* (!) 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
+ *
+ *     Use result only as input for browse_id3,
+ *     and set multiple_tracks parameter to true.
+ */
+void finalize_id3(struct mp3entry *id3)
 {
     id3->path[0] = '\0';
     id3->title = NULL;
@@ -169,8 +159,10 @@ void write_id3_mul_tracks(struct mp3entry *id3)
     id3->track_string = NULL;
     id3->year_string = NULL;
     id3->year = mul_id3.year;
-    id3->length = mul_id3.length;
-    id3->filesize = mul_id3.filesize;
+    mul_id3.length /= 1000;
+    mul_id3.filesize >>= 10;
+    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;
     id3->bitrate = mul_id3.bitrate;
     id3->codectype = mul_id3.codectype;
diff --git a/apps/plugins/lib/mul_id3.h b/apps/plugins/lib/mul_id3.h
index 40d7fa7822..d08095de5c 100644
--- a/apps/plugins/lib/mul_id3.h
+++ b/apps/plugins/lib/mul_id3.h
@@ -21,8 +21,7 @@
 #ifndef MUL_ID3_H
 #define MUL_ID3_H
 
-void init_mul_id3(void);
 void collect_id3(struct mp3entry *id3, bool is_first_track);
-void write_id3_mul_tracks(struct mp3entry *id3);
+void finalize_id3(struct mp3entry *id3);
 
 #endif /* MUL_ID3_H */
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 3b308d1866..52f87355b2 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -4000,8 +4000,6 @@ static int show_id3_info(const char *selected_file)
     const char *file_name;
     bool is_multiple_tracks = insert_whole_album && pf_tracks.count > 1;
 
-    init_mul_id3();
-
     last_tick = *(rb->current_tick) + HZ/2;
     rb->splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */
     i = 0;
@@ -4027,9 +4025,9 @@ static int show_id3_info(const char *selected_file)
     } while (++i < pf_tracks.count && is_multiple_tracks);
 
     if (is_multiple_tracks)
-        write_id3_mul_tracks(&id3);
+        finalize_id3(&id3);
 
-    return rb->browse_id3(&id3, 0, 0, NULL) ? PLUGIN_USB_CONNECTED : 0;
+    return rb->browse_id3(&id3, 0, 0, NULL, i > 1) ? PLUGIN_USB_CONNECTED : 0;
 }
 
 
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 27bfe9181a..638d7380a5 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -406,14 +406,12 @@ enum plugin_status plugin_start(const void* parameter)
     if (!rb->strcmp(file, MAKE_ACT_STR(ACTIVITY_DATABASEBROWSER))) /* db table selected */
     {
         props_type = PROPS_MUL_ID3;
-        init_mul_id3();
         mul_id3_count = 0;
 
         if (!rb->tagtree_subentries_do_action(&mul_id3_add) || mul_id3_count == 0)
             return PLUGIN_ERROR;
-
-        if (mul_id3_count > 1) /* otherwise, the retrieved id3 can be used as-is */
-            write_id3_mul_tracks(&id3);
+        else if (mul_id3_count > 1) /* otherwise, the retrieved id3 can be used as-is */
+            finalize_id3(&id3);
     }
     else
 #endif
@@ -448,8 +446,8 @@ enum plugin_status plugin_start(const void* parameter)
     FOR_NB_SCREENS(i)
         rb->viewportmanager_theme_enable(i, true, NULL);
 
-    bool usb =  props_type == PROPS_ID3 ?     rb->browse_id3(&id3, 0, 0, &tm)  :
-               (props_type == PROPS_MUL_ID3 ? rb->browse_id3(&id3, 0, 0, NULL) :
+    bool usb =  props_type == PROPS_ID3 ?     rb->browse_id3(&id3, 0, 0, &tm, false)  :
+               (props_type == PROPS_MUL_ID3 ? rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count > 1) :
                                               browse_file_or_dir(&stats));
 
     FOR_NB_SCREENS(i)