add exit from read cycle

nerzh · Jun 27, 2020 · bfb4be0 · bfb4be0
1 parent e9c2e9e
commit bfb4be0
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Sources/FileUtils/ReadFile.swift b/Sources/FileUtils/ReadFile.swift
@@ -13,21 +13,29 @@ public extension FileUtils {
         try String(contentsOf: url, encoding: encoding)
     }
 
-    class func readFileByLine(_ url: URL, _ handler: (_ line: String) -> Void) throws {
-        let file: FileReader = .init(fileURL: url)
+    class func readFileByLine(_ path: String, _ handler: (_ line: String) -> Void) throws {
+        let file: FileReader = .init(filePath: path)
         try file.open()
         defer { file.close() }
         while let line: String = try file.readLine() {
             handler(line)
         }
     }
 
-    class func readFileByLine(_ path: String, _ handler: (_ line: String) -> Void) throws {
+    class func readFileByLine(_ url: URL, _ handler: (_ line: String) -> Void) throws {
+        try readFileByLine(url.path, handler)
+    }
+
+    class func readFileByLine(_ path: String, _ handler: (_ line: String) -> Bool) throws {
         let file: FileReader = .init(filePath: path)
         try file.open()
         defer { file.close() }
         while let line: String = try file.readLine() {
-            handler(line)
+            if !handler(line) { break }
         }
     }
+
+    class func readFileByLine(_ url: URL, _ handler: (_ line: String) -> Bool) throws {
+        try readFileByLine(url.path, handler)
+    }
 }