fix #166 typed-ffmpeg (#183)

* fix #166 typed-ffmpeg * fix * fix
livingbio · Jan 14, 2024 · 02d1c2b · 02d1c2b
1 parent 82ede57
commit 02d1c2b
Show file tree

Hide file tree

Showing 49 changed files with 16 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 description = ""
 authors = ["lucemia <lucemia@gmail.com>"]
 readme = "README.md"
-packages = [{ include = "ffmpeg", from = "src" }]
-include = ["ffmpeg/py.typed"]
+packages = [{ include = "typed_ffmpeg", from = "src" }]
+include = ["typed_ffmpeg/py.typed"]
 exclude = ["**/tests"]
 
 [tool.poetry.dependencies]

diff --git a/src/ffmpeg/tests/__init__.py b/src/ffmpeg/tests/__init__.py
diff --git a/src/ffmpeg/utils/__init__.py b/src/ffmpeg/utils/__init__.py
diff --git a/src/ffmpeg/utils/tests/__init__.py b/src/ffmpeg/utils/tests/__init__.py
diff --git a/src/typed_ffmpeg/__init__.py b/src/typed_ffmpeg/__init__.py
@@ -0,0 +1,6 @@
+from . import filters, nodes, streams
+from .base import input, merge_outputs, output
+from .probe import probe
+
+__all__ = ["input", "output", "merge_outputs", "probe", "filters"]
+__all__ += streams.__all__ + nodes.__all__
diff --git a/src/ffmpeg/base.py → src/typed_ffmpeg/base.py b/src/ffmpeg/base.py → src/typed_ffmpeg/base.py
diff --git a/src/ffmpeg/filters.py → src/typed_ffmpeg/filters.py b/src/ffmpeg/filters.py → src/typed_ffmpeg/filters.py
diff --git a/src/typed_ffmpeg/nodes/__init__.py b/src/typed_ffmpeg/nodes/__init__.py
@@ -0,0 +1,3 @@
+from .base import Stream
+
+__all__ = ["Stream"]
diff --git a/src/ffmpeg/nodes/base.py → src/typed_ffmpeg/nodes/base.py b/src/ffmpeg/nodes/base.py → src/typed_ffmpeg/nodes/base.py
diff --git a/src/ffmpeg/nodes/nodes.py → src/typed_ffmpeg/nodes/nodes.py b/src/ffmpeg/nodes/nodes.py → src/typed_ffmpeg/nodes/nodes.py
diff --git a/src/ffmpeg/__init__.py → src/typed_ffmpeg/nodes/tests/__init__.py b/src/ffmpeg/__init__.py → src/typed_ffmpeg/nodes/tests/__init__.py
diff --git a/...ts__/test_input_node/test_input_node.json → ...ts__/test_input_node/test_input_node.json b/...ts__/test_input_node/test_input_node.json → ...ts__/test_input_node/test_input_node.json
diff --git a/...apshots__/test_nodes/test_input_node.json → ...apshots__/test_nodes/test_input_node.json b/...apshots__/test_nodes/test_input_node.json → ...apshots__/test_nodes/test_input_node.json
diff --git a/...pshots__/test_nodes/test_output_node.json → ...pshots__/test_nodes/test_output_node.json b/...pshots__/test_nodes/test_output_node.json → ...pshots__/test_nodes/test_output_node.json
diff --git a/src/ffmpeg/nodes/tests/test_base.py → src/typed_ffmpeg/nodes/tests/test_base.py b/src/ffmpeg/nodes/tests/test_base.py → src/typed_ffmpeg/nodes/tests/test_base.py
diff --git a/src/ffmpeg/nodes/tests/test_nodes.py → src/typed_ffmpeg/nodes/tests/test_nodes.py b/src/ffmpeg/nodes/tests/test_nodes.py → src/typed_ffmpeg/nodes/tests/test_nodes.py
diff --git a/src/ffmpeg/probe.py → src/typed_ffmpeg/probe.py b/src/ffmpeg/probe.py → src/typed_ffmpeg/probe.py
diff --git a/src/ffmpeg/py.typed → src/typed_ffmpeg/py.typed b/src/ffmpeg/py.typed → src/typed_ffmpeg/py.typed
diff --git a/src/ffmpeg/schema.py → src/typed_ffmpeg/schema.py b/src/ffmpeg/schema.py → src/typed_ffmpeg/schema.py
diff --git a/src/typed_ffmpeg/streams/__init__.py b/src/typed_ffmpeg/streams/__init__.py
@@ -0,0 +1,5 @@
+from .audio import AudioStream
+from .av import AVStream
+from .video import VideoStream
+
+__all__ = ["AudioStream", "VideoStream", "AVStream"]
diff --git a/src/ffmpeg/streams/audio.py → src/typed_ffmpeg/streams/audio.py b/src/ffmpeg/streams/audio.py → src/typed_ffmpeg/streams/audio.py
diff --git a/src/ffmpeg/streams/av.py → src/typed_ffmpeg/streams/av.py b/src/ffmpeg/streams/av.py → src/typed_ffmpeg/streams/av.py
diff --git a/src/ffmpeg/streams/channel_layout.py → src/typed_ffmpeg/streams/channel_layout.py b/src/ffmpeg/streams/channel_layout.py → src/typed_ffmpeg/streams/channel_layout.py
diff --git a/src/ffmpeg/streams/video.py → src/typed_ffmpeg/streams/video.py b/src/ffmpeg/streams/video.py → src/typed_ffmpeg/streams/video.py
diff --git a/src/ffmpeg/nodes/__init__.py → src/typed_ffmpeg/tests/__init__.py b/src/ffmpeg/nodes/__init__.py → src/typed_ffmpeg/tests/__init__.py
diff --git a/...ffmpeg/tests/__snapshots__/test_base.ambr → ...ffmpeg/tests/__snapshots__/test_base.ambr b/...ffmpeg/tests/__snapshots__/test_base.ambr → ...ffmpeg/tests/__snapshots__/test_base.ambr
diff --git a/...semble_video_from_sequence_of_frames.json → ...semble_video_from_sequence_of_frames.json b/...semble_video_from_sequence_of_frames.json → ...semble_video_from_sequence_of_frames.json
diff --git a/..._of_frames_with_additional_filtering.json → ..._of_frames_with_additional_filtering.json b/..._of_frames_with_additional_filtering.json → ..._of_frames_with_additional_filtering.json
diff --git a/.../test_base/test_audio_video_pipeline.json → .../test_base/test_audio_video_pipeline.json b/.../test_base/test_audio_video_pipeline.json → .../test_base/test_audio_video_pipeline.json
diff --git a/...__snapshots__/test_base/test_compile.json → ...__snapshots__/test_base/test_compile.json b/...__snapshots__/test_base/test_compile.json → ...__snapshots__/test_base/test_compile.json
diff --git a/...test_base/test_compile_bool_option.1.json → ...test_base/test_compile_bool_option.1.json b/...test_base/test_compile_bool_option.1.json → ...test_base/test_compile_bool_option.1.json
diff --git a/..._/test_base/test_compile_bool_option.json → ..._/test_base/test_compile_bool_option.json b/..._/test_base/test_compile_bool_option.json → ..._/test_base/test_compile_bool_option.json
diff --git a/...test_base/test_compile_merge_outputs.json → ...test_base/test_compile_merge_outputs.json b/...test_base/test_compile_merge_outputs.json → ...test_base/test_compile_merge_outputs.json
diff --git a/...le_merge_outputs_with_filter_complex.json → ...le_merge_outputs_with_filter_complex.json b/...le_merge_outputs_with_filter_complex.json → ...le_merge_outputs_with_filter_complex.json
diff --git a/...s__/test_base/test_drawtext_escaping.json → ...s__/test_base/test_drawtext_escaping.json b/...s__/test_base/test_drawtext_escaping.json → ...s__/test_base/test_drawtext_escaping.json
diff --git a/...se/test_generate_thumbnail_for_video.json → ...se/test_generate_thumbnail_for_video.json b/...se/test_generate_thumbnail_for_video.json → ...se/test_generate_thumbnail_for_video.json
diff --git a/...ono_to_stereo_with_offsets_and_video.json → ...ono_to_stereo_with_offsets_and_video.json b/...ono_to_stereo_with_offsets_and_video.json → ...ono_to_stereo_with_offsets_and_video.json
diff --git a/src/ffmpeg/tests/test_base.py → src/typed_ffmpeg/tests/test_base.py b/src/ffmpeg/tests/test_base.py → src/typed_ffmpeg/tests/test_base.py
diff --git a/src/ffmpeg/nodes/tests/__init__.py → src/typed_ffmpeg/utils/__init__.py b/src/ffmpeg/nodes/tests/__init__.py → src/typed_ffmpeg/utils/__init__.py
diff --git a/src/ffmpeg/utils/compile.py → src/typed_ffmpeg/utils/compile.py b/src/ffmpeg/utils/compile.py → src/typed_ffmpeg/utils/compile.py
diff --git a/src/ffmpeg/utils/dag.py → src/typed_ffmpeg/utils/dag.py b/src/ffmpeg/utils/dag.py → src/typed_ffmpeg/utils/dag.py
diff --git a/src/ffmpeg/utils/dataclasses_helper.py → src/typed_ffmpeg/utils/dataclasses_helper.py b/src/ffmpeg/utils/dataclasses_helper.py → src/typed_ffmpeg/utils/dataclasses_helper.py
diff --git a/src/ffmpeg/utils/escaping.py → src/typed_ffmpeg/utils/escaping.py b/src/ffmpeg/utils/escaping.py → src/typed_ffmpeg/utils/escaping.py
diff --git a/src/ffmpeg/streams/__init__.py → src/typed_ffmpeg/utils/tests/__init__.py b/src/ffmpeg/streams/__init__.py → src/typed_ffmpeg/utils/tests/__init__.py
diff --git a/...snapshots__/test_dataclasses_helpers.ambr → ...snapshots__/test_dataclasses_helpers.ambr b/...snapshots__/test_dataclasses_helpers.ambr → ...snapshots__/test_dataclasses_helpers.ambr
diff --git a/...ls/tests/__snapshots__/test_escaping.ambr → ...ls/tests/__snapshots__/test_escaping.ambr b/...ls/tests/__snapshots__/test_escaping.ambr → ...ls/tests/__snapshots__/test_escaping.ambr
diff --git a/src/ffmpeg/utils/tests/test_dag.py → src/typed_ffmpeg/utils/tests/test_dag.py b/src/ffmpeg/utils/tests/test_dag.py → src/typed_ffmpeg/utils/tests/test_dag.py
diff --git a/...g/utils/tests/test_dataclasses_helpers.py → ...g/utils/tests/test_dataclasses_helpers.py b/...g/utils/tests/test_dataclasses_helpers.py → ...g/utils/tests/test_dataclasses_helpers.py
diff --git a/src/ffmpeg/utils/tests/test_escaping.py → ...typed_ffmpeg/utils/tests/test_escaping.py b/src/ffmpeg/utils/tests/test_escaping.py → ...typed_ffmpeg/utils/tests/test_escaping.py