Az/fix migration (#1333)

* fixed migration because readers interface changed

* fixed tests
main
Andrey Zhavoronkov 6 years ago committed by GitHub
parent 887c6f0432
commit 9c443db5a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -91,7 +91,7 @@ class FrameProvider():
for chunk_idx in range(math.ceil(self._db_data.size / self._db_data.chunk_size)):
chunk_path = chunk_path_getter(chunk_idx)
chunk_reader = reader_class([chunk_path])
for frame, _ in chunk_reader:
for frame, _, _ in chunk_reader:
if out_type == self.Type.BUFFER:
yield self._av_frame_to_png_bytes(frame) if reader_class is VideoReader else frame
elif out_type == self.Type.PIL:

@ -64,7 +64,8 @@ def migrate_task_data(db_task_id, db_data_id, original_video, original_images, s
if os.path.exists(old_task_data_dir) and size != 0:
if original_video:
if os.path.exists(original_video):
reader = VideoReader([original_video], get_frame_step(frame_filter), start_frame, stop_frame)
_stop_frame = stop_frame if stop_frame else None
reader = VideoReader([original_video], get_frame_step(frame_filter), start_frame, _stop_frame)
original_chunk_writer = Mpeg4ChunkWriter(100)
compressed_chunk_writer = ZipCompressedChunkWriter(image_quality)
@ -111,11 +112,11 @@ def migrate_task_data(db_task_id, db_data_id, original_video, original_images, s
elif mime_type == 'zip':
zips.append(p)
if archives:
reader = ArchiveReader(archives, get_frame_step(frame_filter), start_frame, stop_frame)
reader = ArchiveReader(archives)
elif zips:
reader = ZipReader(archives, get_frame_step(frame_filter), start_frame, stop_frame)
reader = ZipReader(archives)
elif pdfs:
reader = PdfReader(pdfs, get_frame_step(frame_filter), start_frame, stop_frame)
reader = PdfReader(pdfs)
if not reader:
original_chunk_writer = ZipChunkWriter(100)

Loading…
Cancel
Save