Fix utils::Dir::Size() issue on missing filter. (#1364)

Andrei Popescu · web-flow · commit 2df8993ef9d7 · 2022-11-03T16:07:47.000+01:00
When filter was not passed to the olp::utils::Dir::Size() method than
all files were filtered out resulting always in 0 size returned back.
This is not fixed.

Relates-To: OLPEDGE-2700

Signed-off-by: Andrei Popescu &lt;andrei.popescu@here.com&gt;

Signed-off-by: Andrei Popescu &lt;andrei.popescu@here.com&gt;
diff --git a/olp-cpp-sdk-core/src/utils/Dir.cpp b/olp-cpp-sdk-core/src/utils/Dir.cpp
@@ -465,7 +465,7 @@ uint64_t Dir::Size(const std::string& path, FilterFunction filter_fn) {
       if (::lstat64(full_path.c_str(), &path_stat) == 0) {
 #endif
         if (S_ISREG(path_stat.st_mode)) {
-          if (filter_fn && filter_fn(entry_name)) {
+          if (!filter_fn || filter_fn(entry_name)) {
             result += path_stat.st_size;
           }
         } else if (S_ISDIR(path_stat.st_mode)) {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ uint64_t Dir::Size(const std::string& path, FilterFunction filter_fn) {`
`465`	`465`	`if (::lstat64(full_path.c_str(), &path_stat) == 0) {`
`466`	`466`	`#endif`
`467`	`467`	`if (S_ISREG(path_stat.st_mode)) {`
`468`		`- if (filter_fn && filter_fn(entry_name)) {`
	`468`	`+ if (!filter_fn \|\| filter_fn(entry_name)) {`
`469`	`469`	`result += path_stat.st_size;`
`470`	`470`	`}`
`471`	`471`	`} else if (S_ISDIR(path_stat.st_mode)) {`