Commit: 54c311e7abb6a83763dd7def72efbcf1ddec49c7 - KoreNoKaraSu (git)

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

Commit MetaInfo

• Revision: 54c311e7abb6a83763dd7def72efbcf1ddec49c7 (tree)
• Zeit: 2016-10-02 10:28:45
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

HMSwfImageをSwiftで書き換えた

Ändern Zusammenfassung

• modified: KoreNoKaraSu.xcodeproj/project.pbxproj
• modified: KoreNoKaraSu/HMSwfDocument.swift
• delete: KoreNoKaraSu/HMSwfImage.h
• delete: KoreNoKaraSu/HMSwfImage.m
• add: KoreNoKaraSu/HMSwfImage.swift
• modified: KoreNoKaraSu/KoreNoKaraSu-Bridging-Header.h

Diff

--- a/KoreNoKaraSu.xcodeproj/project.pbxproj
+++ b/KoreNoKaraSu.xcodeproj/project.pbxproj
@@ -13,11 +13,11 @@
 		F42ADB321D9A91D400407165 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F42ADB311D9A91D400407165 /* Assets.xcassets */; };
 		F42ADB351D9A91D400407165 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F42ADB331D9A91D400407165 /* MainMenu.xib */; };
 		F42ADB401D9A942A00407165 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F42ADB421D9A942A00407165 /* InfoPlist.strings */; };
-		F42ADB451D9A96ED00407165 /* HMSwfImage.m in Sources */ = {isa = PBXBuildFile; fileRef = F42ADB441D9A96ED00407165 /* HMSwfImage.m */; };
 		F42ADB4C1D9AA56000407165 /* KanColleGraphicDivider in Resources */ = {isa = PBXBuildFile; fileRef = F42ADB4B1D9AA56000407165 /* KanColleGraphicDivider */; };
 		F42ADB651D9BFDED00407165 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F42ADB631D9BFDED00407165 /* Localizable.strings */; };
 		F42ADB681D9D5F1300407165 /* HMTemporaryDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F42ADB671D9D5F1300407165 /* HMTemporaryDirectory.m */; };
 		F42ADB6C1D9FC7FD00407165 /* HMSwfDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42ADB6B1D9FC7FD00407165 /* HMSwfDocument.swift */; };
+		F42ADB8C1DA0909200407165 /* HMSwfImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42ADB8B1DA0909200407165 /* HMSwfImage.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -49,8 +49,6 @@
 		F42ADB3E1D9A942300407165 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/HMSwfDocument.strings; sourceTree = "<group>"; };
 		F42ADB3F1D9A942300407165 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		F42ADB411D9A942A00407165 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F42ADB431D9A96ED00407165 /* HMSwfImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSwfImage.h; sourceTree = "<group>"; };
-		F42ADB441D9A96ED00407165 /* HMSwfImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSwfImage.m; sourceTree = "<group>"; };
 		F42ADB471D9AA3EA00407165 /* KanColleGraphicDivider */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = KanColleGraphicDivider; path = "../../Library/Developer/Xcode/DerivedData/KoreNoKaraSu-azymafwtbfcomieoipkjtpgiffzd/Build/Products/Debug/KanColleGraphicDivider"; sourceTree = "<group>"; };
 		F42ADB4B1D9AA56000407165 /* KanColleGraphicDivider */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; path = KanColleGraphicDivider; sourceTree = BUILT_PRODUCTS_DIR; };
 		F42ADB581D9BFCD100407165 /* KanColleGraphicDivider.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KanColleGraphicDivider.xcodeproj; path = KanColleGraphicDivider/KanColleGraphicDivider.xcodeproj; sourceTree = "<group>"; };
@@ -60,6 +58,7 @@
 		F42ADB671D9D5F1300407165 /* HMTemporaryDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTemporaryDirectory.m; sourceTree = "<group>"; };
 		F42ADB6A1D9FC7FC00407165 /* KoreNoKaraSu-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KoreNoKaraSu-Bridging-Header.h"; sourceTree = "<group>"; };
 		F42ADB6B1D9FC7FD00407165 /* HMSwfDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSwfDocument.swift; sourceTree = "<group>"; };
+		F42ADB8B1DA0909200407165 /* HMSwfImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSwfImage.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -99,8 +98,7 @@
 				F42ADB261D9A91D300407165 /* AppDelegate.m */,
 				F42ADB6B1D9FC7FD00407165 /* HMSwfDocument.swift */,
 				F42ADB2E1D9A91D400407165 /* HMSwfDocument.xib */,
