15 can you please add support to decompress to zipoutputstream #18

kiwi1969 · 2024-03-27T21:05:13Z

Added support for gzip output file.
To do this, simple add ".gz" onto end of output file

Signed-off-by: Russell Shaw <[email protected]>

Restored try clause. Increased GZIP buffer size for effciency and for CryptoCards that only get used if buffer > = 8192 bytes Set GZIP flush option to prevent corruption of file on last write Signed-off-by: Russell Shaw <[email protected]>

Rebased upon existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Rebased change using existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Rebased upon existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Rebased using existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Rebased using existing 5.0.1 branch. Note this change bumps java to Java 17, and uses Shade to reduce output size Signed-off-by: Russell Shaw <[email protected]>

trivial indentation fix Signed-off-by: Russell Shaw <[email protected]>

Restored maven jar plug-in Signed-off-by: Russell Shaw <[email protected]>

Signed-off-by: Russell Shaw <[email protected]>

alexgubanow · 2024-03-29T17:14:38Z

.editorconfig

@@ -0,0 +1,15 @@
+# Declares that this is the top-level configuration


please add .editorconfig to .gitignore too, as it is per developer to setup own

Note this now means that the default tabsize when viewing in github is 8, which was what I was initially trying to correct

alexgubanow · 2024-03-29T17:19:39Z

src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

-
-    	if (args.length == 0) 
+		parseArgs(args);
+    	if (args.length == 0 || (inputFileName == null && outputFileName == null) || (outputFileName == null && textMode == false) || isHelpRequested == true) 


CAN BE IGNORED - check for isHelpRequested right after args.length, reasons:

faster in case of isHelpRequested

simpler to read code, as it first check simple things, later more complicated

Um, this is the other dude's change I merged with. Updated

alexgubanow · 2024-03-29T17:23:35Z

src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

+            else if (inputFileName == null) {
+                inputFileName = args[i];
+            }
+            // second non-flag argument is the input file name


looks like typo, should it be "second non-flag argument is the output file name" ?

I think this is part of the other guy's change I merged with. Updated now

alexgubanow · 2024-03-29T17:25:18Z

src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

+            }
+            else // we have more args than we know what to do with
+            {
+                isHelpRequested = true;


lets call break here, as there is no point to run more this loop

Again, this was the previous dudes change I was asked to merged with. Updated.

alexgubanow · 2024-03-29T17:36:59Z

src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

@@ -95,18 +103,49 @@ else if (outputFileName == null)
    		printUsageAndExit();
    	}

+		System.out.println("Attempting to decompress input file (" + inputFileName +") to output file (" + outputFileName +")");


Here is an example how it will be more streamlined:

Suggested change

System.out.println("Attempting to decompress input file (" + inputFileName +") to output file (" + outputFileName +")");

System.out.println("Opening output file (" + outputFileName + ")");

var outputStream = null;

try {

if (outputFileName.endsWith(".gz")) {

outputStream = new GZIPOutputStream(new FileOutputStream(outputFileName), 8192, true);

}

else {

outputStream = new FileOutputStream(outputFileName);

}

}

catch (Exception e) {

System.out.println("Got exception while opening output file (" + outputFileName + ").\nError message:\n" + e.toString());

}

System.out.println("Attempting to decompress input file (" + inputFileName + ") to output file (" + outputFileName + ")");

try (TerseDecompresser outputWriter = TerseDecompresser.create(new FileInputStream(inputFileName), outputStream)) {

outputWriter.TextFlag = textMode;

outputWriter.decode();

}

catch (Exception e) {

System.out.println("Got exception while decompressing input file (" + inputFileName + ").\nError message:\n" + e.toString());

}

Signed-off-by: Russell Shaw <[email protected]>

Simplied, and actually still works Signed-off-by: Russell Shaw <[email protected]>

Signed-off-by: Russell Shaw <[email protected]>

Improved outfilename suffix defaults Signed-off-by: Russell Shaw <[email protected]>

alexgubanow · 2024-05-13T19:29:36Z

Hello @kiwi1969 , code looks good now.

Have you ran tests? any regression?
.editorconfig file still shown in PR, while you should avoid that by doing git rm, more here https://stackoverflow.com/a/53431148/6672985

kiwi1969 · 2024-05-13T19:48:16Z

FYI - using this code I was successfully able to Unterse a binary SMF110.trs file into a .gz file which is approx half the size.
The .gz file was readable by my java program that unloads SMF110 into MOLS format and JSON.

As requested Signed-off-by: Russell Shaw <[email protected]>

updated version string and date Signed-off-by: Russell Shaw <[email protected]>

Fix -b detection Signed-off-by: Russell Shaw <[email protected]>

alexgubanow

Hello @kiwi1969 , as i mentioned before, code looks good, but the branch has conflicts:
Conflicting files
.gitignore
pom.xml
src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

kiwi1969 · 2024-06-18T18:55:19Z

FYI - as I do not have write access to repo, I cannot merge pull requests to resolve conflicts

alexgubanow · 2024-06-21T18:46:49Z

there is no need of write access to repo to resolve a merge conflict, you shall rebase your changes on top of target branch.

