提交: 65cb22fc7e490d1ecf9eca6840ebf9bce9868136 - ExtractKanMusu (git)

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

Commit MetaInfo

• 修订版: 65cb22fc7e490d1ecf9eca6840ebf9bce9868136 (tree)
• 时间: 2017-08-08 21:29:39
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

機能部分を分離

更改概述

• modified: ExtractKanMusu.xcodeproj/project.pbxproj
• modified: ExtractKanMusu/AppDelegate.swift
• add: ExtractKanMusu/ChuuChuu.swift
• modified: ExtractKanMusu/ProgressPanelController.swift
• modified: ExtractKanMusu/ViewController.swift

差异

--- a/ExtractKanMusu.xcodeproj/project.pbxproj
+++ b/ExtractKanMusu.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		F41A44C81F3710D10066F83D /* ProgressPanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A44C61F3710D10066F83D /* ProgressPanelController.swift */; };
 		F41A44C91F3710D10066F83D /* ProgressPanelController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F41A44C71F3710D10066F83D /* ProgressPanelController.xib */; };
 		F41A44CE1F38B8510066F83D /* ApplicationDirecrories.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A44CD1F38B8510066F83D /* ApplicationDirecrories.swift */; };
+		F41A44D21F39E1450066F83D /* ChuuChuu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A44D11F39E1450066F83D /* ChuuChuu.swift */; };
 		F4EAFCBE1F369E71007B7506 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EAFCBD1F369E71007B7506 /* AppDelegate.swift */; };
 		F4EAFCC01F369E71007B7506 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EAFCBF1F369E71007B7506 /* ViewController.swift */; };
 		F4EAFCC21F369E71007B7506 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4EAFCC11F369E71007B7506 /* Assets.xcassets */; };
@@ -41,6 +42,7 @@
 		F41A44C61F3710D10066F83D /* ProgressPanelController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProgressPanelController.swift; sourceTree = "<group>"; };
 		F41A44C71F3710D10066F83D /* ProgressPanelController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProgressPanelController.xib; sourceTree = "<group>"; };
 		F41A44CD1F38B8510066F83D /* ApplicationDirecrories.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationDirecrories.swift; sourceTree = "<group>"; };
+		F41A44D11F39E1450066F83D /* ChuuChuu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChuuChuu.swift; sourceTree = "<group>"; };
 		F4EAFCBA1F369E71007B7506 /* ExtractKanMusu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExtractKanMusu.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F4EAFCBD1F369E71007B7506 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F4EAFCBF1F369E71007B7506 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -94,6 +96,7 @@
 				F4EAFCBF1F369E71007B7506 /* ViewController.swift */,
 				F41A44C61F3710D10066F83D /* ProgressPanelController.swift */,
 				F41A44C71F3710D10066F83D /* ProgressPanelController.xib */,
+				F41A44D11F39E1450066F83D /* ChuuChuu.swift */,
 				F4EAFCCC1F36A28B007B7506 /* pickup.rb */,
 				F4EAFCCE1F36B8FE007B7506 /* PickUpSWF.swift */,
 				F4EAFCDF1F36D9E5007B7506 /* ExtractKanmusu.swift */,
@@ -214,6 +217,7 @@
 				F4EAFCC01F369E71007B7506 /* ViewController.swift in Sources */,
 				F4EAFCCF1F36B8FE007B7506 /* PickUpSWF.swift in Sources */,
 				F4EAFCE01F36D9E5007B7506 /* ExtractKanmusu.swift in Sources */,
+				F41A44D21F39E1450066F83D /* ChuuChuu.swift in Sources */,
 				F4EAFCBE1F369E71007B7506 /* AppDelegate.swift in Sources */,
 				F41A44C81F3710D10066F83D /* ProgressPanelController.swift in Sources */,
 			);

