Skip to content

Commit a8c7f61

Browse files
authored
fixed too lazy loading #10, hardened against empty filename, improved outputs (#11)
1 parent ed696e1 commit a8c7f61

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Compressor.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ def load_module(module, compression_module):
5454
compression_module
5555
'''
5656
try:
57-
if module not in sys.modules:
58-
return False
5957
open_attr = 'open'
6058
# module override
6159
if 'handler' in compression_module:
@@ -66,8 +64,10 @@ def load_module(module, compression_module):
6664
for element in path[1:]:
6765
decompressor = getattr(decompressor, element)
6866
compression_module['open'] = getattr(decompressor, open_attr)
67+
print("Compressor: loaded", module)
6968
return True
7069
except Exception as e:
70+
print("Compressor: couldn't load", module)
7171
print(e)
7272
return False
7373

@@ -102,7 +102,7 @@ def get_decompressor_by_header(filename):
102102
and have head guess depending on the view
103103
probably too much work for our current needs
104104
'''
105-
file_size = stat(filename).st_size
105+
file_size = stat(filename).st_size if filename else 0
106106
if file_size == 0:
107107
return None, None
108108
with open(filename, "rb") as f_input:
@@ -169,16 +169,16 @@ def copy_file(f_input, f_output, bytes_total):
169169
break
170170
f_output.write(read_buffer)
171171
bytes_total[0] += bytes_read
172-
print("%f seconds spent decompressing" % (time.time() - start_time))
172+
print("Compressor: %f seconds spent decompressing" % (time.time() - start_time))
173173

174174

175175
def decompress(source, target):
176176
suffix, decompressor = get_decompressor_by_header(source)
177177
if not (suffix and decompressor):
178178
return None
179179
sublime.status_message("opening compressed file: %s" % source)
180-
print("opening compressed file: " + source)
181-
print("decompress into: " + target)
180+
print("Compressor: opening compressed file: " + source)
181+
print("Compressor: decompress into: " + target)
182182

183183
# some compressor don't support the `with` statement
184184
f_input = decompressor(source, 'rb')
@@ -239,7 +239,7 @@ def load_decompress(view):
239239
decomp_view = window.open_file(file_temp)
240240
decomp_view.set_status('decompressed', filepath)
241241
decomp_view.set_status('decompressed_mtime', str(stat(filepath).st_mtime))
242-
print(decomp_view.get_status('decompressed_mtime'))
242+
print("Compressor: ", decomp_view.get_status('decompressed_mtime'))
243243
decomp_view.set_read_only(True)
244244

245245

0 commit comments

Comments
 (0)