提交: 011485a879d08e456fdaa26dc2aada2a9269fa3f - KanColleGraphicDivider (git)

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

Commit MetaInfo

• 修订版: 011485a879d08e456fdaa26dc2aada2a9269fa3f (tree)
• 时间: 2018-05-23 00:43:36
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

f オプションを追加

f, force オプションを設定すると出力ファイルが存在しても上書きする。設定されていなければ、何もしない。

更改概述

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

差异

--- a/KanColleGraphicDivider/ImageStore.m
+++ b/KanColleGraphicDivider/ImageStore.m
@@ -39,6 +39,13 @@
     path = [self.information.outputDir stringByAppendingPathComponent:path];
     NSURL *url = [NSURL fileURLWithPath:path];
     
+    if( !self.information.forceOverWrite && [url checkResourceIsReachableAndReturnError:nil] ) {
+        
+        fprintf(stderr, "%s is already exist.\n", url.path.UTF8String);
+        
+        return;
+    }
+    
     [decoder.decodedData writeToURL:url atomically:YES];
 }
 

--- a/KanColleGraphicDivider/Information.h
+++ b/KanColleGraphicDivider/Information.h
@@ -16,6 +16,7 @@
 @property (copy) NSString *outputDir;
 @property (copy) NSString *filename;
 @property (copy) NSArray *charctorIds;
+@property BOOL forceOverWrite;
 
 - (BOOL)skipCharactorID:(UInt16) chractorid;
 

--- a/KanColleGraphicDivider/main.m
+++ b/KanColleGraphicDivider/main.m
@@ -33,6 +33,8 @@ static void usage(int exitVal, FILE *fp) {
     fprintf(fp, "\textracted images output to output-directory.\n");
     fprintf(fp, "  -v, --version\n");
     fprintf(fp, "\toutput version information and exit.\n");
+    fprintf(fp, "  -f, --force\n");
+    fprintf(fp, "\tif set, force orver write outputfile.\n");
     fprintf(fp, "  -h, --help\n");
     fprintf(fp, "\tdisplay this help and text.\n");
     
@@ -48,6 +50,7 @@ int main(int argc, char * const *argv) {
     
     NSString *outputDir = nil;
     NSArray *charactorIds = nil;
+    BOOL forceOverwrite = NO;
     
     @autoreleasepool {
         // 引数の処理
@@ -57,10 +60,11 @@ int main(int argc, char * const *argv) {
         
         toolName = toolNameStr(argv[0]);
         
-#define SHORTOPTS "ho:vc:"
+#define SHORTOPTS "fho:vc:"
         static struct option longopts[] = {
             {"output",      required_argument,  NULL,   'o'},
             {"charactorid", required_argument,  NULL,   'c'},
+            {"force",       no_argument,        NULL,   'f'},
             {"version",     no_argument,        NULL,   'v'},
             {"help",        no_argument,        NULL,   'h'},
             {NULL,          0,                  NULL,   0}
@@ -75,6 +79,9 @@ int main(int argc, char * const *argv) {
                 case 'c':
                     charactorid = optarg;
                     break;
+                case 'f':
+                    forceOverwrite = YES;
+                    break;
                 case 'h':
                     usage(EXIT_SUCCESS, stdout);
                     break;
@@ -133,6 +140,7 @@ int main(int argc, char * const *argv) {
             info.outputDir = outputDir;
             info.charctorIds = charactorIds;
             info.filename = [[NSString alloc] initWithUTF8String:filename];
+            info.forceOverWrite = forceOverwrite;
             
             dispatch_group_async(group, queue, ^{