Commit: 42c558683218c5d1a95631c1612fb0eaa7ea96ea - KoreNoKaraSu (git)

SWFファイル内の画像を表示／書き出しするGUIツール

Commit MetaInfo

• Revisión: 42c558683218c5d1a95631c1612fb0eaa7ea96ea (tree)
• Tiempo: 2016-09-30 21:42:03
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

バックグランドで展開するようにした

Cambiar Resumen

• modified: KoreNoKaraSu/Base.lproj/HMSwfDocument.xib
• modified: KoreNoKaraSu/HMSwfDocument.m

Diferencia incremental

--- a/KoreNoKaraSu/Base.lproj/HMSwfDocument.xib
+++ b/KoreNoKaraSu/Base.lproj/HMSwfDocument.xib
@@ -106,7 +106,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
-                            <customView fixedFrame="YES" id="LpT-ka-bol">
+                            <customView id="LpT-ka-bol">
                                 <rect key="frame" x="216" y="0.0" width="404" height="500"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <subviews>
@@ -118,7 +118,21 @@
                                             <binding destination="UYM-GR-Pyx" name="value" keyPath="selection.image" id="OXx-Tm-x6k"/>
                                         </connections>
                                     </imageView>
+                                    <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="GJm-eC-XNA">
+                                        <rect key="frame" x="186" y="234" width="32" height="32"/>
+                                        <connections>
+                                            <binding destination="-2" name="animate" keyPath="didExtract" id="aoV-ny-qDc">
+                                                <dictionary key="options">
+                                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
+                                                </dictionary>
+                                            </binding>
+                                        </connections>
+                                    </progressIndicator>
                                 </subviews>
+                                <constraints>
+                                    <constraint firstItem="GJm-eC-XNA" firstAttribute="centerY" secondItem="LpT-ka-bol" secondAttribute="centerY" id="Scp-bL-Khr"/>
+                                    <constraint firstItem="GJm-eC-XNA" firstAttribute="centerX" secondItem="LpT-ka-bol" secondAttribute="centerX" id="rCv-Tc-5bO"/>
+                                </constraints>
                             </customView>
                         </subviews>
                         <holdingPriorities>
@@ -137,7 +151,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-x8E"/>
             </connections>
-            <point key="canvasLocation" x="746" y="-74"/>
+            <point key="canvasLocation" x="942" y="-140"/>
         </window>
         <arrayController objectClassName="HMSwfImage" editable="NO" id="UYM-GR-Pyx">
             <connections>

--- a/KoreNoKaraSu/HMSwfDocument.m
+++ b/KoreNoKaraSu/HMSwfDocument.m
@@ -22,6 +22,8 @@
 @property (copy) NSArray<HMSwfImage *> *swfImages;
 
 @property (strong) HMTemporaryDirectory *temporaryDirectorhy;
+
+@property BOOL didExtract;
 @end
 
 @implementation HMSwfDocument
@@ -54,34 +56,37 @@
                        self.fileURL.path
                        ];
     
-    [task launch];
-    [task waitUntilExit];
-    
-    // TODO: タスクがエラーだった時の処理を追加
-    
-    // TODO: terminationHandlerにする
-    NSFileManager *fm = [NSFileManager defaultManager];
-    NSArray<NSURL *> *imageURLs = [fm contentsOfDirectoryAtURL:self.temporaryDirectorhy.URL
-                                 includingPropertiesForKeys:nil
-                                                    options:0
-                                                      error:NULL];
-    NSMutableArray<HMSwfImage *> *images = [NSMutableArray array];
-    for(NSURL *imageURL in imageURLs) {
-        NSImage *image = [[NSImage alloc] initWithContentsOfURL:imageURL];
-        if(!image) {
-            NSLog(@"can not create image from %@", imageURL.path);
-            continue;
+    task.terminationHandler = ^(NSTask *task) {
+        NSFileManager *fm = [NSFileManager defaultManager];
+        NSArray<NSURL *> *imageURLs = [fm contentsOfDirectoryAtURL:self.temporaryDirectorhy.URL
+                                        includingPropertiesForKeys:nil
+                                                           options:0
+                                                             error:NULL];
+        NSMutableArray<HMSwfImage *> *images = [NSMutableArray array];
+        for(NSURL *imageURL in imageURLs) {
+            NSImage *image = [[NSImage alloc] initWithContentsOfURL:imageURL];
+            if(!image) {
+                NSLog(@"can not create image from %@", imageURL.path);
+                continue;
+            }
+            HMSwfImage *swfImage = [HMSwfImage new];
+            swfImage.image = image;
+            swfImage.filepath = imageURL.path;
+            
+            [images addObject:swfImage];
         }
-        HMSwfImage *swfImage = [HMSwfImage new];
-        swfImage.image = image;
-        swfImage.filepath = imageURL.path;
         
-        [images addObject:swfImage];
-    }
+        NSArray<HMSwfImage *> *swfImages = [images sortedArrayUsingComparator:^NSComparisonResult(HMSwfImage *  _Nonnull obj1, HMSwfImage *  _Nonnull obj2) {
+            return [obj1.name numericCompare:obj2.name];
+        }];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.swfImages = swfImages;
+            self.didExtract = YES;
+        });
+    };
     
-    self.swfImages = [images sortedArrayUsingComparator:^NSComparisonResult(HMSwfImage *  _Nonnull obj1, HMSwfImage *  _Nonnull obj2) {
-        return [obj1.name numericCompare:obj2.name];
-    }];
+    [task launch];
     
     return YES;
 }