diff --git a/.github/workflows/ff-publish.yaml b/.github/workflows/ff-publish.yaml new file mode 100644 index 0000000000..a41fddc339 --- /dev/null +++ b/.github/workflows/ff-publish.yaml @@ -0,0 +1,43 @@ +# This workflows will upload a Python Package using Twine when a release is created +# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries + +name: Upload Python Package +on: + release: + types: [created] +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine + - name: Build and publish + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + cd ff + mv ae_ffmpeg/ffmpeg/Windows ./ + python setup.py bdist_wheel --plat-name=macosx_10_9_x86_64 + + twine upload dist/* + rm -rf dist build + + mv Windows ae_ffmpeg/ffmpeg + mv ae_ffmpeg/ffmpeg/Darwin ./ + + python setup.py bdist_wheel --plat-name=win_amd64 + twine upload dist/* + rm -rf dist build + + mv ae_ffmpeg/ffmpeg/Windows ./ + + python setup.py sdist bdist_wheel + twine upload dist/* diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 8e189f5d75..05d842e568 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -20,23 +20,8 @@ jobs: pip install setuptools wheel twine - name: Build and publish env: - TWINE_USERNAME: ${{ secrets.PIP_USERNAME }} + TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PIP_PASSWORD }} run: | - mv auto_editor/ffmpeg/Windows ./ - python setup.py bdist_wheel --plat-name=macosx_10_9_x86_64 - - twine upload dist/* - rm -rf dist build - - mv Windows auto_editor/ffmpeg - mv auto_editor/ffmpeg/Darwin ./ - - python setup.py bdist_wheel --plat-name=win_amd64 - twine upload dist/* - rm -rf dist build - - mv auto_editor/ffmpeg/Windows ./ - python setup.py sdist bdist_wheel twine upload dist/* diff --git a/README.md b/README.md index 48443d66f3..05e6be1e84 100644 --- a/README.md +++ b/README.md @@ -137,9 +137,9 @@ auto-editor --scale --help - [Note on GPU Acceleration](https://auto-editor.com/gpu) ## Copyright -Auto-Editor is under the [Public Domain](https://github.com/WyattBlue/auto-editor/blob/master/LICENSE) and includes all files besides the ones listed below. Auto-Editor was created by [these people.](https://github.com/WyattBlue/auto-editor/blob/master/AUTHORS.md) +Auto-Editor is under the [Public Domain](https://github.com/WyattBlue/auto-editor/blob/master/LICENSE) and includes all directories besides the ones listed below. Auto-Editor was created by [these people.](https://github.com/WyattBlue/auto-editor/blob/master/AUTHORS.md) -The binaries under auto_editor/ffmpeg are subject to the [LGPLv3 License](https://github.com/WyattBlue/auto-editor/blob/master/auto_editor/ffmpeg/LICENSE.txt). The FFmpeg and FFprobe programs were created by the FFmpeg team and purposely compiled by WyattBlue for use in auto-editor. +ae-ffmpeg is under the [LGPLv3 License](https://github.com/WyattBlue/auto-editor/blob/master/auto_editor/ffmpeg/LICENSE.txt). The FFmpeg and FFprobe programs were created by the FFmpeg team and purposely compiled by WyattBlue for use in auto-editor. ## Issues If you encounter a bug or have a feature request, you can [create a new issue](https://github.com/WyattBlue/auto-editor/issues/new). If you'll like to discuss this project, and chat with other users, you can use the [discord server](https://discord.com/invite/kMHAWJJ). diff --git a/auto_editor/ffmpeg/Darwin/ffmpeg b/auto_editor/ffmpeg/Darwin/ffmpeg deleted file mode 100755 index 5e7b4e36fb..0000000000 Binary files a/auto_editor/ffmpeg/Darwin/ffmpeg and /dev/null differ diff --git a/auto_editor/ffmpeg/LICENSE.txt b/auto_editor/ffmpeg/LICENSE.txt deleted file mode 100644 index 11e8067e6c..0000000000 --- a/auto_editor/ffmpeg/LICENSE.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/auto_editor/ffmpeg/Windows/ffmpeg.exe b/auto_editor/ffmpeg/Windows/ffmpeg.exe deleted file mode 100755 index d22debab66..0000000000 Binary files a/auto_editor/ffmpeg/Windows/ffmpeg.exe and /dev/null differ diff --git a/auto_editor/ffmpeg/Windows/libopenh264.dll b/auto_editor/ffmpeg/Windows/libopenh264.dll deleted file mode 100644 index a34e9c8101..0000000000 Binary files a/auto_editor/ffmpeg/Windows/libopenh264.dll and /dev/null differ diff --git a/auto_editor/ffwrapper.py b/auto_editor/ffwrapper.py index 9d84ba751b..3ac0ae50d5 100644 --- a/auto_editor/ffwrapper.py +++ b/auto_editor/ffwrapper.py @@ -9,6 +9,8 @@ from subprocess import PIPE, Popen from typing import Any, Dict, List, Optional, Tuple +import ae_ffmpeg + from auto_editor.utils.func import get_stdout from auto_editor.utils.log import Log @@ -19,24 +21,6 @@ class FFmpeg: __slots__ = ("debug", "path", "version") - @staticmethod - def _set_ff_path(ff_location: Optional[str], my_ffmpeg: bool) -> str: - if ff_location is not None: - return ff_location - if my_ffmpeg or system() not in ("Windows", "Darwin"): - return "ffmpeg" - - # Assumming accessing __file__ is somewhat expensive. - program = "ffmpeg.exe" if system() == "Windows" else "ffmpeg" - dirpath = os.path.dirname(os.path.realpath(__file__)) - file_path = os.path.join(dirpath, "ffmpeg", system(), program) - - # May not exist because auto-editor doesn't bundle every architecture. - if os.path.isfile(file_path): - return file_path - - return "ffmpeg" - def __init__( self, ff_location: Optional[str] = None, @@ -44,8 +28,16 @@ def __init__( debug: bool = False, ) -> None: + def _set_ff_path(ff_location: Optional[str], my_ffmpeg: bool) -> str: + if ff_location is not None: + return ff_location + if my_ffmpeg: + return "ffmpeg" + + return ae_ffmpeg.get_path() + self.debug = debug - self.path = self._set_ff_path(ff_location, my_ffmpeg) + self.path = _set_ff_path(ff_location, my_ffmpeg) try: _version = get_stdout([self.path, "-version"]).split("\n")[0] _version = _version.replace("ffmpeg version", "").strip() diff --git a/setup.py b/setup.py index 04353e7c4e..ec7b228292 100644 --- a/setup.py +++ b/setup.py @@ -36,23 +36,14 @@ def pip_version(): keywords="video audio media editor editing processing nonlinear automatic " "silence-detect silence-removal silence-speedup motion-detection", packages=find_packages(), - package_data={ - "auto_editor": [ - "help.json", - "ffmpeg/LICENSE.txt", - "ffmpeg/Windows/ffmpeg.exe", - "ffmpeg/Windows/ffprobe.exe", - "ffmpeg/Windows/libopenh264.dll", - "ffmpeg/Darwin/ffmpeg", - "ffmpeg/Darwin/ffprobe", - ], - }, + package_data={"auto_editor": ["help.json"]}, include_package_data=True, zip_safe=False, install_requires=[ "numpy>=1.22.0", "pillow==9.2.0", "av==9.2.0", + "ae-ffmpeg==1.0.0", ], python_requires=">=3.8", classifiers=[