Changeset 277219 in webkit

Timestamp:

May 7, 2021, 6:05:02 PM (5 years ago)

Author:

Chris Dumez

Message:

Port FileSystem::pathGetFileName() & Filesystem::directoryName() to std::filesystem
​https://bugs.webkit.org/show_bug.cgi?id=225524

Reviewed by Darin Adler.

Source/WTF:

Port FileSystem::pathGetFileName() & Filesystem::directoryName() to std::filesystem so
that we can get rid of platform-specific implementions.

• wtf/FileSystem.cpp:

(WTF::FileSystemImpl::pathGetFileName):
(WTF::FileSystemImpl::directoryName):

• wtf/glib/FileSystemGlib.cpp:

(WTF::FileSystemImpl::pathGetFileName): Deleted.
(WTF::FileSystemImpl::directoryName): Deleted.

• wtf/posix/FileSystemPOSIX.cpp:

(WTF::FileSystemImpl::pathGetFileName): Deleted.
(WTF::FileSystemImpl::directoryName): Deleted.

• wtf/win/FileSystemWin.cpp:

(WTF::FileSystemImpl::pathGetFileName): Deleted.
(WTF::FileSystemImpl::directoryName): Deleted.

Tools:

Add API test coverage.

• TestWebKitAPI/Tests/WTF/FileSystem.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/FileSystem.cpp (modified) (1 diff)
• Source/WTF/wtf/glib/FileSystemGlib.cpp (modified) (1 diff)
• Source/WTF/wtf/posix/FileSystemPOSIX.cpp (modified) (1 diff)
• Source/WTF/wtf/win/FileSystemWin.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-07  Chris Dumez  <cdumez@apple.com>
+
+        Port FileSystem::pathGetFileName() & Filesystem::directoryName() to std::filesystem
+        https://bugs.webkit.org/show_bug.cgi?id=225524
+
+        Reviewed by Darin Adler.
+
+        Port FileSystem::pathGetFileName() & Filesystem::directoryName() to std::filesystem so
+        that we can get rid of platform-specific implementions.
+
+        * wtf/FileSystem.cpp:
+        (WTF::FileSystemImpl::pathGetFileName):
+        (WTF::FileSystemImpl::directoryName):
+        * wtf/glib/FileSystemGlib.cpp:
+        (WTF::FileSystemImpl::pathGetFileName): Deleted.
+        (WTF::FileSystemImpl::directoryName): Deleted.
+        * wtf/posix/FileSystemPOSIX.cpp:
+        (WTF::FileSystemImpl::pathGetFileName): Deleted.
+        (WTF::FileSystemImpl::directoryName): Deleted.
+        * wtf/win/FileSystemWin.cpp:
+        (WTF::FileSystemImpl::pathGetFileName): Deleted.
+        (WTF::FileSystemImpl::directoryName): Deleted.
+
 2021-05-07  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WTF/wtf/FileSystem.cpp

@@ -722 +722 @@
 }
 
+String pathGetFileName(const String& path)
+{
+    std::filesystem::path fsPath = fileSystemRepresentation(path).data();
+    return String::fromUTF8(fsPath.filename().u8string().c_str());
+}
+
+String directoryName(const String& path)
+{
+    std::filesystem::path fsPath = fileSystemRepresentation(path).data();
+    return String::fromUTF8(fsPath.parent_path().u8string().c_str());
+}
+
 } // namespace FileSystemImpl
 } // namespace WTF

trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp

@@ -158 +158 @@
 }
 
-String pathGetFileName(const String& path)
-{
-    auto filename = fileSystemRepresentation(path);
-    if (!validRepresentation(filename))
-        return path;
-
-    GUniquePtr<gchar> baseName(g_path_get_basename(filename.data()));
-    return String::fromUTF8(baseName.get());
-}
-
-String directoryName(const String& path)
-{
-    auto filename = fileSystemRepresentation(path);
-    if (!validRepresentation(filename))
-        return String();
-
-    GUniquePtr<char> dirname(g_path_get_dirname(filename.data()));
-    return String::fromUTF8(dirname.get());
-}
-
 Vector<String> listDirectory(const String& path, const String& filter)
 {

trunk/Source/WTF/wtf/posix/FileSystemPOSIX.cpp

@@ -203 +203 @@
 }
 
