Use base::paths type in base::has_file_extension() function

Instead of using a CSV string with each string separated by comma (,) we can use the new base::paths type.
aseprite · Feb 20, 2018 · b8af51a · b8af51a
1 parent 2d295fd
commit b8af51a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/base/fs.cpp b/base/fs.cpp
@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -201,21 +201,13 @@ std::string normalize_path(const std::string& filename)
   return fn;
 }
 
-bool has_file_extension(const std::string& filename, const std::string& csv_extensions)
+bool has_file_extension(const std::string& filename, const base::paths& extensions)
 {
   if (!filename.empty()) {
-    std::string ext = base::string_to_lower(get_file_extension(filename));
-
-    int extsz = (int)ext.size();
-    std::string::const_iterator p =
-      std::search(csv_extensions.begin(),
-                  csv_extensions.end(),
-                  ext.begin(), ext.end());
-
-    if ((p != csv_extensions.end()) &&
-        ((p+extsz) == csv_extensions.end() || *(p+extsz) == ',') &&
-        (p == csv_extensions.begin() || *(p-1) == ','))
-      return true;
+    const std::string ext = get_file_extension(filename);
+    for (const auto& e : extensions)
+      if (utf8_icmp(ext, e) == 0)
+        return true;
   }
   return false;
 }

diff --git a/base/fs.h b/base/fs.h
@@ -83,9 +83,9 @@ namespace base {
   std::string normalize_path(const std::string& filename);
 
   // Returns true if the filename contains one of the specified
-  // extensions. The cvs_extensions parameter must be a set of
-  // possible extensions separated by comma.
-  bool has_file_extension(const std::string& filename, const std::string& csv_extensions);
+  // extensions. The "extensions" parameter must be a set of possible
+  // extensions.
+  bool has_file_extension(const std::string& filename, const base::paths& extensions);
 
   int compare_filenames(const std::string& a, const std::string& b);
 

diff --git a/base/fs_tests.cpp b/base/fs_tests.cpp
@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -143,14 +143,18 @@ TEST(FS, RemovePathSeparator)
 
 TEST(FS, HasFileExtension)
 {
-  EXPECT_TRUE (has_file_extension("hi.png", "png"));
-  EXPECT_FALSE(has_file_extension("hi.png", "pngg"));
-  EXPECT_FALSE(has_file_extension("hi.png", "ppng"));
-  EXPECT_TRUE (has_file_extension("hi.jpeg", "jpg,jpeg"));
-  EXPECT_TRUE (has_file_extension("hi.jpg", "jpg,jpeg"));
-  EXPECT_FALSE(has_file_extension("hi.ase", "jpg,jpeg"));
-  EXPECT_TRUE (has_file_extension("hi.ase", "jpg,jpeg,ase"));
-  EXPECT_TRUE (has_file_extension("hi.ase", "ase,jpg,jpeg"));
+  EXPECT_TRUE (has_file_extension("hi.png", base::paths{"png"}));
+  EXPECT_FALSE(has_file_extension("hi.png", base::paths{"pngg"}));
+  EXPECT_FALSE(has_file_extension("hi.png", base::paths{"ppng"}));
+  EXPECT_TRUE (has_file_extension("hi.jpeg", base::paths{"jpg","jpeg"}));
+  EXPECT_TRUE (has_file_extension("hi.jpg", base::paths{"jpg","jpeg"}));
+  EXPECT_FALSE(has_file_extension("hi.ase", base::paths{"jpg","jpeg"}));
+  EXPECT_TRUE (has_file_extension("hi.ase", base::paths{"jpg","jpeg","ase"}));
+  EXPECT_TRUE (has_file_extension("hi.ase", base::paths{"ase","jpg","jpeg"}));
+
+  EXPECT_TRUE (has_file_extension("hi.png", base::paths{"Png"}));
+  EXPECT_TRUE (has_file_extension("hi.pnG", base::paths{"bmp","PNg"}));
+  EXPECT_TRUE (has_file_extension("hi.bmP", base::paths{"bMP","PNg"}));
 }
 
 TEST(FS, CompareFilenames)