add some new features

Author: Vadym-Mitin

src/HuffmanCompression/Application.java

@@ -48,7 +48,6 @@ public static void main(String[] args) throws UnexpectedFileFormat, UnexpectedOp
 
                 Map<Character, String> table = HuffmanTree.createTable(resultData);
                 byte[] encodedBytes = compressor.encodeToByte(resultData);
-
                 byte[] serializeTable = SerializeHuffmanTable.serializeToByteArray(table);
                 int summarylength = encodedBytes.length + serializeTable.length;
                 byte[] summaryBytes = new byte[summarylength];
@@ -66,6 +65,13 @@ public static void main(String[] args) throws UnexpectedFileFormat, UnexpectedOp
             } else if (option.equals(DECOMPRESS_OPTION)) {
                 //////
                 System.out.println("decompress");
+
+                List<byte[]> list = FileWork.readCompressedFiles(file);
+                byte[] tableData = list.get(0);
+                byte[] dataData = list.get(1);
+                Map<Character, String> table = SerializeHuffmanTable.deserializeFromByteArray(tableData);
+
+
 //                Decompressor decompressor = Decompressor.instance();
 //                byte[] bytes = FileWork.readFileBytes(file);
 //                byte[] tableBytes = FileWork.getTableBytes(bytes);

src/HuffmanCompression/FileWork.java

@@ -7,10 +7,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static HuffmanCompression.SerializeHuffmanTable.deserializeFromByteArray;
 import static HuffmanCompression.SerializeHuffmanTable.serializeToByteArray;
@@ -91,29 +88,36 @@ private static String getFileExtension(File file) {
         }
     }
 
+    private static void writeData(File file, byte[] dataBytes, String extension) throws IOException {
+        File compressed = new File(file.getAbsolutePath() + extension);
+        compressed.createNewFile();
+        Path compressedPath = Paths.get(compressed.getAbsolutePath());
+        Files.write(compressedPath, dataBytes);
+    }
+
+    private static void writeMeta(File file, byte[] dataBytes) throws IOException {
+        File compressed = new File(file.getAbsolutePath() + ".meta");
+        compressed.createNewFile();
+        Path compressedPath = Paths.get(compressed.getAbsolutePath());
+        Files.write(compressedPath, dataBytes);
+    }
+
     public static void writeFile(byte[] data, String path, String arg) throws IOException, UnexpectedFileFormat {
         File file = new File(path);
 
         if (arg.equals(COMPRESS_OPTION)) {
-            toFileWrite(file, data, COMPRESS_EXTENSION);
+            writeData(file, data, COMPRESS_EXTENSION);
         }
 
         if (arg.equals(DECOMPRESS_OPTION)) {
             if (!getFileExtension(file).equals(COMPRESS_EXTENSION)) {
                 throw new UnexpectedFileFormat("File format is unexpected");
             }
-            toFileWrite(file, data, DECOMPRESS_EXTENSION);
+            writeData(file, data, DECOMPRESS_EXTENSION);
+            writeMeta(file,data);
         }
     }
 
-
-    private static void toFileWrite(File file, byte[] dataBytes, String extension) throws IOException {
-        File compressed = new File(file.getAbsolutePath() + extension);
-        compressed.createNewFile();
-        Path compressedPath = Paths.get(compressed.getAbsolutePath());
-        Files.write(compressedPath, dataBytes);
-    }
-
     public static List<String> readFileStrings(File file) throws IOException {
         List<String> string = Files.readAllLines(Paths.get(file.getAbsolutePath()));
         return string;
@@ -123,6 +127,18 @@ public static byte[] readFileBytes(File file) throws IOException {
         return Files.readAllBytes(Paths.get(file.getAbsolutePath()));
     }
 
+    public static List<byte[]> readCompressedFiles(File file) throws UnexpectedFileFormat, IOException {
+        List<byte[]> list = new ArrayList<>();
+        File tableFile = new File(file.getAbsolutePath()+".meta");
+        File dataFile = new File(file.getAbsolutePath());
+        if (!dataFile.exists() || !tableFile.exists()){
+            throw new UnexpectedFileFormat("cant find table or meta file");
+        }
+       list.add(Files.readAllBytes(Paths.get(tableFile.getAbsolutePath())));
+       list.add(Files.readAllBytes(Paths.get(dataFile.getAbsolutePath())));
+        return list;
+    }
+
     public static byte[] getTableBytes(byte[] data) {
         byte[] tableLength = new byte[4];
         System.arraycopy(data, 0, tableLength, 0, tableLength.length);
@@ -208,4 +224,5 @@ public int getLength() {
     }
 
 
+
 }

src/HuffmanCompression/StringWork.java

@@ -0,0 +1,28 @@
+package HuffmanCompression;
+
+import java.math.BigInteger;
+
+public class StringWork {
+    public static void main(String[] args) {
+        byte[] bytes = new byte[]{1, 2, 3};
+
+
+        byte b = 1;
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i <bytes.length; i++) {
+            b = bytes[i];
+
+            for (int j = 7; j >= 0; --j) {
+                sb.append(b >>> j & 1);
+            }
+        }
+            System.out.println(sb.toString());
+
+
+//        // Create a BigInteger using the byte array
+//        BigInteger bi = new BigInteger(bytes);
+//
+//        String s = bi.toString(2);
+//        System.out.println(s);
+        }
+    }