From 3dc81b9710b3296c771a002f55f9422a5532f9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Wed, 21 Dec 2022 14:04:07 +0100
Subject: [PATCH] Replace shapes from commandline - add some output do let know
 what it does

---
 .../flash/console/CommandLineArgumentParser.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 0339522e8..d642048ee 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -3684,7 +3684,7 @@ public class CommandLineArgumentParser {
         }
         try (StdInAwareFileInputStream is = new StdInAwareFileInputStream(inFile)) {
             SWF swf = new SWF(is, Configuration.parallelSpeedUp.get(), charset);
-
+            System.out.println("Source file opened");
             String selFile = args.pop();
 
             File shapesDir = new File(Path.combine(selFile, ShapeExportSettings.EXPORT_FOLDER_NAME));
@@ -3692,6 +3692,7 @@ public class CommandLineArgumentParser {
             SvgImporter svgImporter = new SvgImporter();
 
             Map<Integer, CharacterTag> characters = swf.getCharacters();
+            int shapeCount = 0;
             List<String> extensions = Arrays.asList("svg", "png", "jpg", "jpeg", "gif", "bmp");
             for (int characterId : characters.keySet()) {
                 CharacterTag tag = characters.get(characterId);
@@ -3715,20 +3716,23 @@ public class CommandLineArgumentParser {
                     File sourceFile = existingFilesForImageTag.get(0);
 
                     try {
+                        System.out.println("Importing character " + characterId + " from file " + sourceFile.getName());
                         if (sourceFile.getAbsolutePath().toLowerCase().endsWith(".svg")) {
                             svgImporter.importSvg(shapeTag, Helper.readTextFile(sourceFile.getAbsolutePath()), !noFill);
                         } else {
                             shapeImporter.importImage(shapeTag, Helper.readFile(sourceFile.getAbsolutePath()), 0, !noFill);
                         }
+                        shapeCount++;
                     } catch (IOException ex) {
                         logger.log(Level.WARNING, "Cannot import shape " + characterId + " from file " + sourceFile.getName(), ex);
                     }
                 }
             }
-
+            System.out.println("Writing outfile");
             try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(outFile))) {
                 swf.saveTo(fos);
             }
+            System.out.println("" + shapeCount + " shapes successfully imported");
         } catch (IOException | InterruptedException e) {
             System.err.println("I/O error during writing");
             System.exit(2);
@@ -3793,7 +3797,7 @@ public class CommandLineArgumentParser {
             try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(outFile))) {
                 swf.saveTo(fos);
             }
-            System.out.println("" + imageCount + " images sucessfully imported");
+            System.out.println("" + imageCount + " images successfully imported");
         } catch (IOException | InterruptedException e) {
             System.err.println("I/O error during writing");
             System.exit(2);
@@ -3862,7 +3866,7 @@ public class CommandLineArgumentParser {
             });
 
             // try to import formatted texts
-            if (textsFile.exists()) {
+            if (textsFile.exists()) {                
                 textImporter.importTextsSingleFileFormatted(textsFile, swf);
             } else {
                 textsFile = new File(Path.combine(selFile, TextExportSettings.EXPORT_FOLDER_NAME, TextExporter.TEXT_EXPORT_FILENAME_PLAIN));