Version 2.0.0 (#17)

* Adding AV1 support (both FFMPEG libaom-av1 and SVT-AV1)
* Adding VP9 support 
* Adding Visible command list
* Adding Audio transcoding options 
* Changing into MIT license
* Changing into plugin module design
* Removing all GPL or restrictive licensed products (including x265)
* Major Layout Redesign

Author: cdgriffith

.gitignore

@@ -113,3 +113,6 @@ config.yaml
 binary-files/
 SvtAv1/
 bundled
+extra/
+*.7z
+binary-files/

CHANGES

@@ -1,6 +1,18 @@
 Changelog
 ---------
 
+Version 2.0.0
+~~~~~~~~~~~~~
+
+* Adding AV1 support (both FFMPEG libaom-av1 and SVT-AV1)
+* Adding VP9 support
+* Adding Visible command list
+* Adding Audio transcoding options
+* Changing into MIT license
+* Changing into plugin module design
+* Removing all GPL or restrictive licensed products (including x265)
+* Major Layout Redesign
+
 Version 1.1.0
 ~~~~~~~~~~~~~
 

README.md

@@ -2,28 +2,29 @@
 
 # FastFlix
 
-FastFlix is a GIF converter as well as current and next-gen video encoder. 
+FastFlix is a AV1 encoder, GIF maker, and general command wrapper. 
 
-It can encode videos into AV1, GIF, and can be extended to use x265 with a GPL build of ffmpeg. 
+It can encode videos into AV1, GIF, and VP9, and is easily extendable! 
 
-Read more about it and the licensing in the [docs](docs/README.md)
+Read more about it and the licensing in the [docs](docs/README.md) folder.
 
-# Releases 
+![preview](https://raw.githubusercontent.com/cdgriffith/binary-files/fast-flix/media/fastflix/2.0.0/main.png)
 
-View the [releases](https://github.com/cdgriffith/FastFlix/releases) for 64 bit Windows binaries (Generated via Appveyor and also [available there](https://ci.appveyor.com/project/cdgriffith/fastflix)). 
 
-## Running the code locally
+# Plugins
 
-Requires Python 3.6 or greater. 
+Included plugins:
 
-Download and extract the [latest zip](https://github.com/cdgriffith/FastFlix/archive/master.zip). Then run the following.
+* AV1 (SVT-AV1)
+* AV1 (FFMPEG libaom - currently very slow)
+* VP9
+* GIF
 
-```
-pip install requirements.txt
-python -m flix
-```
+The plugins are extracted to `C:\Users\<username>\AppData\Roaming\FastFlix\<version>\pluigins`, and you can build or include your own. 
 
-You will need [ffmpeg](https://www.ffmpeg.org/download.html) and [SVT AV1](https://github.com/OpenVisualCloud/SVT-AV1) executables.
+# Releases 
+
+View the [releases](https://github.com/cdgriffith/FastFlix/releases) for 64 bit Windows binaries (Generated via Appveyor and also [available there](https://ci.appveyor.com/project/cdgriffith/fastflix)). 
 
 # License
 

appveyor.yml

@@ -28,26 +28,19 @@ install:
       try {Update-AppveyorBuild -Version "$(C:\Python36-x64\python.exe scripts\get_version.py)"}
       catch {Update-AppveyorBuild -Version "$(C:\Python36-x64\python.exe scripts\get_version.py)-$env:APPVEYOR_BUILD_ID"}
   - ps: Update-AppveyorBuild -Message "[$env:APPVEYOR_REPO_BRANCH] $env:APPVEYOR_REPO_COMMIT_MESSAGE"
-  - cmd: git clone -b ffmpeg --single-branch https://github.com/cdgriffith/binary-files.git
-  - cmd: mkdir SvtAv1
-  - cmd: appveyor DownloadFile https://ci.appveyor.com/api/projects/OpenVisualCloud/svt-av1/artifacts/Bin/Release/SvtAv1Enc.dll?branch=master -FileName SvtAv1\SvtAv1Enc.dll
-  - cmd: appveyor DownloadFile https://ci.appveyor.com/api/projects/OpenVisualCloud/svt-av1/artifacts/Bin/Release/SvtAv1EncApp.exe?branch=master -FileName SvtAv1\SvtAv1EncApp.exe
-  - cmd: appveyor DownloadFile https://ci.appveyor.com/api/projects/OpenVisualCloud/svt-av1/artifacts/Bin/Release/SvtAv1Enc.lib?branch=master -FileName SvtAv1\SvtAv1Enc.lib
-  - cmd: appveyor DownloadFile https://ci.appveyor.com/api/projects/OpenVisualCloud/svt-av1/artifacts/Bin/Release/SvtAv1Enc.exp?branch=master -FileName SvtAv1\SvtAv1Enc.exp
+  - cmd: git clone -b fast-flix --single-branch https://github.com/cdgriffith/binary-files.git
   - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed
   - cmd: C:\Python36-x64\python -m pip install -r requirements.txt
-
+  - cmd: pushd flix && ..\binary-files\executables\windows\7-zip\1900\x64\7za.exe a "..\plugins.7z" "plugins" && popd
 
 build_script:
   - ps: mkdir dist
   - cmd: echo "" > bundled
   - ps: 'New-Item -Path Env: -Name VERSION -Value $(C:\Python36-x64\python.exe scripts\get_version.py)'
   - cmd: echo %VERSION% > build_version
   - ps: 'echo "Building branch $env:APPVEYOR_REPO_BRANCH - version $env:VERSION"'
-  - cmd: if %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "data\icon.ico;data" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files/executables/windows/ffmpeg/lgpl/N-93214-g7e4d3dbe18/x86_64/*;." --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --add-data "SvtAv1\*;." flix\gui.py  --icon data\icon.ico --name FastFlix --clean --onefile --noconsole )
-#  - cmd: if %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --add-data "docs\build-licenses.txt;docs" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py  --icon data\icon.ico --name FastFlix-Light --clean --onefile --noconsole )
-  - cmd: IF NOT %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "build_version;." --add-data "data\icon.ico;data" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files/executables/windows/ffmpeg/lgpl/N-93214-g7e4d3dbe18/x86_64/*;." --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --add-data "SvtAv1\*;." flix\gui.py  --icon data\icon.ico --name FastFlix --clean --onefile )
-#  - cmd: IF NOT %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "build_version;." --add-data "data\icon.ico;data" --add-data "docs\build-licenses.txt;docs" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py  --icon data\icon.ico --name FastFlix-Light --clean --onefile )
+  - cmd: if %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra" --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py  --icon data\icon.ico --name FastFlix --clean --onefile --noconsole )
+  - cmd: IF NOT %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra"  --add-data "build_version;." --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py  --icon data\icon.ico --name FastFlix --clean --onefile )
   - cmd: move dist\*.exe .
 
 test: off
@@ -62,7 +55,7 @@ deploy:
     description: ''
     on:
       branch:
-        - build
+        - develop
 
   - provider: Environment
     name: release

copy_plugins.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+import shutil
+import os
+from appdirs import user_data_dir
+from pathlib import Path
+
+from flix.version import __version__
+
+data_path = Path(user_data_dir("FastFlix", appauthor=False, version=__version__, roaming=True))
+data_path.mkdir(parents=True, exist_ok=True)
+
+
+dest = f'{data_path}{os.sep}plugins'
+
+print(f"Copying plugins to {dest}")
+
+shutil.rmtree(dest, ignore_errors=True)
+shutil.copytree(f'flix{os.sep}plugins', dest)