kiwi1969 added 19 commits March 26, 2024 17:25

Update README.md

994d300

Signed-off-by: Russell Shaw <[email protected]>

Update pom.xml

4b22ad3

Signed-off-by: Russell Shaw <[email protected]>

Handle gzip output files

5708147

Signed-off-by: Russell Shaw <[email protected]>

Handle gzip output files

abcb9c6

Signed-off-by: Russell Shaw <[email protected]>

Handle gzip output files

23cdcdc

Signed-off-by: Russell Shaw <[email protected]>

Handle gzip output files

9ab9bc5

Signed-off-by: Russell Shaw <[email protected]>

Update README.md

2ebc0ce

Signed-off-by: Russell Shaw <[email protected]>

Update pom.xml

fc0333c

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

01a884c

Restored try clause. Increased GZIP buffer size for effciency and for CryptoCards that only get used if buffer > = 8192 bytes Set GZIP flush option to prevent corruption of file on last write Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

e0d6cd4

Rebased upon existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Update pom.xml

1b4f1eb

Rebased upon existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Update README.md

521c136

Rebased change using existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Update README.md

65c942b

Rebased upon existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Update .gitignore

e390069

Rebased using existing 5.0.1 branch Signed-off-by: Russell Shaw <[email protected]>

Update pom.xml

2065481

Rebased using existing 5.0.1 branch. Note this change bumps java to Java 17, and uses Shade to reduce output size Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

39b0095

trivial indentation fix Signed-off-by: Russell Shaw <[email protected]>

Update pom.xml

0bf3a24

Restored maven jar plug-in Signed-off-by: Russell Shaw <[email protected]>

Create .editorconfig

d45495b

Signed-off-by: Russell Shaw <[email protected]>

Update .editorconfig

a647500

Signed-off-by: Russell Shaw <[email protected]>

alexgubanow changed the base branch from master to release-5.0.1 March 29, 2024 17:16

alexgubanow requested changes Mar 29, 2024

View reviewed changes

kiwi1969 added 7 commits May 6, 2024 10:14

Update .gitignore

6d1f194

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

a9b96c3

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

414657d

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

a07cdbf

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

04a155d

Simplied, and actually still works Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

5b3761f

Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

6a04989

Improved outfilename suffix defaults Signed-off-by: Russell Shaw <[email protected]>

kiwi1969 added 3 commits May 13, 2024 15:53

Delete .editorconfig

14b65d1

As requested Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

97f217a

updated version string and date Signed-off-by: Russell Shaw <[email protected]>

Update TerseDecompress.java

aabbf76

Fix -b detection Signed-off-by: Russell Shaw <[email protected]>

kiwi1969 requested a review from alexgubanow May 28, 2024 14:54

alexgubanow requested changes May 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

15 can you please add support to decompress to zipoutputstream #18

15 can you please add support to decompress to zipoutputstream #18

kiwi1969 commented Mar 27, 2024

alexgubanow Mar 29, 2024

kiwi1969 May 6, 2024

kiwi1969 May 6, 2024

alexgubanow Mar 29, 2024

kiwi1969 May 6, 2024

alexgubanow Mar 29, 2024

kiwi1969 May 6, 2024

alexgubanow Mar 29, 2024

kiwi1969 May 6, 2024

alexgubanow Mar 29, 2024

kiwi1969 May 6, 2024

alexgubanow commented May 13, 2024

kiwi1969 commented May 13, 2024

alexgubanow left a comment

kiwi1969 commented Jun 18, 2024

alexgubanow commented Jun 21, 2024

		@@ -0,0 +1,15 @@
		# Declares that this is the top-level configuration

-		System.out.println("Attempting to decompress input file (" + inputFileName +") to output file (" + outputFileName +")");
+    System.out.println("Opening output file (" + outputFileName + ")");
+    var outputStream = null;
+    try {
+      if (outputFileName.endsWith(".gz")) {
+        outputStream = new GZIPOutputStream(new FileOutputStream(outputFileName), 8192, true);
+      }
+      else {
+        outputStream = new FileOutputStream(outputFileName);
+      }
+    }
+    catch (Exception e) {
+      System.out.println("Got exception while opening output file (" + outputFileName + ").\nError message:\n" + e.toString());
+    }
+    System.out.println("Attempting to decompress input file (" + inputFileName + ") to output file (" + outputFileName + ")");
+    try (TerseDecompresser outputWriter = TerseDecompresser.create(new FileInputStream(inputFileName), outputStream)) {
+      outputWriter.TextFlag = textMode;
+      outputWriter.decode();
+    }
+    catch (Exception e) {
+      System.out.println("Got exception while decompressing input file (" + inputFileName + ").\nError message:\n" + e.toString());
+    }

15 can you please add support to decompress to zipoutputstream #18

Are you sure you want to change the base?

15 can you please add support to decompress to zipoutputstream #18

Conversation

kiwi1969 commented Mar 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexgubanow commented May 13, 2024

kiwi1969 commented May 13, 2024

alexgubanow left a comment

Choose a reason for hiding this comment

kiwi1969 commented Jun 18, 2024

alexgubanow commented Jun 21, 2024