Commit: 970f28aac73ca42538dfea33f734c20f7d34e79d - ExtractKanMusu (git)

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

Commit MetaInfo

• Révision: 970f28aac73ca42538dfea33f734c20f7d34e79d (tree)
• l'heure: 2017-08-06 17:24:48
• Auteur: masakih <masakih@user...>
• Commiter: masakih

Message de Log

一時フォルダを削除するようにした

Change Summary

• modified: ExtractKanMusu/ViewController.swift

Modification

--- a/ExtractKanMusu/ViewController.swift
+++ b/ExtractKanMusu/ViewController.swift
@@ -28,6 +28,8 @@ struct ApplicationDirecrories {
 
 class ViewController: NSViewController {
     
+    static let chuchu = "ちゅーちゅー"
+    static let tempDirName = "___temp_chu-chu-_ship___"
     
     @IBOutlet var cachePathField: NSPathControl!
     @IBOutlet var outputFolderField: NSPathControl!
@@ -109,12 +111,22 @@ extension ViewController {
             throw ExtractKanMusu.urlMissing("Cache dir is nil")
         }
         
-        let tempURL = tempParentURL.appendingPathComponent("___temp_chu-chu-_ship___")
+        let tempURL = tempParentURL.appendingPathComponent(ViewController.tempDirName)
         
         try FileManager.default
             .createDirectory(at: tempURL, withIntermediateDirectories: true, attributes: nil)
         
+    }
+    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)
     }
     func createDestDir() throws {
         
@@ -123,12 +135,11 @@ extension ViewController {
             throw ExtractKanMusu.urlMissing("Output dir is nil")
         }
         
-        let destURL = destParentURL.appendingPathComponent("ちゅーちゅー")
+        let destURL = destParentURL.appendingPathComponent(ViewController.chuchu)
         
         try FileManager.default
             .createDirectory(at: destURL, withIntermediateDirectories: true, attributes: nil)
         
-        
     }
     
     
@@ -144,6 +155,18 @@ extension ViewController {
             existDestinationDir
             else { return }
         
+        
+        defer {
+            
+            do {
+                
+             try deleteTempDir()
+                
+            } catch {
+                print(error)
+            }
+        }
+        
         do {
             
             try createTempDir()
@@ -175,8 +198,8 @@ extension ViewController {
         
         do {
             
-            let tempURL = originalDir.appendingPathComponent("___temp_chu-chu-_ship___")
-            let destURL = destinationDir.appendingPathComponent("ちゅーちゅー")
+            let tempURL = originalDir.appendingPathComponent(ViewController.tempDirName)
+            let destURL = destinationDir.appendingPathComponent(ViewController.chuchu)
             
             let swfs = try FileManager.default
                 .contentsOfDirectory(at: tempURL, includingPropertiesForKeys: nil)