From b5c477a8497cd6d97c1c90ce706f9d580323e150 Mon Sep 17 00:00:00 2001
From: Mark Berner <mark@berner.dev>
Date: Sat, 13 May 2023 00:51:10 +0300
Subject: [PATCH 1/2] URL filter added

---
 Sources/Tarscape/FileManager+Tar.swift |  4 ++--
 Sources/Tarscape/KBTarArchiver.swift   | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Sources/Tarscape/FileManager+Tar.swift b/Sources/Tarscape/FileManager+Tar.swift
index e357cd8..f0b1f4a 100644
--- a/Sources/Tarscape/FileManager+Tar.swift
+++ b/Sources/Tarscape/FileManager+Tar.swift
@@ -29,7 +29,7 @@ public extension FileManager {
     }
     
     @nonobjc
-    func createTar(at tarURL: URL, from dirURL: URL, options: KBTarArchiver.Options = [],  progress: Progress? = nil) throws {
+    func createTar(at tarURL: URL, from dirURL: URL, filter: KBURLFilter? = nil, options: KBTarArchiver.Options = [],  progress: Progress? = nil) throws {
         let archiver = KBTarArchiver(directoryURL: dirURL, options: options)
         
         var progressBody: ((Double, Int64) -> Void)?
@@ -41,7 +41,7 @@ public extension FileManager {
             }
         }
         
-        try KBTarArchiver(directoryURL: dirURL, options: options).archive(to: tarURL, progressBody: progressBody)
+        try KBTarArchiver(directoryURL: dirURL, filter: filter, options: options).archive(to: tarURL, progressBody: progressBody)
     }
     
     // MARK: - Objective-C Compatible Methods
diff --git a/Sources/Tarscape/KBTarArchiver.swift b/Sources/Tarscape/KBTarArchiver.swift
index 8555cb4..1544384 100644
--- a/Sources/Tarscape/KBTarArchiver.swift
+++ b/Sources/Tarscape/KBTarArchiver.swift
@@ -11,9 +11,12 @@
 
 import Foundation
 
+public typealias KBURLFilter = (_ url:URL) -> Bool
+
 public class KBTarArchiver {
     
     private let directoryURL: URL
+    private let filter: KBURLFilter?
     private let options: Options
     private var fileHandle: FileHandle!
     
@@ -49,7 +52,9 @@ public class KBTarArchiver {
         let e = FileManager.default.enumerator(at: directoryURL, includingPropertiesForKeys: nil)!
         var allFiles: [URL] = []
         for case let fileURL as URL in e {
-            allFiles.append(fileURL)
+            if self.filter?(fileURL) ?? true {
+                allFiles.append(fileURL)
+            }
         }
         self.allFiles = allFiles
         self._progressCount = Int64(allFiles.count)
@@ -68,9 +73,11 @@ public class KBTarArchiver {
     
     /// Creates a new archiver object ready to generate a Tar file from the passed-in directory contents.
     /// - Parameter directoryURL: The path to the directory for archiving.
+    /// - Parameter filter: Allows filter out specific files or directories. The default value is nil.
     /// - Parameter options: Options for creating the archive. The default value is `[]`.
-    public init(directoryURL: URL, options: Options = []) {
+    public init(directoryURL: URL, filter: KBURLFilter? = nil, options: Options = []) {
         self.directoryURL = directoryURL
+        self.filter = filter
         self.options = options
     }
     
@@ -120,7 +127,9 @@ public class KBTarArchiver {
                 let e = fm.enumerator(at: directoryURL, includingPropertiesForKeys: nil)!
                 var allFiles: [URL] = []
                 for case let fileURL as URL in e {
-                    allFiles.append(fileURL)
+                    if self.filter?(fileURL) ?? true {
+                        allFiles.append(fileURL)
+                    }
                 }
                 self.allFiles = allFiles
             }
@@ -135,7 +144,9 @@ public class KBTarArchiver {
             // we enumerate through the files.
             let e = fm.enumerator(at: directoryURL, includingPropertiesForKeys: nil)!
             for case let fileURL as URL in e {
-                try encode(fileURL: fileURL)
+                if self.filter?(fileURL) ?? true {
+                    try encode(fileURL: fileURL)
+                }
             }
         }
         

From a9c01be87b3e7e63702de60d0c75e454d3e96da8 Mon Sep 17 00:00:00 2001
From: Mark Berner <mark@berner.dev>
Date: Sun, 14 May 2023 12:29:44 +0300
Subject: [PATCH 2/2] Prevent file not found exception

---
 Sources/Tarscape/KBTarArchiver.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Sources/Tarscape/KBTarArchiver.swift b/Sources/Tarscape/KBTarArchiver.swift
index 1544384..4225885 100644
--- a/Sources/Tarscape/KBTarArchiver.swift
+++ b/Sources/Tarscape/KBTarArchiver.swift
@@ -164,6 +164,10 @@ public class KBTarArchiver {
     
     private func encodeBinaryData(for fileURL: URL, subpath: String) throws {
         
+        guard FileManager.default.fileExists(atPath: fileURL.relativePath) else {
+            return
+        }
+        
         let fileAttributes = KBFileAttributes(fileURL: fileURL, supportAliasFiles: options.contains(.convertAliasFiles))
         
         // Get the Tar type (directory, symbolic link or regular file).