|
|
|
@ -544,7 +544,6 @@ def _find_and_compress_images(upload_dir, output_dir, db_task, compress_quality,
|
|
|
|
filenames.sort()
|
|
|
|
filenames.sort()
|
|
|
|
|
|
|
|
|
|
|
|
if len(filenames):
|
|
|
|
if len(filenames):
|
|
|
|
compressed_names = []
|
|
|
|
|
|
|
|
for idx, name in enumerate(filenames):
|
|
|
|
for idx, name in enumerate(filenames):
|
|
|
|
job.meta['status'] = 'Images are being compressed.. {}%'.format(idx * 100 // len(filenames))
|
|
|
|
job.meta['status'] = 'Images are being compressed.. {}%'.format(idx * 100 // len(filenames))
|
|
|
|
job.save_meta()
|
|
|
|
job.save_meta()
|
|
|
|
@ -554,10 +553,12 @@ def _find_and_compress_images(upload_dir, output_dir, db_task, compress_quality,
|
|
|
|
image = image.transpose(Image.ROTATE_180)
|
|
|
|
image = image.transpose(Image.ROTATE_180)
|
|
|
|
image.save(compressed_name, quality=compress_quality, optimize=True)
|
|
|
|
image.save(compressed_name, quality=compress_quality, optimize=True)
|
|
|
|
image.close()
|
|
|
|
image.close()
|
|
|
|
compressed_names.append(compressed_name)
|
|
|
|
|
|
|
|
if compressed_name != name:
|
|
|
|
if compressed_name != name:
|
|
|
|
os.remove(name)
|
|
|
|
os.remove(name)
|
|
|
|
filenames = compressed_names
|
|
|
|
# PIL::save uses filename in order to define image extension.
|
|
|
|
|
|
|
|
# We need save it as jpeg for compression and after rename the file
|
|
|
|
|
|
|
|
# Else annotation file will contain invalid file names (with other extensions)
|
|
|
|
|
|
|
|
os.rename(compressed_name, name)
|
|
|
|
|
|
|
|
|
|
|
|
for frame, image_orig_path in enumerate(filenames):
|
|
|
|
for frame, image_orig_path in enumerate(filenames):
|
|
|
|
image_dest_path = _get_frame_path(frame, output_dir)
|
|
|
|
image_dest_path = _get_frame_path(frame, output_dir)
|
|
|
|
|