优化 - 功能细节优化

KdanAutoTest/KdanAuto/Class/AutoTestCase/AutoTest.swift

@@ -151,7 +151,6 @@ class AutoTest : NSObject, AutoTestProtocal {
     
     // Auto Test
     func autoTest(_ complention:@escaping (_ object:AutoTest, _ report:NSAttributedString?) -> ()) {
-        clearCacheFiles()
         self.compareFinishedFiles.removeAllObjects();
         self.convertFiles.removeAllObjects()
         
@@ -165,6 +164,8 @@ class AutoTest : NSObject, AutoTestProtocal {
             return
         }
         
+        clearCacheFiles()
+        
         if hasOriginFile() {
             //目录中有需要执行对照的文件
             DispatchQueue.global().async {

KdanAutoTest/KdanAuto/Class/CompareViewController/CompareViewController.swift

@@ -14,6 +14,7 @@ class CompareViewController: NSViewController, NSTableViewDataSource, NSTableVie
     @IBOutlet var listView : NSTableView!
     
     @IBOutlet var filterBtn : NSButton!
+    @IBOutlet var closeBtn : NSButton!
     
     @IBOutlet var progressIndicator : NSProgressIndicator!
     
@@ -117,6 +118,8 @@ class CompareViewController: NSViewController, NSTableViewDataSource, NSTableVie
         cell?.frame = CGRectMake(0, 0, CGRectGetWidth(self.listView.frame), 900);
         cell?.setFileInfo(file);
         
+        self.closeBtn.isEnabled = false;
+        
         DispatchQueue.global().async {
             autoreleasepool {
                 let image = cell?.processCompareImage()
@@ -155,6 +158,8 @@ class CompareViewController: NSViewController, NSTableViewDataSource, NSTableVie
                             self.progressIndicator.isHidden = true;
                             self.progressIndicator.doubleValue = 100.0;
                             
+                            self.closeBtn.isEnabled = true;
+                            
                             NSWorkspace.shared.activateFileViewerSelecting([url])
                         }
                     }

KdanAutoTest/KdanAuto/Class/CompareViewController/CompareViewController.xib

@@ -11,6 +11,7 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <viewController id="YBj-nQ-WgX" customClass="CompareViewController" customModule="KdanAuto" customModuleProvider="target">
             <connections>
+                <outlet property="closeBtn" destination="u2f-QM-qgA" id="Cb5-Ie-Jkc"/>
                 <outlet property="filterBtn" destination="qCC-xr-5ZS" id="Q7X-Ey-WUr"/>
                 <outlet property="listView" destination="45n-iP-sYg" id="FnW-Nj-Hop"/>
                 <outlet property="progressIndicator" destination="865-rk-Lp5" id="9x5-cL-1Ca"/>

KdanAutoTest/KdanAuto/ViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import ComPDFKit_Conversion
 
 class ViewController : NSViewController, SettingViewControllerDelegate, AutoTestAdvanceSettingViewDelegate, TestCaseCellViewDelegate,
                        NSTableViewDelegate, NSTableViewDataSource {
@@ -32,6 +33,8 @@ class ViewController : NSViewController, SettingViewControllerDelegate, AutoTest
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        self.title = "KdanAuto："+CPDFConvertKit.sharedInstance().versionString
+        
         customView.wantsLayer = true;
         customView.layer?.borderColor = NSColor.lightGray.withAlphaComponent(0.4).cgColor
         customView.layer?.borderWidth = 1
@@ -184,7 +187,7 @@ class ViewController : NSViewController, SettingViewControllerDelegate, AutoTest
                     }
                     
                     DispatchQueue.main.async {
-                        self.view.window?.title = "";
+                        self.title = "KdanAuto："+CPDFConvertKit.sharedInstance().versionString
                         
                         self._isProcessing = false
                         self.updateProcessStatus()

KdanAutoTest/ProcessCheckFile/Process/ProcessThumbnal.swift

@@ -63,7 +63,7 @@ class ProcessThumbnal : NSObject {
         }
         
         var didFinished = false
-        var retryCount = 0;
+//        var retryCount = 0;
         var didCallback = false;
         
         let url = URL.init(fileURLWithPath: filePath, isDirectory: false)
@@ -71,7 +71,7 @@ class ProcessThumbnal : NSObject {
         generate.generateBestRepresentation(for: request,
                                             completion: { (representation, error) in
             if (error != nil) {
-                NSLog("\(error)");
+                NSLog("KdanAuto:\(error)");
             }
             if nil != representation {
                 autoreleasepool {
@@ -89,13 +89,16 @@ class ProcessThumbnal : NSObject {
                 }
             }
             
-            if (!didCallback && (didFinished || retryCount > 2)) {
+            if !didCallback
+//                && (didFinished || retryCount >= 1)
+             {
+                generate.cancel(request)
+            
                 didCallback = true;
                 complention(didFinished)
-                
-                generate.cancel(request)
-            }else {
-                retryCount += 1;
+            
+//            }else {
+//                retryCount += 1;
             }
         })
     }

KdanAutoTest/ProcessCheckFile/ViewController.swift

@@ -18,7 +18,6 @@ class ViewController: NSViewController {
         //        ProcessFont.processRTFAutoFile(.Chinese)
         
         //        ProcessThumbnal.process("/Users/zhudongyong/Desktop/文档/对照文档/PDFConvert_China_Auto_Test.rtf")
-        FileAttributeKey.busy
         let fileAttributy = try! FileManager.default.attributesOfItem(atPath: "/Users/zhudongyong/Desktop/文档 2/BMP/Others/Origin Files/125-years-of-topo-mapping.pdf")
         let symbAttributy = try! FileManager.default.attributesOfItem(atPath: "/Users/zhudongyong/Desktop/文档 2/BMP/Others/Origin Files/125-years-of-topo-mapping的替身.pdf")
         let fileAttributy2 = try! FileManager.default.attributesOfItem(atPath: "/Users/zhudongyong/Desktop/文档 2/BMP/Others/Origin Files/nrcs141p2_018306.pdf")