[feat]: fixed toolkit

Author: DanielCech

Sources/ScriptToolkit/NSImageExtension.swift

@@ -93,7 +93,7 @@ public extension NSImage {
         return finalResult
     }
 
-    func image(withText text: String, attributes: [NSAttributedString.Key: Any], horizontalPosition: CGFloat, verticalPosition: CGFloat) -> NSImage {
+    func image(withText text: String, attributes: [NSAttributedString.Key: Any], horizontalTitlePosition: CGFloat, verticalTitlePosition: CGFloat) -> NSImage {
         let image = self
         let text = text as NSString
         let options: NSString.DrawingOptions = [.usesLineFragmentOrigin, .usesFontLeading]
@@ -102,7 +102,7 @@ public extension NSImage {
 
         let x = (image.size.width - textSize.width) / 2
         let y = (image.size.height - textSize.height) / 2
-        let point = NSMakePoint(x * horizontalPosition, y * verticalPosition)
+        let point = NSMakePoint(x * horizontalTitlePosition, y * verticalTitlePosition)
 
         image.lockFocus()
         text.draw(at: point, withAttributes: attributes)
@@ -125,26 +125,29 @@ public extension NSImage {
 
         guard let titleFont = NSFont(name: font, size: size) else { throw ScriptError.argumentError(message: "Unable to find font \(font)") }
 
-        var alignmentMode: CATextLayerAlignmentMode
+        var alignmentMode: NSTextAlignment
 
         switch titleAlignment {
         case "left":
             alignmentMode = .left
 
-        case "center":
-            alignmentMode = .center
-            
         case "right":
             alignmentMode = .right
+            
+        default:
+            alignmentMode = .center
         }
 
+        let paragraph = NSMutableParagraphStyle()
+        paragraph.alignment = alignmentMode
+        
         // Solid color text
         let fillText = image(
             withText: text,
             attributes: [
                 .foregroundColor: fill,
                 .font: titleFont,
-                .alignmentMode: alignmentMode
+                .paragraphStyle: paragraph
             ],
             horizontalTitlePosition: horizontalTitlePosition,
             verticalTitlePosition: verticalTitlePosition
@@ -158,7 +161,7 @@ public extension NSImage {
                 .strokeColor: stroke,
                 .strokeWidth: strokeWidth * size,
                 .font: titleFont,
-                .alignmentMode: alignmentMode
+                .paragraphStyle: paragraph
             ],
             horizontalTitlePosition: horizontalTitlePosition,
             verticalTitlePosition: verticalTitlePosition)

Sources/ScriptToolkit/ScriptToolkit.swift

@@ -10,59 +10,6 @@ import Files
 import SwiftShell
 import Moderator
 
-public protocol PrintableError {
-    var errorDescription: String { get }
-}
-
-public enum ScriptError: Error {
-    case generalError(message: String)
-    case fileExists(message: String)
-    case fileNotFound(message: String)
-    case folderExists(message: String)
-    case folderNotFound(message: String)
-    case argumentError(message: String)
-    case moreInfoNeeded(message: String)
-}
-
-extension ScriptError: PrintableError {
-    public var errorDescription: String {
-        let prefix = "💥 error: "
-        var errorDescription = ""
-
-        switch self {
-        case let .generalError(message):
-            errorDescription = message
-
-        case let .fileExists(message):
-            errorDescription = "file exists: \(message)"
-
-        case let .fileNotFound(message):
-            errorDescription = "file not found: \(message)"
-
-        case let .folderExists(message):
-            errorDescription = "folder exists: \(message)"
-
-        case let .folderNotFound(message):
-            errorDescription = "folder not found: \(message)"
-
-        case let .argumentError(message):
-            errorDescription = "invalid argument: \(message)"
-
-        case let .moreInfoNeeded(message):
-            errorDescription = "more info needed: \(message)"
-        }
-
-        return prefix + errorDescription
-    }
-}
-
-
-extension ArgumentError: PrintableError {
-    public var errorDescription: String {
-        return "💥 error: \(errormessage)"
-    }
-}
-
 public struct ScriptToolkit {
 
     // Setup of absolute paths