New version (4)

Author: danila-schelkov

.idea/misc.xml

@@ -1,11 +1,11 @@
 ### SC Compression
 
-Version 0.5.1
+Version 0.5.6
 -
 
 ### Tools:
-- Decompression
-- Compression
+- Decompressor
+- Compressor
 
 ### Supported compressions:
 - LZMA

README.md

@@ -16,6 +16,6 @@
 		f.close()
 	with open('out/' + filename, 'wb') as f:
 		f.write(
-			compress(filedata, Signatures.SCLZ, 1)
+			compress(filedata, Signatures.SC, 4)
 		)
 		f.close()

examples/compressor/main.py

@@ -1,2 +1 @@
 zstandard
-pylzham

examples/decompressor/test.lzham

@@ -1,19 +1,19 @@
 Metadata-Version: 2.1
 Name: sc-compression
-Version: 0.5.1
+Version: 0.5.6
 Summary: SC Compression
 Home-page: https://github.com/vorono4ka/sc-compression
 Author: Vorono4ka
 Author-email: crowo4ka@gmail.com
 License: GPLv3
 Description: ### SC Compression
 
-        Version 0.5.1
+        Version 0.5.6
         -
 
         ### Tools:
-        - Decompression
-        - Compression
+        - Decompressor
+        - Compressor
 
         ### Supported compressions:
         - LZMA

requirements.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 setup.py
 sc_compression/__init__.py

sc_compression.egg-info/PKG-INFO

@@ -43,7 +43,7 @@ def compress(self, data, signature: int, file_version: int = None) -> bytes:
         uncompressed_size = len(data)
 
         if file_version is None:
-            file_version = 2 if zstandard and not (Signatures.SCLZ & signature) else 1
+            file_version = 3 if zstandard and not (Signatures.SCLZ & signature) else 1
 
         if Signatures.ZSTD & signature and not zstandard or \
            Signatures.SCLZ & signature and not lzham:
@@ -52,7 +52,7 @@ def compress(self, data, signature: int, file_version: int = None) -> bytes:
         super().__init__('little')
         if signature is Signatures.NONE:
             return data
-        elif ((Signatures.LZMA | Signatures.SIG) & signature) or (Signatures.SC & signature and file_version != 2):
+        elif ((Signatures.LZMA | Signatures.SIG) & signature) or (Signatures.SC & signature and file_version != 3):
             compressed = lzma.compress(data, format=lzma.FORMAT_ALONE, filters=self.lzma_filters)
 
             self.write(compressed[:5])
@@ -71,20 +71,23 @@ def compress(self, data, signature: int, file_version: int = None) -> bytes:
             self.write(compressed)
 
             compressed = self.buffer
-        elif (Signatures.SC | Signatures.ZSTD) & signature and file_version == 2:
+        elif (Signatures.SC | Signatures.ZSTD) & signature and file_version == 3:
             compressor = zstandard.ZstdCompressor()
             compressed = compressor.compress(data)
         else:
             raise TypeError('Unknown Signature!')
 
         super().__init__('big')
         if (Signatures.SC | Signatures.SCLZ) & signature:
-            data_hash = md5(data)
+            data_hash = md5(data).digest()
 
             self.write(b'SC')
             self.writeInt32(file_version)
-            self.writeInt32(16)
-            compressed = self.buffer + data_hash.digest() + compressed
+            if file_version == 4:
+                self.writeInt32(1)
+            self.writeInt32(len(data_hash))
+            self.write(data_hash)
+            compressed = self.buffer + compressed
         elif signature == Signatures.SIG:
             self.write(b'Sig:')
             self.write(b'\x00' * 64)  # sha64

sc_compression.egg-info/SOURCES.txt

@@ -32,12 +32,17 @@ def decompress(self, buffer: bytes) -> bytes:
 
         decompressed = buffer
         signature = self.signatures.get_signature(self.buffer, self.file_version)
+        if signature == Signatures.NONE:
+            return decompressed
+
         if signature == Signatures.SC:
             super().__init__(buffer, 'big')
             self.read(2)
             self.file_version = self.readInt32()
+            if self.file_version >= 4:
+                self.file_version = self.readInt32()
             self.hash = self.read(self.readInt32())
-            decompressed = self.decompress(buffer[26:])
+            decompressed = self.decompress(buffer[self.i:])
         elif signature == Signatures.SIG:
             buffer = buffer[68:]
             decompressed = self.decompress(buffer)

sc_compression/compressor.py

@@ -14,15 +14,12 @@ def __init__(self):
 
     def get_signature(self, buffer, file_version: int = -1) -> int:
         signature = Signatures.NONE
-        if self.last_signature == Signatures.SC and file_version == 1:
-            signature = Signatures.LZMA
-            self.last_signature = -1
-        elif self.last_signature == Signatures.SC and file_version == 2:
-            signature = Signatures.ZSTD
-            self.last_signature = -1
 
         if re.match(b'\x00\x00?\x00', buffer[1:5]):
             signature = Signatures.LZMA
+        elif file_version >= 2 and buffer.startswith(b'\x28\xb5\x2f\xfd'):
+            signature = Signatures.ZSTD
+
         if buffer.startswith(b'SCLZ'):
             signature = Signatures.SCLZ
         elif buffer.startswith(b'SC'):