Merge branch 'main' into exotic-audio-only

Author: Mock1

Base.lproj/MainMenu.xib

@@ -490,6 +490,7 @@
             </items>
             <point key="canvasLocation" x="-244" y="-303"/>
         </menu>
+        <customObject id="Msu-dq-xzt" customClass="DocumentController" customModule="Subler" customModuleProvider="target"/>
         <customObject id="419" customClass="NSFontManager"/>
         <customObject id="449" userLabel="AppDelegate" customClass="AppDelegate" customModule="Subler" customModuleProvider="target">
             <connections>

Classes/AppDelegate.swift

@@ -10,6 +10,22 @@ import MP42Foundation
 
 final class DocumentController : NSDocumentController {
 
+    override func makeDocument(withContentsOf url: URL, ofType typeName: String) throws -> NSDocument {
+        return try Document(contentsOf: url, ofType: typeName)
+    }
+
+    override func makeUntitledDocument(ofType typeName: String) throws -> NSDocument {
+        return Document()
+    }
+
+    override func validateUserInterfaceItem(_ item: NSValidatedUserInterfaceItem) -> Bool {
+        if item.action == #selector(NSDocumentController.newDocument(_:)) ||
+           item.action == #selector(NSDocumentController.openDocument(_:)) {
+            return true
+        }
+        return super.validateUserInterfaceItem(item)
+    }
+
     private var openPanel: NSOpenPanel?
 
     override func openDocument(_ sender: Any?) {
@@ -155,7 +171,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         Prefs.register()
         MetadataPrefs.register()
 
-        _ = documentController
         _ = activityWindowController
 
         logger.clear()

Classes/Document.swift

@@ -9,6 +9,7 @@ import Cocoa
 import IOKit.pwr_mgt
 import MP42Foundation
 
+@objc(Document)
 final class Document: NSDocument {
 
     private(set) var mp4: MP42File
@@ -20,6 +21,7 @@ final class Document: NSDocument {
         self.optimize = false
         self.unsupportedMp4Brand = false
         self.mp4 = MP42File()
+        super.init()
     }
 
     init(mp4: MP42File) {

Classes/DocumentWindowController.swift

@@ -514,6 +514,22 @@ final class DocumentWindowController: NSWindowController, TracksViewControllerDe
         }
     }
 
+    @objc func importFilesDirectly(_ fileURLs: [URL]) {
+        do {
+            let controller = try FileImportController(fileURLs: fileURLs, delegate: self)
+
+            // Call addTracks directly - the Settings initialization logic runs when the controller is created
+            controller.addTracks(self)
+            tracksViewController.reloadData()
+        } catch {
+            if let windowForSheet = doc.windowForSheet {
+                presentError(error, modalFor: windowForSheet, delegate: nil, didPresent: nil, contextInfo: nil)
+            } else {
+                presentError(error)
+            }
+        }
+    }
+
     func didSelect(tracks: [MP42Track], metadata: MP42Metadata?) {
         for track in tracks {
             mp4.addTrack(track)
@@ -536,7 +552,7 @@ final class DocumentWindowController: NSWindowController, TracksViewControllerDe
             doc.updateChangeCount(.changeDone)
             metadataViewController?.metadata = mp4.metadata
         }
-
+        
         tracksViewController.reloadData()
     }
 

Classes/QueueScriptCommand.swift

@@ -45,3 +45,27 @@ import Foundation
     }
 
 }
+
+@objc(SBQueueRemoveCompletedScriptCommand) class QueueRemoveCompletedScriptCommand: NSScriptCommand {
+
+    @MainActor override func performDefaultImplementation() -> Any? {
+        QueueController.shared.removeCompletedItems(self)
+        return nil
+    }
+
+}
+
+@objc(SBQueueStatusScriptCommand) class SBQueueStatusScriptCommand: NSScriptCommand {
+
+    @MainActor override func performDefaultImplementation() -> Any? {
+        switch QueueController.shared.status {
+        case .unknown:
+            return 0 // idle
+        case .working:
+            return 1 // running
+        case .completed:
+            return 2 // completed
+        }
+    }
+
+}

Info.plist

@@ -158,7 +158,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>OSAScriptingDefinition</key>
-	<string>Queue.sdef</string>
+	<string>Subler.sdef</string>
 	<key>SUAllowsAutomaticUpdates</key>
 	<false/>
 	<key>SUFeedURL</key>