3.2.1

1. Fix an issue caused by the missing dependency `libcrypto.so.1.1`. This fixture is only required by the Linux version.
2. Format the PyPI release script.

Author: cainmagi

README.md

@@ -23,6 +23,7 @@ The script will keep updated with the newest releases of the pre-compiled module
 
 |  `mpegCoder`  |  Uploaded  |
 | :-----------: | :--------: |
+| `3.2.1` | :heavy_check_mark: |
 | `3.2.0` | :heavy_check_mark: |
 | `3.1.0` | :heavy_check_mark: |
 

README_PYPI.md

@@ -33,7 +33,7 @@ With this package, users could:
 However, users could not work with this project in such cases:
 
 * Platform limited. Currently, we only support Linux and Windows. The Linux release is pre-compiled on Debian. It has been only tested in Ubuntu, Debian and Windows. In other cases, the pre-compiled library may not work. Users may need to compile the package by themselves.
-* Version limited. Currently, our project only works with FFMpeg `4.4`. Users need to download the dependent dynamic libraries to make the package work. The legacy versions of this project supports FFMpeg `3.3`, `3.4.2` and `4.0`. However, the legacy built packages are not technically supported now.
+* Version limited. Currently, our project works with FFMpeg `4.4`, and `5.0`. Users need to download the dependent dynamic libraries to make the package work. The `pip` version is able to download the libraries automatically. The legacy versions of this project supports FFMpeg `3.3`, `3.4.2` and `4.0`. However, the legacy built packages are not technically supported now.
 * Audio not supported. Although the original FFMpeg supports both video and audio streams, our project only works on video streams. For example, if a video contains audio streams, our package would omit all audio frames in the bottom level. In other words, you **could not** perform audio analysis now. In the future (`v4`), we may support the audio frame analysis.
 * Filters not supported. Although the original FFMpeg supports some video processing tools ([`avfilter`][link-avfilter] and [`postproc`][link-postproc]), our implementation drops these modules. Instead, we suggest that users should process the frames with [pillow][pip-pillow] or [openCV][pip-opencv]. On the other hand, our implementation still supports frame scaling and re-sampling (supported by [`swscale`][link-swscale] and [`swresample`][link-swresample]).
 

mpegCoder-pypi.code-workspace

@@ -14,6 +14,9 @@
         "python.linting.pylintArgs": [
             "-d", "C0301"
         ],
-        "cSpell.enabled": true
+        "cSpell.enabled": false,
+        "python.linting.enabled": true,
+        "python.linting.flake8Enabled": true,
+        "python.formatting.provider": "black"
     }
 }

requirements.txt

@@ -1,3 +1,3 @@
-urllib3
+urllib3>=1.26.2
 tqdm>=4.50.0
 setuptools>=50.3.2

scripts/init_linux.py

@@ -17,7 +17,8 @@
 import ctypes
 from . import webtools
 
-__verion__ = '3.2.0'
+__verion__ = '3.2.1'
+__inner_version__ = '3.2.0'
 PY_VERSION = sysconfig.get_python_version()
 
 
@@ -68,11 +69,14 @@ def add_dependencies(self, *names):
 if not os.path.isfile(os.path.join(basedir, 'mpegCoder.so')):
     webtools.download_tarball(
         'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
-        '{0}-linux'.format(__verion__),
-        get_release_name(__verion__, PY_VERSION),
+        '{0}-linux'.format(__inner_version__),
+        get_release_name(__inner_version__, PY_VERSION),
         path=basedir, mode='auto', verbose=True, token=''
     )
-if not os.path.isdir(os.path.join(basedir, 'lib')):
+if (
+    (not os.path.isdir(os.path.join(basedir, 'lib'))) or  # noqa: W504
+    (not os.path.isdir(os.path.join(basedir, 'lib', 'libcrypto.so.1.1')))
+):  # Fix a missing dependency problem caused by libssh.
     webtools.download_tarball(
         'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
         'deps-3.2.0', 'so-linux-ffmpeg_5_0.tar.xz',
@@ -90,7 +94,7 @@ def add_dependencies(self, *names):
     'libXdmcp.so.6', 'libbsd.so.0', 'libmd.so.0',
 )
 __dependencies.add_dependencies(
-    'libsrt.so.1.4', 'libssh.so.4'
+    'libsrt.so.1.4', 'libssh.so.4', 'libcrypto.so.1.1',
 )
 __dependencies.add_dependencies(
     'libopencore-amrwb.so.0', 'libogg.so.0', 'libmpg123.so.0',

scripts/init_win.py

@@ -16,7 +16,8 @@
 import sysconfig
 from . import webtools
 
-__verion__ = '3.2.0'
+__verion__ = '3.2.1'
+__inner_version__ = '3.2.0'
 PY_VERSION = sysconfig.get_python_version()
 
 
@@ -37,7 +38,7 @@ def get_release_name(mpegcoder_ver='3.x', python_ver='3.6'):
 if not os.path.isfile(os.path.join(basedir, 'mpegCoder.pyd')):
     webtools.download_tarball(
         'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
-        __verion__, get_release_name(__verion__, PY_VERSION),
+        __inner_version__, get_release_name(__inner_version__, PY_VERSION),
         path=basedir, mode='auto', verbose=True, token=''
     )
 if not os.path.isfile(os.path.join(basedir, 'avcodec-59.dll')):

setup.py

@@ -43,7 +43,8 @@ def find_packages(path=('.', ), prefix=''):
                 yield name
 
 
-VERSION = '3.2.0'
+VERSION = '3.2.1'
+DEPENDENCY_VERSION = '3.2.0'
 PUBLISH_VERSION = ''
 # PUBLISH_VERSION Should begin from '', each failed attmpt, it need to be
 # changed as '-b', '-c', ...
@@ -112,11 +113,14 @@ def fetch_dependencies(python_ver='3.6', is_linux=False, target_path='.'):
         if not os.path.isfile(os.path.join(target_path, 'mpegCoder.so')):
             webtools.download_tarball(
                 'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
-                '{0}-linux'.format(VERSION),
-                get_release_name(VERSION, python_ver, is_linux),
+                '{0}-linux'.format(DEPENDENCY_VERSION),
+                get_release_name(DEPENDENCY_VERSION, python_ver, is_linux),
                 path=target_path, mode='auto', verbose=True, token=''
             )
-        if not os.path.isdir(os.path.join(target_path, 'lib')):
+        if (
+            (not os.path.isdir(os.path.join(target_path, 'lib'))) or  # noqa: W504
+            (not os.path.isdir(os.path.join(target_path, 'lib', 'libcrypto.so.1.1')))
+        ):  # Fix a missing dependency problem caused by libssh.
             webtools.download_tarball(
                 'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
                 'deps-3.2.0', 'so-linux-ffmpeg_5_0.tar.xz',
@@ -126,7 +130,7 @@ def fetch_dependencies(python_ver='3.6', is_linux=False, target_path='.'):
         if not os.path.isfile(os.path.join(target_path, 'mpegCoder.pyd')):
             webtools.download_tarball(
                 'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
-                VERSION, get_release_name(VERSION, python_ver, is_linux),
+                DEPENDENCY_VERSION, get_release_name(DEPENDENCY_VERSION, python_ver, is_linux),
                 path=target_path, mode='auto', verbose=True, token=''
             )
         if not os.path.isfile(os.path.join(target_path, 'avcodec-59.dll')):

webtools.py

@@ -24,7 +24,7 @@
 
 try:
     from tqdm import tqdm
-    wrapattr=tqdm.wrapattr
+    wrapattr = tqdm.wrapattr
 except ImportError:
     import contextlib