コミット: c6c66cb1da8c4760f0319a5da8a43111a88beefe - KanColleGraphicDivider (git)

swfから画像を抽出するコマンドラインアプリケーション

コミットメタ情報

• リビジョン: c6c66cb1da8c4760f0319a5da8a43111a88beefe (tree)
• 日時: 2018-05-22 22:24:44
• 作者: masakih <masakih@user...>
• コミッター: masakih

ログメッセージ

Informationクラスが行うべき処理をInformationクラスに移動した

変更サマリ

• modified: KanColleGraphicDivider/Information.h
• modified: KanColleGraphicDivider/Information.m
• modified: KanColleGraphicDivider/main.m

差分

--- a/KanColleGraphicDivider/Information.h
+++ b/KanColleGraphicDivider/Information.h
@@ -9,11 +9,14 @@
 #import <Foundation/Foundation.h>
 
 @interface Information: NSObject
-@property (copy) NSString *originalName;
+
+@property (readonly) NSURL *originalURL;
+@property (copy, nonatomic, readonly) NSString *originalName;
+
 @property (copy) NSString *outputDir;
 @property (copy) NSString *filename;
 @property (copy) NSArray *charctorIds;
 
-- (bool)skipCharactorID:(UInt16) chractorid;
+- (BOOL)skipCharactorID:(UInt16) chractorid;
 
 @end

--- a/KanColleGraphicDivider/Information.m
+++ b/KanColleGraphicDivider/Information.m
@@ -8,8 +8,21 @@
 
 #import "Information.h"
 
+
+@interface Information()
+
+@property (readwrite) NSURL *originalURL;
+
+@property (copy, nonatomic, readwrite) NSString *originalName;
+
+@end
+
 @implementation Information
-- (bool)skipCharactorID:(UInt16) chractorid {
+
+@synthesize filename = _filename;
+
+- (BOOL)skipCharactorID:(UInt16) chractorid {
+    
     if(self.charctorIds.count == 0) return false;
     
     for(NSString *charID in self.charctorIds) {
@@ -17,4 +30,26 @@
     }
     return true;
 }
+
+- (void)setFilename:(NSString *)filename {
+    
+    _filename = [filename copy];
+    
+    NSString *filePath = [filename copy];
+    
+    if(![filePath hasPrefix:@"/"]) {
+        NSFileManager *fm = [NSFileManager defaultManager];
+        filePath = [fm.currentDirectoryPath stringByAppendingPathComponent:filePath];
+    }
+    
+    self.originalURL = [NSURL fileURLWithPath:filePath];
+    
+    NSString *oName = [filename lastPathComponent];
+    self.originalName = [oName stringByDeletingPathExtension];
+}
+
+- (NSString *)filename {
+    
+    return _filename;
+}
 @end

--- a/KanColleGraphicDivider/main.m
+++ b/KanColleGraphicDivider/main.m
@@ -65,22 +65,13 @@ static void version()
 }
 
 void extractImagesFromSWFFile(Information *info) {
-    NSString *filePath = info.filename;
-    if(![filePath hasPrefix:@"/"]) {
-        NSFileManager *fm = [NSFileManager defaultManager];
-        filePath = [fm.currentDirectoryPath stringByAppendingPathComponent:filePath];
-    }
     
-    NSURL *url = [NSURL fileURLWithPath:filePath];
-    NSData *data = [NSData dataWithContentsOfURL:url];
+    NSData *data = [NSData dataWithContentsOfURL:info.originalURL];
     if(!data) {
         fprintf(stderr, "Can not open %s.\n", info.filename.UTF8String);
         return;
     }
     
-    info.originalName = [filePath lastPathComponent];
-    info.originalName = [info.originalName stringByDeletingPathExtension];
-    
     SwfData *swf = [SwfData dataWithData:data];
     SwfContent *content = swf.firstContent;