Commit: be19272c3d9a4cb114c9de3e940cb9bb56546c8e - KanColleGraphicDivider (git)

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

Commit MetaInfo

• Révision: be19272c3d9a4cb114c9de3e940cb9bb56546c8e (tree)
• l'heure: 2018-05-22 22:41:53
• Auteur: masakih <masakih@user...>
• Commiter: masakih

Message de Log

処理を統括するSWFDecodeProcessorを作成

Change Summary

• modified: KanColleGraphicDivider.xcodeproj/project.pbxproj
• modified: KanColleGraphicDivider/Information.h
• modified: KanColleGraphicDivider/Information.m
• add: KanColleGraphicDivider/SWFDecodeProcessor.h
• add: KanColleGraphicDivider/SWFDecodeProcessor.m
• modified: KanColleGraphicDivider/main.m

Modification

--- a/KanColleGraphicDivider.xcodeproj/project.pbxproj
+++ b/KanColleGraphicDivider.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		F44C14BB1D84F07300ADE497 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F44C14BA1D84F07300ADE497 /* main.m */; };
 		F44C14C41D85083E00ADE497 /* HMZlibData.m in Sources */ = {isa = PBXBuildFile; fileRef = F44C14C31D85083E00ADE497 /* HMZlibData.m */; };
 		F48670A120B43D4B00DB9579 /* ImageDataConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = F48670A020B43D4B00DB9579 /* ImageDataConverter.m */; };
+		F48670A420B4533400DB9579 /* SWFDecodeProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = F48670A320B4533400DB9579 /* SWFDecodeProcessor.m */; };
 		F490569020B050D400CF637D /* BitsLossless2Decoder.m in Sources */ = {isa = PBXBuildFile; fileRef = F490568F20B050D400CF637D /* BitsLossless2Decoder.m */; };
 		F490569320B0512C00CF637D /* Information.m in Sources */ = {isa = PBXBuildFile; fileRef = F490569220B0512C00CF637D /* Information.m */; };
 		F490569620B0568F00CF637D /* ImageStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F490569520B0568F00CF637D /* ImageStore.m */; };
@@ -41,6 +42,8 @@
 		F44C14C31D85083E00ADE497 /* HMZlibData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMZlibData.m; sourceTree = "<group>"; };
 		F486709F20B43D4B00DB9579 /* ImageDataConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageDataConverter.h; sourceTree = "<group>"; };
 		F48670A020B43D4B00DB9579 /* ImageDataConverter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImageDataConverter.m; sourceTree = "<group>"; };
+		F48670A220B4533400DB9579 /* SWFDecodeProcessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SWFDecodeProcessor.h; sourceTree = "<group>"; };
+		F48670A320B4533400DB9579 /* SWFDecodeProcessor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SWFDecodeProcessor.m; sourceTree = "<group>"; };
 		F490568D20B04F5300CF637D /* ImageDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageDecoder.h; sourceTree = "<group>"; };
 		F490568E20B050D400CF637D /* BitsLossless2Decoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BitsLossless2Decoder.h; sourceTree = "<group>"; };
 		F490568F20B050D400CF637D /* BitsLossless2Decoder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BitsLossless2Decoder.m; sourceTree = "<group>"; };
@@ -101,6 +104,8 @@
 				F486709D20B30A3100DB9579 /* Decoder */,
 				F490569120B0512C00CF637D /* Information.h */,
 				F490569220B0512C00CF637D /* Information.m */,
+				F48670A220B4533400DB9579 /* SWFDecodeProcessor.h */,
+				F48670A320B4533400DB9579 /* SWFDecodeProcessor.m */,
 				F486709F20B43D4B00DB9579 /* ImageDataConverter.h */,
 				F48670A020B43D4B00DB9579 /* ImageDataConverter.m */,
 				F490569420B0568F00CF637D /* ImageStore.h */,
@@ -215,6 +220,7 @@
 				F490569320B0512C00CF637D /* Information.m in Sources */,
 				F44C14C41D85083E00ADE497 /* HMZlibData.m in Sources */,
 				F49056A620B078DB00CF637D /* SwfData.m in Sources */,
