【批量工具】图片转PDF 格式筛选暂只支持(png jpg jpeg)

PDF Office/PDF Master/Class/Merge/Tools/KMMergeTools.swift

@@ -30,7 +30,7 @@ class KMMergeTools: NSObject {
             var isDirectory: ObjCBool = ObjCBool(false)
             fileManager.fileExists(atPath: documentURL.path, isDirectory: &isDirectory)
             if (isDirectory.boolValue) {
-                findAllFiles(folder: documentURL, result: &result)
+                findAllFiles(folder: documentURL, result: &result, types: types)
             } else {
                 if !array.contains(documentURL.pathExtension.lowercased()) {
                     continue

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/KMImageToPDFWindowController.swift

@@ -100,6 +100,7 @@ class KMImageToPDFWindowController: NSWindowController {
                     let point = CGPoint(x: window.frame.origin.x + window.frame.width / 2 - (imageToPDFWindow.window?.frame.size.width)! / 2,
                                         y: window.frame.origin.y + window.frame.height / 2 - (imageToPDFWindow.window?.frame.size.height)! / 2)
                     window.addChildWindow(imageToPDFWindow.window!, ordered: NSWindow.OrderingMode.above)
+                    imageToPDFWindow.window?.center()
 //                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
 //                        imageToPDFWindow.window?.setFrameOrigin(point)
 //                        imageToPDFWindow.window?.makeKeyAndOrderFront(nil)

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/KMBatchProcessingView.swift

@@ -156,7 +156,19 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
             }
         } completion: { [unowned self] (panel ,data) in
             if data.count != 0 {
-                self.tableView.presenter.addData(data: data)
+                var filePaths: [URL] = []
+                
+                var types: [String] = []
+                if self.inputType == .OCR {
+                    types = KMOCRModel.supportedTypes()
+                } else if self.inputType == .ImageToPDF {
+                    types = KMBatchProcessingTableViewModel.supportedImageTypes()
+                } else {
+                    types = KMOCRModel.supportedTypes()
+                }
+                
+                KMMergeTools.findAllFiles(folder: data.first!, result: &filePaths, types: types)
+                self.tableView.presenter.addData(data: filePaths)
                 self.reloadData()
             }
         }

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.swift

@@ -69,7 +69,7 @@ class KMBatchProcessingNameTableCell: KMBatchProcessingTableCell {
             self.iconImageView.image = NSImage(named: "icon_popups_file_png")
         }
         
-        if self.model.name.contains("jpg") || self.model.name.contains("JPG") {
+        if self.model.name.contains("jpg") || self.model.name.contains("JPG") || self.model.name.contains("jpeg") || self.model.name.contains("JPEG") {
             self.iconImageView.image = NSImage(named: "icon_popups_file_jpg")
         }
     }