[feat]: finding improvements

Author: DanielCech

Sources/ScriptToolkit/FileExtension.swift

@@ -89,7 +89,7 @@ public extension File {
 
     @discardableResult public func resizeImage(newName: String, size: CGSize, overwrite: Bool = true) throws -> File {
         if !overwrite && FileManager.default.fileExists(atPath: newName) { return try File(path: newName) }
-        run("/usr/local/bin/convert", path, "-resize", "\(size.width)x\(size.height)",newName)
+        run(ScriptToolkit.convertPath, path, "-resize", "\(Int(size.width))x\(Int(size.height))",newName)
         return try File(path: newName)
     }
 
@@ -142,35 +142,4 @@ public extension File {
         return try File(path: newName)
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    // MARK: - Find files
-
-    public func findFirstFile(name: String, root: Folder) -> File? {
-        for file in root.makeFileSequence(recursive: true) {
-            if file.name == name {
-                return file
-            }
-        }
-        return nil
-    }
-
-    public func findFiles(name: String, root: Folder) -> [File] {
-        var foundFiles = [File]()
-        for file in root.makeFileSequence(recursive: true) {
-            if file.name == name {
-                foundFiles.append(file)
-            }
-        }
-        return foundFiles
-    }
-
-    public func findFiles(regex: String, root: Folder) -> [File] {
-        var foundFiles = [File]()
-        for file in root.makeFileSequence(recursive: true) {
-            if !matches(for: regex, in: file.name).isEmpty {
-                foundFiles.append(file)
-            }
-        }
-        return foundFiles
-    }
 }

Sources/ScriptToolkit/FolderExtension.swift

@@ -175,31 +175,63 @@ public extension Folder {
         }
     }
 
+    ////////////////////////////////////////////////////////////////////////////////
+    // MARK: - Find files
+
+    public func findFirstFile(name: String) -> File? {
+        for file in makeFileSequence(recursive: true) {
+            if file.name == name {
+                return file
+            }
+        }
+        return nil
+    }
+
+    public func findFiles(name: String) -> [File] {
+        var foundFiles = [File]()
+        for file in makeFileSequence(recursive: true) {
+            if file.name == name {
+                foundFiles.append(file)
+            }
+        }
+        return foundFiles
+    }
+
+    public func findFiles(regex: String) -> [File] {
+        var foundFiles = [File]()
+        for file in makeFileSequence(recursive: true) {
+            if !matches(for: regex, in: file.name).isEmpty {
+                foundFiles.append(file)
+            }
+        }
+        return foundFiles
+    }
+
     ////////////////////////////////////////////////////////////////////////////////
     // MARK: - Find folders
 
-    public func findFirstFolder(name: String, root: Folder) -> Folder? {
-        for folder in root.makeSubfolderSequence(recursive: true) {
+    public func findFirstFolder(name: String) -> Folder? {
+        for folder in makeSubfolderSequence(recursive: true) {
             if folder.name == name {
                 return folder
             }
         }
         return nil
     }
 
-    public func findFolders(name: String, root: Folder) -> [Folder] {
+    public func findFolders(name: String) -> [Folder] {
         var foundFolders = [Folder]()
-        for folder in root.makeSubfolderSequence(recursive: true) {
+        for folder in makeSubfolderSequence(recursive: true) {
             if folder.name == name {
                 foundFolders.append(folder)
             }
         }
         return foundFolders
     }
 
-    public func findFolders(regex: String, root: Folder) -> [Folder] {
+    public func findFolders(regex: String) -> [Folder] {
         var foundFolders = [Folder]()
-        for folder in root.makeSubfolderSequence(recursive: true) {
+        for folder in makeSubfolderSequence(recursive: true) {
             if !matches(for: regex, in: folder.name).isEmpty {
                 foundFolders.append(folder)
             }

Sources/ScriptToolkit/ScriptToolkit.swift

@@ -9,18 +9,23 @@ import Foundation
 import Files
 import SwiftShell
 
-enum ScriptError: Error {
+public enum ScriptError: Error {
     case fileExists
+    case fileNotFound
 }
 
 public struct ScriptToolkit {
 
     // Setup of absolute paths
-    static let pdfCropPath = "/usr/local/bin/pdfcrop"
-    static let ffmpegPath = "/usr/local/bin/ffmpeg"
-    static let soxPath = "/usr/local/bin/sox"
-    static let silenceFilePath = "/Users/dan/Documents/[Development]/[Projects]/SwiftScripts/practise/silence.wav"
+    public static let pdfCropPath = "/usr/local/bin/pdfcrop"
+    public static let ffmpegPath = "/usr/local/bin/ffmpeg"
+    public static let soxPath = "/usr/local/bin/sox"
+    public static let convertPath = "/usr/local/bin/convert"
+    public static let compositePath = "/usr/local/bin/composite"
+    public static let silenceFilePath = "/Users/dan/Documents/[Development]/[Projects]/SwiftScripts/practise/silence.wav"
 
+
+    
     public static let dateFormatter: DateFormatter = {
         let formatter = DateFormatter()
         formatter.dateFormat = "YYYY-MM-dd"