Fix bug that could cause nameExcludingExtension to be incorrect for l…

…ong file names
FsThatOne · Jan 21, 2017 · 9c5bfc8 · 9c5bfc8
1 parent 1aa3bfc
commit 9c5bfc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Sources/Files.swift b/Sources/Files.swift
@@ -147,7 +147,7 @@ public class FileSystem {
                 return name
             }
 
-            let startIndex = name.index(name.startIndex, offsetBy: `extension`.characters.count + 1)
+            let startIndex = name.index(name.endIndex, offsetBy: -`extension`.characters.count - 1)
             return name.replacingCharacters(in: startIndex..<name.endIndex, with: "")
         }
 

diff --git a/Tests/FilesTests/FilesTests.swift b/Tests/FilesTests/FilesTests.swift
@@ -286,6 +286,13 @@ class FilesTests: XCTestCase {
         XCTAssertNotNil(FileSystem().homeFolder)
     }
 
+    func testNameExcludingExtensionWithLongFileName() {
+        performTest {
+            let file = try folder.createFile(named: "AVeryLongFileName.png")
+            XCTAssertEqual(file.nameExcludingExtension, "AVeryLongFileName")
+        }
+    }
+
     func testUsingCustomFileManager() {
         class FileManagerMock: FileManager {
             var noFilesExist = false