-				F42ADB431D9A96ED00407165 /* HMSwfImage.h */,
-				F42ADB441D9A96ED00407165 /* HMSwfImage.m */,
+				F42ADB8B1DA0909200407165 /* HMSwfImage.swift */,
 				F42ADB661D9D5F1300407165 /* HMTemporaryDirectory.h */,
 				F42ADB671D9D5F1300407165 /* HMTemporaryDirectory.m */,
 				F42ADB311D9A91D400407165 /* Assets.xcassets */,
@@ -233,10 +231,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				F42ADB6C1D9FC7FD00407165 /* HMSwfDocument.swift in Sources */,
+				F42ADB8C1DA0909200407165 /* HMSwfImage.swift in Sources */,
 				F42ADB2A1D9A91D300407165 /* main.m in Sources */,
 				F42ADB681D9D5F1300407165 /* HMTemporaryDirectory.m in Sources */,
 				F42ADB271D9A91D300407165 /* AppDelegate.m in Sources */,
-				F42ADB451D9A96ED00407165 /* HMSwfImage.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/KoreNoKaraSu/HMSwfDocument.swift
+++ b/KoreNoKaraSu/HMSwfDocument.swift
@@ -70,11 +70,7 @@ class HMSwfDocument: NSDocument {
                     Swift.print("can not create image from \($0.path)")
                     return nil
                 }
-                let swfImage = HMSwfImage()
-                swfImage.image = image
-                swfImage.url = $0
-                
-                return swfImage
+                return HMSwfImage(url: $0, image: image)
             }.sorted {
                 $0.name.numericCompare($1.name)
             }

--- a/KoreNoKaraSu/HMSwfImage.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  HMSwfImage.h
-//  KoreNoKaraSu
-//
-//  Created by Hori,Masaki on 2016/09/27.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface HMSwfImage : NSObject
-
-@property (strong) NSURL *URL;
-@property (strong) NSImage *image;
-
-@property (readonly) NSString *name;
-@property (readonly) NSString *typeName;
-
-@end

--- a/KoreNoKaraSu/HMSwfImage.m
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  HMSwfImage.m
-//  KoreNoKaraSu
-//
-//  Created by Hori,Masaki on 2016/09/27.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMSwfImage.h"
-
-@implementation HMSwfImage
-
-- (NSString *)name
-{
-    NSString *filename = self.URL.lastPathComponent.stringByDeletingPathExtension;
-    
-    NSArray<NSString *> *comp = [filename componentsSeparatedByString:@"-"];
-    if(comp.count > 1) return comp[1];
-    
-    return filename;
-}
-@end

--- /dev/null
+++ b/KoreNoKaraSu/HMSwfImage.swift
@@ -0,0 +1,29 @@
+//
+//  HMSwfImage.swift
+//  KoreNoKaraSu
+//
+//  Created by Hori,Masaki on 2016/10/02.
+//  Copyright © 2016年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMSwfImage : NSObject {
+    let url: URL
+    let image: NSImage
+    var name: String {
+        let url = self.url
+        let filename = url.deletingPathExtension().lastPathComponent
+        let component = filename.components(separatedBy: "-")
+        if component.count > 1 { return component[1] }
+        return filename
+    }
+    var typeName: String {
+        return url.pathExtension
+    }
+    
+    init(url: URL, image: NSImage) {
+        self.url = url
+        self.image = image
+    }
+}

--- a/KoreNoKaraSu/KoreNoKaraSu-Bridging-Header.h
+++ b/KoreNoKaraSu/KoreNoKaraSu-Bridging-Header.h
@@ -2,5 +2,4 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "HMSwfImage.h"
 #import "HMTemporaryDirectory.h"