提交: 184a680a2c7b3759066c9617a4dabef64ebb1532 - KoreNoKaraSu (git)

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

Commit MetaInfo

• 修訂: 184a680a2c7b3759066c9617a4dabef64ebb1532 (tree)
• 時間: 2016-10-02 20:59:31
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

例外の処理方法を変更

Change Summary

• modified: KoreNoKaraSu/HMSwfDocument.swift
• modified: KoreNoKaraSu/HMTemporaryDirectory.swift

差異

--- a/KoreNoKaraSu/HMSwfDocument.swift
+++ b/KoreNoKaraSu/HMSwfDocument.swift
@@ -108,14 +108,19 @@ class HMSwfDocument: NSDocument {
             guard $0 != NSModalResponseCancel else { return }
             
             if FileManager().fileExists(atPath: panel.url!.path) {
-                guard let _ = try? FileManager().removeItem(at: panel.url!) else {
+                do {
+                    try FileManager().removeItem(at: panel.url!)
+                } catch {
                     Swift.print("Fail to remove item.")
                     return
                 }
             }
-            guard let _ = try? FileManager().copyItem(at: target.url, to: panel.url!) else {
+            
+            do {
+                try FileManager().copyItem(at: target.url, to: panel.url!)
+            } catch {
                 Swift.print("Fail to copy item")
-                return
+
             }
         }
     }

--- a/KoreNoKaraSu/HMTemporaryDirectory.swift
+++ b/KoreNoKaraSu/HMTemporaryDirectory.swift
@@ -17,16 +17,18 @@ struct HMTemporaryDirectory {
     
     init(name: String) throws {
         let tempDir: URL
-        let o = NSTemporaryDirectory()
+        let t = NSTemporaryDirectory()
         if let identifier = Bundle.main.bundleIdentifier {
-            tempDir = URL(fileURLWithPath: o).appendingPathComponent(identifier)
+            tempDir = URL(fileURLWithPath: t).appendingPathComponent(identifier)
         } else {
-            tempDir = URL(fileURLWithPath: o).appendingPathComponent("KoreNoKaraSu")
+            tempDir = URL(fileURLWithPath: t).appendingPathComponent("KoreNoKaraSu")
         }
         
         url = tempDir.appendingPathComponent(name)
         
-        guard let _ = try? FileManager().createDirectory(at: url, withIntermediateDirectories: true, attributes: nil) else {
+        do {
+            try FileManager().createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+        } catch {
             print("Can not create directory \(url.path)")
             throw HMTemporaryDirectoryError.CoanNotCreateDirectory
         }