refactoring

Author: JayXon

formats/format.h

@@ -23,7 +23,9 @@ class Format
     }
 
 protected:
+    // pointer to the file content
     char *fp;
+    // size of the file
     size_t size;
 };
 

formats/swf.cpp

@@ -8,8 +8,7 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
 {
     if (!is_recompress && *fp != 'F')
     {
-        Move(size_leanified);
-        return size;
+        return Move(size_leanified);
     }
 
     unsigned char *in_buffer = (unsigned char *)fp + 8;
@@ -29,8 +28,7 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         {
             std::cout << "SWF file corrupted!" << std::endl;
             mz_free(in_buffer);
-            Move(size_leanified);
-            return size;
+            return Move(size_leanified);
         }
     }
     else if (*fp == 'Z')
@@ -50,8 +48,7 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         {
             std::cout << "SWF file corrupted!" << std::endl;
             delete[] dst_buffer;
-            Move(size_leanified);
-            return size;
+            return Move(size_leanified);
         }
         in_buffer = dst_buffer;
     }
@@ -60,6 +57,7 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         std::cout << "SWF is not compressed." << std::endl;
     }
 
+    // parsing SWF tags
     unsigned char *p = in_buffer + 13;      // skip FrameSize(9B) + FrameRate(2B) + FrameCount(2B) = 13B
     size_t tag_size_leanified = 0;
     do
@@ -87,6 +85,10 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         {
             // move header
             size_t header_size = 7 + (p[3] == 3);
+            if (is_verbose)
+            {
+                std::cout << "DefineBitsLossless tag found." << std::endl;
+            }
             if (tag_size_leanified)
             {
                 memmove(p - tag_size_leanified, p, header_size);
@@ -101,6 +103,10 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         }
         case 21:    // DefineBitsJPEG2
         {
+            if (is_verbose)
+            {
+                std::cout << "DefineBitsJPEG2 tag found." << std::endl;
+            }
             // copy id
             *(uint16_t *)(p - tag_size_leanified) = *(uint16_t *)p;
 
@@ -121,6 +127,10 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
             uint32_t img_size = *(uint32_t *)(p + 2);
             size_t header_size = tag_type == 90 ? 8 : 6;
 
+            if (is_verbose)
+            {
+                std::cout << "DefineBitsJPEG" << header_size / 2 << " tag found." << std::endl;
+            }
             // Leanify embedded image
             size_t new_img_size = LeanifyFile(p + header_size, img_size, tag_size_leanified);
             *(uint32_t *)(p + 2 - tag_size_leanified) = new_img_size;
@@ -138,6 +148,10 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
             *p &= ~(1 << 4);    // set HasMetadata bit to 0
             break;
         case 77:    // Metadata
+            if (is_verbose)
+            {
+                std::cout << "Metadata removed." << std::endl;
+            }
             tag_size_leanified += tag_length + tag_header_length;
             p += tag_length;
             continue;
@@ -167,7 +181,7 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
         return size;
     }
 
-    // recompress
+    // compress with LZMA
     size_t s = in_len, props = LZMA_PROPS_SIZE;
     unsigned char *dst = new unsigned char[in_len + LZMA_PROPS_SIZE];
     // have to set writeEndMark to true
@@ -221,44 +235,17 @@ size_t Swf::Leanify(size_t size_leanified /*= 0*/)
     return size;
 }
 
-void Swf::Move(size_t size_leanified)
+size_t Swf::Move(size_t size_leanified)
 {
     if (size_leanified)
     {
         fp -= size_leanified;
         memmove(fp, fp + size_leanified, size);
     }
+    return size;
 }
 
