better-ffmpeg-progress 3.2.3__tar.gz → 3.2.5__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-3.2.3 → better_ffmpeg_progress-3.2.5}/PKG-INFO +1 -1
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress/better_ffmpeg_progress.py +3 -2
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress.egg-info/PKG-INFO +1 -1
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/setup.py +1 -1
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/LICENSE +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/README.md +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress/__init__.py +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress/utils.py +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress.egg-info/SOURCES.txt +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress.egg-info/dependency_links.txt +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress.egg-info/requires.txt +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress.egg-info/top_level.txt +0 -0
- {better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/setup.cfg +0 -0
|
@@ -3,7 +3,6 @@ import os
|
|
|
3
3
|
from pathlib import Path
|
|
4
4
|
import psutil
|
|
5
5
|
import shutil
|
|
6
|
-
from signal import CTRL_BREAK_EVENT
|
|
7
6
|
import subprocess
|
|
8
7
|
from typing import List, Optional, Union
|
|
9
8
|
|
|
@@ -133,7 +132,7 @@ class FfmpegProcess:
|
|
|
133
132
|
self._input_filepath = Path(command[input_idx])
|
|
134
133
|
self._output_filepath = Path(command[-1])
|
|
135
134
|
self._ffmpeg_log_level = (
|
|
136
|
-
ffmpeg_log_level
|
|
135
|
+
ffmpeg_log_level if ffmpeg_log_level else FfmpegLogLevel.VERBOSE.value
|
|
137
136
|
)
|
|
138
137
|
self._ffmpeg_log_file = Path(
|
|
139
138
|
ffmpeg_log_file or f"{self._input_filepath.name}_log.txt"
|
|
@@ -324,6 +323,8 @@ class FfmpegProcess:
|
|
|
324
323
|
# If running under a shell, terminate shell first
|
|
325
324
|
proc.terminate()
|
|
326
325
|
else:
|
|
326
|
+
from signal import CTRL_BREAK_EVENT
|
|
327
|
+
|
|
327
328
|
# Send CTRL_BREAK_EVENT to entire process group
|
|
328
329
|
os.kill(self._process.pid, CTRL_BREAK_EVENT)
|
|
329
330
|
# Unix
|
|
@@ -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="3.2.
|
|
8
|
+
version="3.2.5",
|
|
9
9
|
author="GitHub.com/CrypticSignal",
|
|
10
10
|
author_email="theaudiophile@outlook.com",
|
|
11
11
|
description="Run FFmpeg & see percentage progress + ETA.",
|
|
File without changes
|
|
File without changes
|
{better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress/__init__.py
RENAMED
|
File without changes
|
{better_ffmpeg_progress-3.2.3 → better_ffmpeg_progress-3.2.5}/better_ffmpeg_progress/utils.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|