-String pathGetFileName(const String& path)
-{
-    return path.substring(path.reverseFind('/') + 1);
-}
-
-String directoryName(const String& path)
-{
-    CString fsRep = fileSystemRepresentation(path);
-
-    if (!fsRep.data() || fsRep.data()[0] == '\0')
-        return String();
-
-    return String::fromUTF8(dirname(fsRep.mutableData()));
-}
-
 Vector<String> listDirectory(const String& path, const String& filter)
 {

trunk/Source/WTF/wtf/win/FileSystemWin.cpp

@@ -190 +190 @@
 }
 
-String pathGetFileName(const String& path)
-{
-    return String(::PathFindFileName(path.wideCharacters().data()));
-}
-
-String directoryName(const String& path)
-{
-    String name = path.left(path.length() - pathGetFileName(path).length());
-    if (name.characterStartingAt(name.length() - 1) == '\\'
-        || name.characterStartingAt(name.length() - 1) == '/') {
-        // Remove any trailing "\" or "/"
-        name.truncate(name.length() - 1);
-    }
-    return name;
-}
-
 static String bundleName()
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-07  Chris Dumez  <cdumez@apple.com>
+
+        Port FileSystem::pathGetFileName() & Filesystem::directoryName() to std::filesystem
+        https://bugs.webkit.org/show_bug.cgi?id=225524
+
+        Reviewed by Darin Adler.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WTF/FileSystem.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2021-05-07  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp

@@ -707 +707 @@
 }
 
+TEST_F(FileSystemTest, pathGetFileName)
+{
+    auto testPath = FileSystem::pathByAppendingComponents(tempEmptyFolderPath(), { "subfolder", "filename.txt" });
+    EXPECT_STREQ("filename.txt", FileSystem::pathGetFileName(testPath).utf8().data());
+
+#if OS(UNIX)
+    EXPECT_STREQ(".", FileSystem::pathGetFileName(".").utf8().data());
+    EXPECT_STREQ("..", FileSystem::pathGetFileName("..").utf8().data());
+    EXPECT_STREQ("", FileSystem::pathGetFileName("/").utf8().data());
+    EXPECT_STREQ(".", FileSystem::pathGetFileName("/foo/.").utf8().data());
+    EXPECT_STREQ("..", FileSystem::pathGetFileName("/foo/..").utf8().data());
+    EXPECT_STREQ("", FileSystem::pathGetFileName("/foo/").utf8().data());
+    EXPECT_STREQ("host", FileSystem::pathGetFileName("//host").utf8().data());
+#endif
+#if OS(WINDOWS)
+    EXPECT_STREQ("", FileSystem::pathGetFileName("C:\\").utf8().data());
+    EXPECT_STREQ("foo", FileSystem::pathGetFileName("C:\\foo").utf8().data());
+    EXPECT_STREQ("", FileSystem::pathGetFileName("C:\\foo\\").utf8().data());
+    EXPECT_STREQ("bar.txt", FileSystem::pathGetFileName("C:\\foo\\bar.txt").utf8().data());
+#endif
+}
+
+TEST_F(FileSystemTest, directoryName)
+{
+    auto testPath = FileSystem::pathByAppendingComponents(tempEmptyFolderPath(), { "subfolder", "filename.txt" });
+    EXPECT_STREQ(FileSystem::pathByAppendingComponent(tempEmptyFolderPath(), "subfolder").utf8().data(), FileSystem::directoryName(testPath).utf8().data());
+#if OS(UNIX)
+    EXPECT_STREQ("/var/tmp", FileSystem::directoryName("/var/tmp/example.txt").utf8().data());
+    EXPECT_STREQ("/var/tmp", FileSystem::directoryName("/var/tmp/").utf8().data());
+    EXPECT_STREQ("/var/tmp", FileSystem::directoryName("/var/tmp/.").utf8().data());
+    EXPECT_STREQ("/", FileSystem::directoryName("/").utf8().data());
+#endif
+#if OS(WINDOWS)
+    EXPECT_STREQ("C:\\foo", FileSystem::directoryName("C:\\foo\\example.txt").utf8().data());
+    EXPECT_STREQ("C:\\", FileSystem::directoryName("C:\\").utf8().data());
+#endif
+}
+
 } // namespace TestWebKitAPI