better-ffmpeg-progress 4.0.0__tar.gz → 4.1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/PKG-INFO +2 -1
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/better_ffmpeg_progress.py +24 -11
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress.egg-info/PKG-INFO +2 -1
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress.egg-info/requires.txt +1 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/setup.py +2 -2
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/LICENSE +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/README.md +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/__init__.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/enums.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/exceptions.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/progress_bars.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/terminate_process.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/utils.py +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress.egg-info/SOURCES.txt +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress.egg-info/dependency_links.txt +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress.egg-info/top_level.txt +0 -0
- {better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: better-ffmpeg-progress
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.1.0
|
|
4
4
|
Summary: Run FFmpeg & see percentage progress + ETA.
|
|
5
5
|
Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
|
|
6
6
|
Author: GitHub.com/CrypticSignal
|
|
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
|
|
|
13
13
|
Description-Content-Type: text/markdown
|
|
14
14
|
License-File: LICENSE
|
|
15
15
|
Requires-Dist: psutil
|
|
16
|
+
Requires-Dist: requests
|
|
16
17
|
Requires-Dist: rich
|
|
17
18
|
Requires-Dist: tqdm
|
|
18
19
|
|
|
@@ -57,7 +57,7 @@ class FfmpegProcess:
|
|
|
57
57
|
self,
|
|
58
58
|
command: List[str],
|
|
59
59
|
ffmpeg_log_level: Optional[Union[FfmpegLogLevel, str]] = None,
|
|
60
|
-
ffmpeg_log_file: Optional[Union[str,
|
|
60
|
+
ffmpeg_log_file: Optional[Union[str, os.PathLike]] = None,
|
|
61
61
|
print_detected_duration: bool = False,
|
|
62
62
|
):
|
|
63
63
|
# Raises FfmpegCommandError if the command is invalid
|
|
@@ -91,9 +91,13 @@ class FfmpegProcess:
|
|
|
91
91
|
# Assumes last argument is output
|
|
92
92
|
self._output_filepath = Path(command[-1])
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
)
|
|
94
|
+
if ffmpeg_log_file is None:
|
|
95
|
+
self._ffmpeg_log_file = Path(f"{self._input_filepath.name}_ffmpeg_log.txt")
|
|
96
|
+
elif isinstance(ffmpeg_log_file, (str, os.PathLike)):
|
|
97
|
+
self._ffmpeg_log_file = Path(ffmpeg_log_file)
|
|
98
|
+
else:
|
|
99
|
+
self._ffmpeg_log_file = ffmpeg_log_file
|
|
100
|
+
|
|
97
101
|
self._print_detected_duration = print_detected_duration
|
|
98
102
|
self._duration_secs = get_media_duration(input_file_path_str)
|
|
99
103
|
|
|
@@ -151,17 +155,26 @@ class FfmpegProcess:
|
|
|
151
155
|
self._return_code = 1
|
|
152
156
|
|
|
153
157
|
try:
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
creationflags = 0
|
|
159
|
+
# Windows
|
|
160
|
+
if os.name == "nt":
|
|
161
|
+
creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
|
|
162
|
+
|
|
163
|
+
if isinstance(self._ffmpeg_log_file, Path):
|
|
164
|
+
with open(self._ffmpeg_log_file, "w", encoding="utf-8") as f:
|
|
165
|
+
self._process = subprocess.Popen(
|
|
166
|
+
current_ffmpeg_command,
|
|
167
|
+
shell=self._shell_needed,
|
|
168
|
+
stdout=subprocess.PIPE,
|
|
169
|
+
stderr=f,
|
|
170
|
+
creationflags=creationflags,
|
|
171
|
+
)
|
|
172
|
+
else:
|
|
160
173
|
self._process = subprocess.Popen(
|
|
161
174
|
current_ffmpeg_command,
|
|
162
175
|
shell=self._shell_needed,
|
|
163
176
|
stdout=subprocess.PIPE,
|
|
164
|
-
stderr=
|
|
177
|
+
stderr=self._ffmpeg_log_file,
|
|
165
178
|
creationflags=creationflags,
|
|
166
179
|
)
|
|
167
180
|
except Exception as e:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: better-ffmpeg-progress
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.1.0
|
|
4
4
|
Summary: Run FFmpeg & see percentage progress + ETA.
|
|
5
5
|
Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
|
|
6
6
|
Author: GitHub.com/CrypticSignal
|
|
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
|
|
|
13
13
|
Description-Content-Type: text/markdown
|
|
14
14
|
License-File: LICENSE
|
|
15
15
|
Requires-Dist: psutil
|
|
16
|
+
Requires-Dist: requests
|
|
16
17
|
Requires-Dist: rich
|
|
17
18
|
Requires-Dist: tqdm
|
|
18
19
|
|
|
@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as f:
|
|
|
5
5
|
|
|
6
6
|
setuptools.setup(
|
|
7
7
|
name="better-ffmpeg-progress",
|
|
8
|
-
version="4.
|
|
8
|
+
version="4.1.0",
|
|
9
9
|
author="GitHub.com/CrypticSignal",
|
|
10
10
|
author_email="theaudiophile@outlook.com",
|
|
11
11
|
description="Run FFmpeg & see percentage progress + ETA.",
|
|
@@ -13,7 +13,7 @@ setuptools.setup(
|
|
|
13
13
|
long_description_content_type="text/markdown",
|
|
14
14
|
url="https://github.com/CrypticSignal/better-ffmpeg-progress",
|
|
15
15
|
packages=["better_ffmpeg_progress"],
|
|
16
|
-
install_requires=["psutil", "rich", "tqdm"],
|
|
16
|
+
install_requires=["psutil", "requests", "rich", "tqdm"],
|
|
17
17
|
python_requires=">=3.7",
|
|
18
18
|
keywords=["ffmpeg", "progress"],
|
|
19
19
|
classifiers=[
|
|
File without changes
|
|
File without changes
|
{better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/__init__.py
RENAMED
|
File without changes
|
{better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/enums.py
RENAMED
|
File without changes
|
{better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/exceptions.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{better_ffmpeg_progress-4.0.0 → better_ffmpeg_progress-4.1.0}/better_ffmpeg_progress/utils.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|