+				F48670A420B4533400DB9579 /* SWFDecodeProcessor.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/KanColleGraphicDivider/Information.h
+++ b/KanColleGraphicDivider/Information.h
@@ -10,8 +10,8 @@
 
 @interface Information: NSObject
 
-@property (readonly) NSURL *originalURL;
-@property (copy, nonatomic, readonly) NSString *originalName;
+@property (copy, readonly) NSURL *originalURL;
+@property (copy, readonly) NSString *originalName;
 
 @property (copy) NSString *outputDir;
 @property (copy) NSString *filename;

--- a/KanColleGraphicDivider/Information.m
+++ b/KanColleGraphicDivider/Information.m
@@ -11,9 +11,9 @@
 
 @interface Information()
 
-@property (readwrite) NSURL *originalURL;
+@property (copy, readwrite) NSURL *originalURL;
 
-@property (copy, nonatomic, readwrite) NSString *originalName;
+@property (copy, readwrite) NSString *originalName;
 
 @end
 
@@ -26,6 +26,7 @@
     if(self.charctorIds.count == 0) return false;
     
     for(NSString *charID in self.charctorIds) {
+        
         if(charID.integerValue == chractorid) return false;
     }
     return true;
@@ -38,6 +39,7 @@
     NSString *filePath = [filename copy];
     
     if(![filePath hasPrefix:@"/"]) {
+        
         NSFileManager *fm = [NSFileManager defaultManager];
         filePath = [fm.currentDirectoryPath stringByAppendingPathComponent:filePath];
     }

--- /dev/null
+++ b/KanColleGraphicDivider/SWFDecodeProcessor.h
@@ -0,0 +1,19 @@
+//
+//  SWFDecodeProcessor.h
+//  KanColleGraphicDivider
+//
+//  Created by Hori,Masaki on 2018/05/22.
+//  Copyright © 2018年 Hori,Masaki. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "Information.h"
+
+@interface SWFDecodeProcessor : NSObject
+
++ (instancetype)swfDecodeProcessorWithInformation:(Information *)infotmation;
+
+- (void)process;
+
+@end

--- /dev/null
+++ b/KanColleGraphicDivider/SWFDecodeProcessor.m
@@ -0,0 +1,60 @@
+//
+//  SWFDecodeProcessor.m
+//  KanColleGraphicDivider
+//
+//  Created by Hori,Masaki on 2018/05/22.
+//  Copyright © 2018年 Hori,Masaki. All rights reserved.
+//
+
+#import "SWFDecodeProcessor.h"
+
+#import "SwfData.h"
+#import "ImageStore.h"
+
+@interface SWFDecodeProcessor()
+
+@property Information *information;
+
+@end
+
+@implementation SWFDecodeProcessor
+
++ (instancetype)swfDecodeProcessorWithInformation:(Information *)infotmation {
+    
+    return [[self alloc] initWithInformation:infotmation];
+}
+
+- (instancetype)initWithInformation:(Information *)information {
+    
+    self = [super init];
+    if( self ) {
+        
+        self.information = information;
+    }
+    
+    return self;
+}
+
+- (void)process {
+    
+    NSData *data = [NSData dataWithContentsOfURL:self.information.originalURL];
+    if(!data) {
+        fprintf(stderr, "Can not open %s.\n", self.information.filename.UTF8String);
+        return;
+    }
+    
+    SwfData *swf = [SwfData dataWithData:data];
+    SwfContent *content = swf.firstContent;
+    
+    ImageStore *store = [ImageStore imageStoreWithInformation:self.information];
+    
+    while( content ) {
+        
+        SwfContent *aContent = content;
+        content = aContent.next;
+        
+        [store store:content.decoder];
+    }
+}
+
+@end

--- a/KanColleGraphicDivider/main.m
+++ b/KanColleGraphicDivider/main.m
@@ -13,9 +13,7 @@
 #include "KanColleGraphicDivider.h"
 
 #import "Information.h"
-#import "ImageStore.h"
-
-#import "SwfData.h"
+#import "SWFDecodeProcessor.h"
 
 void printLogF(const char *fmt, ...) {
     va_list ap;
@@ -64,28 +62,6 @@ static void version()
     exit(EXIT_SUCCESS);
 }
 
-void extractImagesFromSWFFile(Information *info) {
-    
-    NSData *data = [NSData dataWithContentsOfURL:info.originalURL];
-    if(!data) {
-        fprintf(stderr, "Can not open %s.\n", info.filename.UTF8String);
-        return;
-    }
-    
-    SwfData *swf = [SwfData dataWithData:data];
-    SwfContent *content = swf.firstContent;
-    
-    ImageStore *store = [ImageStore imageStoreWithInformation:info];
-    
-    while( content ) {
-        
-        SwfContent *aContent = content;
-        content = aContent.next;
-        
-        [store store:content.decoder];
-    }
-}
-
 int main(int argc, char * const *argv) {
     
     NSString *outputDir = nil;
@@ -169,7 +145,9 @@ int main(int argc, char * const *argv) {
             info.filename = [[NSString alloc] initWithUTF8String:filename];
             
             dispatch_group_async(group, queue, ^{
-                extractImagesFromSWFFile(info);
+                
+                SWFDecodeProcessor *processor = [SWFDecodeProcessor swfDecodeProcessorWithInformation:info];
+                [processor process];
             });
         }
         dispatch_group_wait(group, DISPATCH_TIME_FOREVER);