--- a/ExtractKanMusu/AppDelegate.swift
+++ b/ExtractKanMusu/AppDelegate.swift
@@ -10,9 +10,7 @@ import Cocoa
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
-
-
-
+    
     func applicationShouldTerminateAfterLastWindowClosed(_: NSApplication) -> Bool {
         
         return true

--- /dev/null
+++ b/ExtractKanMusu/ChuuChuu.swift
@@ -0,0 +1,185 @@
+//
+//  ChuuChuu.swift
+//  ExtractKanMusu
+//
+//  Created by Hori,Masaki on 2017/08/08.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+
+
+protocol MessageObserver: class {
+    
+    var message: String { get set }
+    
+    var count: Int { get set }
+    
+    func increse()
+}
+
+class ChuuChuu {
+    
+    static let chuchu = "ちゅーちゅー"
+    static let tempDirName = "___temp_chu-chu-_ship___"
+    
+    let observer: MessageObserver
+    let originalDir: URL
+    let destinationDir: URL
+    
+    private var maxPower = false
+    private var useCoreCount: Int {
+        
+        let coreCount = ProcessInfo.processInfo.processorCount
+        
+        return maxPower ? coreCount : coreCount / 2
+    }
+    
+    init(observer: MessageObserver, original: URL, destination: URL) {
+        
+        self.observer = observer
+        originalDir = original
+        destinationDir = destination
+    }
+    
+    
+    private func createTempDir() throws {
+        
+        let tempURL = originalDir.appendingPathComponent(ChuuChuu.tempDirName)
+        
+        try FileManager.default
+            .createDirectory(at: tempURL, withIntermediateDirectories: true, attributes: nil)
+        
+    }
+    
+    private func deleteTempDir() throws {
+        
+        let tempURL = originalDir.appendingPathComponent(ChuuChuu.tempDirName)
+        
+        try FileManager.default.removeItem(at: tempURL)
+    }
+    
+    private func createDestDir() throws {
+        
+        let destURL = destinationDir.appendingPathComponent(ChuuChuu.chuchu)
+        
+        try FileManager.default
+            .createDirectory(at: destURL, withIntermediateDirectories: true, attributes: nil)
+        
+    }
+    
+    private func moveSWF(from originalDir: URL, to destinationDir: URL) {
+        
+        observer.message = "Picking up SWF file from Cache Directory."
+        
+        do {
+            
+            try pickUpSWF(from: originalDir, to: destinationDir)
+            
+        } catch {
+            
+            print("Can not pickup.", terminator: " : ")
+            
+            guard let error = error as? PickUPSWFError else {
+                
+                print("Unkown error.")
+                return
+            }
+            
+            switch error {
+            case .scriptNotFound: print("Script not found.")
+                
+            case let .commandFail(status): print("Command faile status \(status).")
+            }
+        }
+    }
+    
+    private func extractKanmusus(swfs: [URL], to destURL: URL) {
+        
+        observer.message = "Extracting KanMusu Image from SWF file."
+        
+        let semaphone = DispatchSemaphore(value: useCoreCount)
+        let group = DispatchGroup()
+        let queue = DispatchQueue(label: "extract", attributes: .concurrent)
+        
+        swfs.forEach { swf in
+            
+            queue.async(group: group) {
+                
+                semaphone.wait()
+                
+                do {
+                    
+                    try extractKanmusu(swf: swf, to: destURL)
+                    
+                } catch {
+                    
+                    print(error)
+                }
+                
+                semaphone.signal()
+                
+                self.observer.increse()
+                
+            }
+            
+        }
+        
+        group.wait()
+    }
+    
+    
+    func execute(maxPower: Bool, completeHandler: @escaping () -> Void) {
+        
+        guard let existOriginalDir = try? originalDir.checkResourceIsReachable(),
+            existOriginalDir else {
+                
+                completeHandler()
+                return
+        }
+        
+        guard let existDestinationDir = try? destinationDir.checkResourceIsReachable(),
+            existDestinationDir else {
+                
+                completeHandler()
+                return
+        }
+        
+        self.maxPower = maxPower
+        
+        
+        DispatchQueue(label: "Nya-nn").async {
+            
+            do {
+                
+                try self.createTempDir()
+                try self.createDestDir()
+                
+                self.moveSWF(from: self.originalDir, to: self.destinationDir)
+                
+                let tempURL = self.originalDir.appendingPathComponent(ChuuChuu.tempDirName)
+                let destURL = self.destinationDir.appendingPathComponent(ChuuChuu.chuchu)
+                
+                let swfs = try FileManager.default
+                    .contentsOfDirectory(at: tempURL, includingPropertiesForKeys: nil)
+                    .filter { $0.pathExtension.lowercased() == "swf" }
+                
+                self.observer.count = swfs.count
+                
+                self.extractKanmusus(swfs: swfs, to: destURL)
+                
+                try self.deleteTempDir()
+                
+            } catch {
+                
+                print(error)
+            }
+            
+            DispatchQueue.main.async {
+                
+                completeHandler()
+            }
+        }
+    }
+    
+}

--- a/ExtractKanMusu/ProgressPanelController.swift
+++ b/ExtractKanMusu/ProgressPanelController.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 
-class ProgressPanelController: NSWindowController {
+class ProgressPanelController: NSWindowController, MessageObserver {
     
     private dynamic var rawCount: Int = 0 {
         
@@ -83,7 +83,7 @@ class ProgressPanelController: NSWindowController {
         return "ProgressPanelController"
     }
     
-    func appendFinished() {
+    func increse() {
         
         DispatchQueue.main.async {
             

--- a/ExtractKanMusu/ViewController.swift
+++ b/ExtractKanMusu/ViewController.swift
@@ -10,25 +10,16 @@ import Cocoa
 
 class ViewController: NSViewController {
     
-    static let chuchu = "ちゅーちゅー"
-    static let tempDirName = "___temp_chu-chu-_ship___"
-    
-    
     let progress = ProgressPanelController()
     
+    var chuuchuu: ChuuChuu?
+    
     
     @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
-    }
-    
     
     override func viewDidLoad() {
         
@@ -63,8 +54,7 @@ extension ViewController {
         
         panel.beginSheetModal(for: window) {
             
-            guard $0 == NSFileHandlingPanelOKButton
-                else { return }
+            guard $0 == NSFileHandlingPanelOKButton else { return }
             
             handler(panel.url)
             
@@ -95,177 +85,30 @@ extension ViewController {
     
     @IBAction func extract(_ : Any?) {
         
-        self.view.window?.beginSheet(progress.window!, completionHandler: nil)
-        
-        execute() { [weak self] in
+        guard let original = cachePathField.url else {
             
-            guard let `self` = self else { return }
-            
-            self.view.window?.endSheet(self.progress.window!)
-        }
-        
-    }
-}
-
-extension ViewController {
-
-    private enum ExtractKanMusu: Error {
-        
-        case urlMissing(String)
-    }
-    private func createTempDir() throws {
-        
-        guard let tempParentURL = cachePathField.url else {
-            
-            throw ExtractKanMusu.urlMissing("Cache dir is nil")
-        }
-        
-        let tempURL = tempParentURL.appendingPathComponent(ViewController.tempDirName)
-        
-        try FileManager.default
-            .createDirectory(at: tempURL, withIntermediateDirectories: true, attributes: nil)
-        
-    }
-    
-    private func deleteTempDir() throws {
-        
-        guard let tempParentURL = cachePathField.url else {
-            
-            throw ExtractKanMusu.urlMissing("Cache dir is nil")
-        }
-        
-        let tempURL = tempParentURL.appendingPathComponent(ViewController.tempDirName)
-        
-        try FileManager.default.removeItem(at: tempURL)
-    }
-    
-    private func createDestDir() throws {
-        
-        guard let destParentURL = outputFolderField.url else {
+            print("CachPath is nil.")
             
-            throw ExtractKanMusu.urlMissing("Output dir is nil")
+            return
         }
         
-        let destURL = destParentURL.appendingPathComponent(ViewController.chuchu)
-        
-        try FileManager.default
-            .createDirectory(at: destURL, withIntermediateDirectories: true, attributes: nil)
-        
-    }
-    
-    private func moveSWF(from originalDir: URL, to destinationDir: URL) {
-        
-        progress.message = "Picking up SWF file from Cache Directory."
-        
-        do {
-            
-            try pickUpSWF(from: originalDir, to: destinationDir)
-            
-        } catch {
-            
-            print("Can not pickup.", terminator: " : ")
+        guard let dest = outputFolderField.url else {
             
-            guard let error = error as? PickUPSWFError else {
-                print("Unkown error.")
-                return
-            }
+            print("outputPath is nil.")
             
-            switch error {
-            case .scriptNotFound: print("Script not found.")
-                
-            case let .commandFail(status): print("Command faile status \(status).")
-            }
+            return
         }
-    }
-    
-    
-    private func extractKanmusus(swfs: [URL], to destURL: URL) {
         
-        progress.message = "Extracting KanMusu Image from SWF file."
+        chuuchuu = ChuuChuu(observer: progress, original: original, destination: dest)
         
-        let semaphone = DispatchSemaphore(value: useCoreCount)
-        let group = DispatchGroup()
-        let queue = DispatchQueue(label: "extract", attributes: .concurrent)
+        self.view.window?.beginSheet(progress.window!, completionHandler: nil)
         
-        swfs.forEach { swf in
+        chuuchuu?.execute(maxPower: maxPower) { [weak self] in
             
-            queue.async(group: group) {
-                
-                semaphone.wait()
-                
-                do {
-                    
-                    try extractKanmusu(swf: swf, to: destURL)
-                    
-                } catch {
-                    
-                    print(error)
-                }
-                
-                semaphone.signal()
-                
-                self.progress.appendFinished()
-                
-            }
+            guard let `self` = self else { return }
             
+            self.view.window?.endSheet(self.progress.window!)
         }
         
-        group.wait()
-    }
-    
-    
-    fileprivate func execute(completeHandler: @escaping () -> Void) {
-        
-        guard let originalDir = cachePathField.url,
-            let existOriginalDir = try? originalDir.checkResourceIsReachable(),
-            existOriginalDir else {
-                
-                completeHandler()
-                return
-        }
-        
-        guard let destinationDir = outputFolderField.url,
-            let existDestinationDir = try? destinationDir.checkResourceIsReachable(),
-            existDestinationDir else {
-                
-                completeHandler()
-                return
-        }
-        
-        
-        DispatchQueue(label: "Nya-nn").async {
-            
-            do {
-                
-                try self.createTempDir()
-                try self.createDestDir()
-                
-                self.moveSWF(from: originalDir, to: destinationDir)
-                
-                let tempURL = originalDir.appendingPathComponent(ViewController.tempDirName)
-                let destURL = destinationDir.appendingPathComponent(ViewController.chuchu)
-                
-                let swfs = try FileManager.default
-                    .contentsOfDirectory(at: tempURL, includingPropertiesForKeys: nil)
-                    .filter { $0.pathExtension.lowercased() == "swf" }
-                
-                self.progress.count = swfs.count
-                
-                self.extractKanmusus(swfs: swfs, to: destURL)
-                
-                try self.deleteTempDir()
-                
-            } catch {
-                
-                print(error)
-            }
-            
-            DispatchQueue.main.async {
-                
-                completeHandler()
-            }
-        }
     }
-    
 }
-