-size_t Swf::ZlibRecompress(unsigned char *src, size_t src_len, size_t size_leanified)
-{
-    size_t new_size = 0;
-    if (is_recompress)
-    {
-        size_t s = 0;
-        unsigned char *buffer = (unsigned char *)tinfl_decompress_mem_to_heap(src, src_len, &s, TINFL_FLAG_PARSE_ZLIB_HEADER);
 
-        unsigned char *out_buffer = NULL;
-        ZopfliZlibCompress(&zopfli_options, buffer, s, &out_buffer, &new_size);
-        mz_free(buffer);
-        if (new_size < src_len)
-        {
-            memcpy(src - size_leanified, out_buffer, new_size);
-        }
-        else
-        {
-            new_size = src_len;
-            memmove(src - size_leanified, src, src_len);
-        }
-        delete[] out_buffer;
-    }
-    else
-    {
-        new_size = src_len;
-        memmove(src - size_leanified, src, src_len);
-    }
-    return new_size;
-}
 
 void Swf::UpdateTagLength(unsigned char *tag_content, size_t header_length, size_t new_length)
 {

formats/swf.h

@@ -9,7 +9,6 @@
 
 #include "miniz/miniz.h"
 #include "LZMA/LzmaLib.h"
-#include "zopfli/zlib_container.h"
 
 #include "format.h"
 #include "../leanify.h"
@@ -21,22 +20,18 @@ extern int iterations;
 class Swf : Format
 {
 public:
-    Swf(void *p, size_t s = 0) : Format(p, s)
-    {
-        ZopfliInitOptions(&zopfli_options);
-        zopfli_options.numiterations = iterations;
-    }
+    Swf(void *p, size_t s = 0) : Format(p, s) {}
 
     size_t Leanify(size_t size_leanified = 0);
 
     static const unsigned char header_magic[3];
     static const unsigned char header_magic_deflate[3];
     static const unsigned char header_magic_lzma[3];
+
 private:
-    ZopfliOptions zopfli_options;
 
-    void Move(size_t size_leanified);
-    size_t ZlibRecompress(unsigned char *src, size_t src_len, size_t size_leanified);
+    size_t Move(size_t size_leanified);
+
     void UpdateTagLength(unsigned char *tag_content, size_t header_length, size_t new_length);
 };
 

formats/zip.cpp

@@ -149,13 +149,9 @@ size_t Zip::Leanify(size_t size_leanified /*= 0*/)
 
 
             // recompress
-            ZopfliOptions options;
-            ZopfliInitOptions(&options);
-            options.numiterations = iterations;
-
             unsigned char bp = 0, *out = NULL;
             size_t outsize = 0;
-            ZopfliDeflate(&options, 2, 1, buffer, new_uncompressed_size, &bp, &out, &outsize);
+            ZopfliDeflate(&zopfli_options, 2, 1, buffer, new_uncompressed_size, &bp, &out, &outsize);
 
 
             if (outsize < original_compressed_size)

formats/zip.h

@@ -23,12 +23,19 @@ extern int level;
 class Zip : Format
 {
 public:
-    Zip(void *p, size_t s = 0) : Format(p, s) {}
+    Zip(void *p, size_t s = 0) : Format(p, s)
+    {
+        ZopfliInitOptions(&zopfli_options);
+        zopfli_options.numiterations = iterations;
+    }
     ~Zip() { level--; }
 
     size_t Leanify(size_t size_leanified = 0);
 
     static const unsigned char header_magic[4];
+
+private:
+    ZopfliOptions zopfli_options;
 };
 
 

leanify.cpp

@@ -99,4 +99,39 @@ size_t LeanifyFile(void *file_pointer, size_t file_size, size_t size_leanified /
     }
     // for unsupported format, just memmove it.
     return Format(file_pointer, file_size).Leanify(size_leanified);
+}
+
+
+size_t ZlibRecompress(unsigned char *src, size_t src_len, size_t size_leanified /*= 0*/)
+{
+    if (is_recompress)
+    {
+        size_t s = 0;
+        unsigned char *buffer = (unsigned char *)tinfl_decompress_mem_to_heap(src, src_len, &s, TINFL_FLAG_PARSE_ZLIB_HEADER);
+        if (!buffer)
+        {
+            std::cout << "Decompress Zlib failed." << std::endl;
+        }
+        else
+        {
+            ZopfliOptions zopfli_options;
+            ZopfliInitOptions(&zopfli_options);
+            zopfli_options.numiterations = iterations;
+
+            size_t new_size = 0;
+            unsigned char *out_buffer = NULL;
+            ZopfliZlibCompress(&zopfli_options, buffer, s, &out_buffer, &new_size);
+            mz_free(buffer);
+            if (new_size < src_len)
+            {
+                memcpy(src - size_leanified, out_buffer, new_size);
+                delete[] out_buffer;
+                return new_size;
+            }
+            delete[] out_buffer;
+        }
+    }
+
+    memmove(src - size_leanified, src, src_len);
+    return src_len;
 }

leanify.h

@@ -3,6 +3,8 @@
 
 #include <iostream>
 
+#include "formats/zopfli/zlib_container.h"
+
 #include "formats/format.h"
 #include "formats/gft.h"
 #include "formats/gz.h"
@@ -18,5 +20,7 @@
 
 size_t LeanifyFile(void *file_pointer, size_t file_size, size_t size_leanified = 0);
 
+size_t ZlibRecompress(unsigned char *src, size_t src_len, size_t size_leanified = 0);
+
 
 #endif

main.cpp

@@ -73,7 +73,7 @@ void PauseIfNotTerminal()
 void PrintInfo()
 {
     std::cout << "Leanify\t" << VERSION << std::endl << std::endl;
-    std::cout << "Usage: Leanify [options] path" << std::endl;
+    std::cout << "Usage: Leanify [options] paths" << std::endl;
     std::cout << "  -i iteration\tMore iterations means slower but better result. Default: 15." << std::endl;
     std::cout << "  -f\t\tFast mode, no recompression." << std::endl;
     std::cout << "  -q\t\tQuiet mode, no output." << std::endl;