Merge pull request #80 from JohnSundell/relative-paths

Add API for computing a path relative to a parent folder
JohnSundell · Apr 5, 2019 · 92b57be · 92b57be
2 parents c6d6bbd + eb96a42
commit 92b57be
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/Sources/Files.swift b/Sources/Files.swift
@@ -237,6 +237,30 @@ public class FileSystem {
                 self.name = pathComponents[pathComponents.count - 2]
             }
         }
+
+        /**
+         *  Return this item's path relative to a given parent folder
+         *
+         *  - parameter folder: The parent folder to return a relative path to
+         *
+         *  - returns: Either a relative path, if the passed folder is indeed
+         *  a parent (even if it's not a direct one) for this item. Otherwise
+         *  the item's full path is returned.
+         */
+        public func path(relativeTo folder: Folder) -> String {
+            guard path.hasPrefix(folder.path) else {
+                return path
+            }
+
+            let index = path.index(path.startIndex, offsetBy: folder.path.count)
+            var subpath = path[index...]
+
+            if subpath.hasSuffix("/") {
+                subpath.removeLast()
+            }
+
+            return String(subpath)
+        }
 
         /**
          *  Rename the item

diff --git a/Tests/FilesTests/FilesTests.swift b/Tests/FilesTests/FilesTests.swift
@@ -589,6 +589,27 @@ class FilesTests: XCTestCase {
         }
     }
 
+    func testRelativePaths() {
+        performTest {
+            let file = try folder.createFile(named: "FileA")
+            let subfolder = try folder.createSubfolder(named: "Folder")
+            let fileInSubfolder = try subfolder.createFile(named: "FileB")
+
+            XCTAssertEqual(file.path(relativeTo: folder), "FileA")
+            XCTAssertEqual(subfolder.path(relativeTo: folder), "Folder")
+            XCTAssertEqual(fileInSubfolder.path(relativeTo: folder), "Folder/FileB")
+        }
+    }
+
+    func testRelativePathIsAbsolutePathForNonParent() {
+        performTest {
+            let file = try folder.createFile(named: "FileA")
+            let subfolder = try folder.createSubfolder(named: "Folder")
+
+            XCTAssertEqual(file.path(relativeTo: subfolder), file.path)
+        }
+    }
+
     func testCreatingFileFromFileSystem() {
         performTest {
             let fileName = "three"
@@ -789,6 +810,8 @@ class FilesTests: XCTestCase {
         ("testAccessingHomeFolder", testAccessingHomeFolder),
         ("testAccessingCurrentWorkingDirectory", testAccessingCurrentWorkingDirectory),
         ("testNameExcludingExtensionWithLongFileName", testNameExcludingExtensionWithLongFileName),
+        ("testRelativePaths", testRelativePaths),
+        ("testRelativePathIsAbsolutePathForNonParent", testRelativePathIsAbsolutePathForNonParent),
         ("testCreatingFileFromFileSystem", testCreatingFileFromFileSystem),
         ("testCreateFileFromFileSystemIfNeeded", testCreateFileFromFileSystemIfNeeded),
         ("testCreatingFolderFromFileSystem", testCreatingFolderFromFileSystem),