提交: 3760c36d225f1e7c2ae36cc0b2b112b0f70c1f65 - ExtractKanMusu (git)

艦娘をちゅーちゅーします

Commit MetaInfo

• 修订版: 3760c36d225f1e7c2ae36cc0b2b112b0f70c1f65 (tree)
• 时间: 2017-08-08 00:01:19
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

使用コア数を変更できるようにした

更改概述

• modified: ExtractKanMusu/Base.lproj/Main.storyboard
• modified: ExtractKanMusu/ViewController.swift

差异

--- a/ExtractKanMusu/Base.lproj/Main.storyboard
+++ b/ExtractKanMusu/Base.lproj/Main.storyboard
@@ -683,11 +683,11 @@
             <objects>
                 <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="ExtractKanMusu" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="194"/>
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="224"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <pathControl verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="71Q-c3-4la">
-                                <rect key="frame" x="63" y="132" width="399" height="22"/>
+                                <rect key="frame" x="63" y="162" width="399" height="22"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <pathCell key="cell" selectable="YES" alignment="left" id="k0s-i9-gmv">
                                     <font key="font" metaFont="system"/>
@@ -695,7 +695,7 @@
                                 </pathCell>
                             </pathControl>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4oW-wt-UOP">
-                                <rect key="frame" x="20" y="160" width="125" height="17"/>
+                                <rect key="frame" x="20" y="190" width="125" height="17"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="キャッシュフォルダ：" id="940-lm-o1F">
                                     <font key="font" metaFont="system"/>
@@ -704,7 +704,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B7G-JY-X3z">
-                                <rect key="frame" x="20" y="97" width="89" height="17"/>
+                                <rect key="frame" x="20" y="127" width="89" height="17"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="出力フォルダ：" id="vkJ-JL-Cez">
                                     <font key="font" size="13" name=".HiraKakuInterface-W3"/>
@@ -713,7 +713,7 @@
                                 </textFieldCell>
                             </textField>
                             <pathControl verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gH1-Rc-sXz">
-                                <rect key="frame" x="63" y="70" width="397" height="22"/>
+                                <rect key="frame" x="63" y="100" width="397" height="22"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <pathCell key="cell" selectable="YES" alignment="left" id="HrL-3G-mlv">
                                     <font key="font" metaFont="system"/>
@@ -721,7 +721,7 @@
                                 </pathCell>
                             </pathControl>
                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HKI-uw-FLe">
-                                <rect key="frame" x="386" y="153" width="79" height="28"/>
+                                <rect key="frame" x="386" y="183" width="79" height="28"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="push" title="変更" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="acZ-cN-MBf">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -732,7 +732,7 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uh6-t3-6Lo">
-                                <rect key="frame" x="386" y="91" width="79" height="28"/>
+                                <rect key="frame" x="386" y="121" width="79" height="28"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="push" title="変更" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ie6-ZL-Re4">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -754,11 +754,11 @@
                                 </connections>
                             </button>
                             <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="wCq-gn-ahC">
-                                <rect key="frame" x="13" y="121" width="449" height="5"/>
+                                <rect key="frame" x="13" y="115" width="449" height="82"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </box>
                             <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="WCG-o6-Xgb">
-                                <rect key="frame" x="13" y="59" width="449" height="5"/>
+                                <rect key="frame" x="13" y="88" width="449" height="10"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </box>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mse-3Q-V9C">
@@ -770,6 +770,17 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
+                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16f-TP-PQe">
+                                <rect key="frame" x="20" y="61" width="89" height="18"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <buttonCell key="cell" type="check" title="Max Power" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="CqP-dF-MMv">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <binding destination="XfG-lQ-9wD" name="value" keyPath="maxPower" id="uIu-UN-2cm"/>
+                                </connections>
+                            </button>
                         </subviews>
                     </view>
                     <connections>
@@ -779,7 +790,7 @@
                 </viewController>
                 <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="75" y="617"/>
+            <point key="canvasLocation" x="75" y="632"/>
         </scene>
     </scenes>
 </document>

--- a/ExtractKanMusu/ViewController.swift
+++ b/ExtractKanMusu/ViewController.swift
@@ -34,6 +34,15 @@ class ViewController: NSViewController {
     @IBOutlet var cachePathField: NSPathControl!
     @IBOutlet var outputFolderField: NSPathControl!
     
+    dynamic var maxPower = false
+    
+    var useCoreCount: Int {
+        
+        let coreCount = ProcessInfo.processInfo.processorCount
+        
+        return maxPower ? coreCount : coreCount / 2
+    }
+    
     let progress = ProgressPanelController()
 
     override func viewDidLoad() {
@@ -46,7 +55,6 @@ class ViewController: NSViewController {
         
         outputFolderField.url = ApplicationDirecrories.desctop
         
-        
     }
     
 }
@@ -174,7 +182,7 @@ extension ViewController {
         
         progress.message = "Extracting KanMusu Image from SWF file."
         
-        let semaphone = DispatchSemaphore(value: 4)
+        let semaphone = DispatchSemaphore(value: useCoreCount)
         let group = DispatchGroup()
         let queue = DispatchQueue(label: "extract", attributes: .concurrent)