lzham decompressing with binary fix

Author: danila-schelkov

.gitignore

@@ -1,9 +1,14 @@
-sc_compression.egg-info/
-examples/decompressor/out/
-examples/decompressor/in/
-examples/compressor/out/
-examples/compressor/in/
-.idea/
-build/
-dist/
+# IDE project directories
+/.idea/
+
+# Setuptools directories
+/sc_compression.egg-info/
+/build/
+/dist/
+
+# Scripts directories
+/examples/**/out/
+/examples/**/in/
+
+# Python compiled files
 *.pyc

README.md

@@ -1,6 +1,6 @@
 ### SC Compression
 
-Version 0.6.0
+Version 0.6.1
 -
 
 ### Tools:

examples/compressor/main.py

@@ -12,10 +12,8 @@
 
 for filename in os.listdir('in'):
 	with open('in/' + filename, 'rb') as f:
-		filedata = f.read()
+		file_data = f.read()
 		f.close()
 	with open('out/' + filename, 'wb') as f:
-		f.write(
-			compress(filedata, Signatures.SC, 3)
-		)
+		f.write(compress(file_data, Signatures.SC, 3))
 		f.close()

examples/decompressor/main.py

@@ -11,10 +11,8 @@
 
 for filename in os.listdir('in'):
 	with open('in/' + filename, 'rb') as f:
-		filedata = f.read()
+		file_data = f.read()
 		f.close()
 	with open('out/' + filename, 'wb') as f:
-		f.write(
-			decompress(filedata)[0]
-		)
+		f.write(decompress(file_data)[0])
 		f.close()

sc_compression/support/lzham.py

@@ -14,37 +14,39 @@ def decompress(data, uncompressed_size, filters):
         writer.write(data)
 
         temp_file_path = mktemp('.lzham')
-        with open(temp_file_path, 'wb') as f:
-            f.write(writer.buffer)
-            f.close()
+        with open(temp_file_path, 'wb') as file:
+            file.write(writer.buffer)
 
+        decompressed_path = mktemp('.lzham')
         if system(f'{path.dirname(__file__)}/lzham.exe '
                   f'-c -d{filters["dict_size_log2"]} '
-                  f'd {temp_file_path} {temp_file_path} > nul 2>&1'):
+                  f'd {temp_file_path} {decompressed_path} > nul 2>&1'):
+            remove(temp_file_path)
+            remove(decompressed_path)
             return None
-        with open(temp_file_path, 'rb') as f:
-            decompressed = f.read()
-            f.close()
+        with open(decompressed_path, 'rb') as file:
+            decompressed = file.read()
 
         remove(temp_file_path)
+        remove(decompressed_path)
 
         return decompressed
 
     @staticmethod
     def compress(data, filters):
         temp_file_path = mktemp('.data')
-        with open(temp_file_path, 'wb') as f:
-            f.write(data)
-            f.close()
+        with open(temp_file_path, 'wb') as file:
+            file.write(data)
 
         compressed_path = mktemp('.lzham')
         if system(f'{path.dirname(__file__)}/lzham.exe '
                   f'-c -d{filters["dict_size_log2"]} '
                   f'c {temp_file_path} {compressed_path} > nul 2>&1'):
+            remove(temp_file_path)
+            remove(compressed_path)
             return None
-        with open(compressed_path, 'rb') as f:
-            compressed = f.read()[13:]
-            f.close()
+        with open(compressed_path, 'rb') as file:
+            compressed = file.read()[13:]
 
         remove(temp_file_path)
         remove(compressed_path)

setup.py

@@ -10,7 +10,7 @@
 
 setuptools.setup(
     name='sc-compression',
-    version='0.6.0',
+    version='0.6.1',
     author='Vorono4ka',
     author_email='crowo4ka@gmail.com',
     description='SC Compression',