【图片转PDF】文件类型判断

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

@@ -156,19 +156,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
             }
         } completion: { [unowned self] (panel ,data) in
             if data.count != 0 {
-                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.tableView.presenter.addData(data: data)
                 self.reloadData()
             }
         }

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Presenter/KMBatchProcessingTableViewPresenter.swift

@@ -48,20 +48,26 @@ extension KMBatchProcessingTableViewPresenter: KMBatchProcessingTableViewPresent
     }
     
     func addData(data: [URL]) {
+        let types: [String] = KMBatchProcessingTableViewModel.supportedImageTypes()
         for url in data {
-            let model: KMBatchProcessingTableViewModel! = KMBatchProcessingTableViewModel.initWithFilePath(url: url)
-            if (self.containsSampleFile(model: model)) {
-                self.modelData.append(model)
+            if types.contains(url.pathExtension) {
+                let model: KMBatchProcessingTableViewModel! = KMBatchProcessingTableViewModel.initWithFilePath(url: url)
+                if (self.containsSampleFile(model: model)) {
+                    self.modelData.append(model)
+                }
             }
         }
         self.delegate?.showData(presenter: self, data: self.modelData)
     }
     
     func insetData(data: [URL], index: Int) {
+        let types: [String] = KMBatchProcessingTableViewModel.supportedImageTypes()
         for url in data {
-            let model: KMBatchProcessingTableViewModel! = KMBatchProcessingTableViewModel.initWithFilePath(url: url)
-            if (self.containsSampleFile(model: model)) {
-                self.modelData.insert(model, at: index)
+            if types.contains(url.pathExtension) {
+                let model: KMBatchProcessingTableViewModel! = KMBatchProcessingTableViewModel.initWithFilePath(url: url)
+                if (self.containsSampleFile(model: model)) {
+                    self.modelData.insert(model, at: index)
+                }
             }
         }
         self.delegate?.showData(presenter: self, data: self.modelData)