Skip to content

Commit 30dd0f4

Browse files
authored
Merge pull request #81 from frheault/minor_fixes_zip_info_extra
Bug when building the zipfile using CLIs (zip, jar, etc)
2 parents 86bf5a9 + f22ce22 commit 30dd0f4

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/tests/test_workflows.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929

3030

3131
def test_help_option_convert_dsi(script_runner):
32-
ret = script_runner.run(['tff_convert_dsi_studio.py', '--help'])
32+
ret = script_runner.run('tff_convert_dsi_studio.py', '--help')
3333
assert ret.success
3434

3535

3636
def test_help_option_convert(script_runner):
37-
ret = script_runner.run(['tff_convert_tractogram.py', '--help'])
37+
ret = script_runner.run('tff_convert_tractogram.py', '--help')
3838
assert ret.success
3939

4040

4141
def test_help_option_generate_trx_from_scratch(script_runner):
42-
ret = script_runner.run(['tff_generate_trx_from_scratch.py', '--help'])
42+
ret = script_runner.run('tff_generate_trx_from_scratch.py', '--help')
4343
assert ret.success
4444

4545

trx/trx_file_memmap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def load(input_obj: str, check_dpg: bool = True) -> Type["TrxFile"]:
233233
trx = load_from_directory(tmp_dir.name)
234234
trx._uncompressed_folder_handle = tmp_dir
235235
logging.info(
236-
"File was compressed, call the close() function before"
236+
"File was compressed, call the close() function before "
237237
"exiting."
238238
)
239239
else:
@@ -293,7 +293,7 @@ def load_from_zip(filename: str) -> Type["TrxFile"]:
293293
size = zip_info.file_size / dtype_size
294294

295295
if len(zip_info.extra):
296-
mem_adress += 4
296+
mem_adress -= len(zip_info.extra)
297297

298298
if size.is_integer():
299299
files_pointer_size[elem_filename] = mem_adress, int(size)

0 commit comments

Comments
 (0)