Skip to content

Commit 434a5aa

Browse files
cdgriffithcdgriffith
authored
Version 5.0.0 (#394)
* Adding new GUI backend PySide6 * Adding AV1 support for rigaya's Nvidia and Intel hardware encoders! * Adding default source directory (thanks to Battlestar1965) * Adding hidden tabs for things that are not supported for a certain codec * Adding #345 Change the default priority of spawned tools (thanks to Maximo Piva) * Adding #371 Add "Stay on Top" (thanks to Hexenhammer) * Adding rotation detection for side data list, used in phone videos a lot * Adding #366 All x265 possible profiles (thanks to DesertCookie) * Fixing #370 Audio Match not working correctly after 4.10.0 (thanks to Hexenhammer) * Fixing settings panel would always want a restart if any paths to executables were filled on Windows * Fixing #374 name of hdr10plus tool name and adding link in settings (thanks to Richard Harmonson) * Fixing check for output same as source on file systems that don't support resolve * Fixing #378 Deprecated features used for SVT-AV1 (thanks to DesertCookie) * Fixing #380 Not all subtitles have "codec_name" (thanks to No Name) * Removing support and builds for Windows 7 and 8 * Removing support and builds for MacOS 10
1 parent ec54941 commit 434a5aa

File tree

90 files changed

+2633
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2633
-381
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 26 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
- uses: actions/setup-python@v3
1616
with:
17-
python-version: 3.8
17+
python-version: "3.10"
1818

1919
- name: Gather build version
2020
run: |
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
2626

27-
- name: Install PySide2 apt requirements
27+
- name: Install PySide6 apt requirements
2828
run: |
2929
sudo apt update
3030
sudo apt install libopengl0 freeglut3 freeglut3-dev libxcb-icccm4 libxkbcommon-x11-0 libxcb-xkb1 libxcb-render-util0 libxcb-randr0 libxcb-keysyms1 libxcb-image0 -y
@@ -56,22 +56,22 @@ jobs:
5656
dist/FastFlix --test
5757
5858
- name: Upload standalone executable artifact
59-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v3
6060
with:
6161
name: FastFlix_${{ env.VERSION }}_ubuntu_22_x86_64
6262
path: |
6363
dist/FastFlix
6464
dist/LICENSE
6565
66-
build-linux:
66+
build-ubuntu20:
6767
runs-on: ubuntu-20.04
6868

6969
steps:
70-
- uses: actions/checkout@v2
70+
- uses: actions/checkout@v3
7171

72-
- uses: actions/setup-python@v2
72+
- uses: actions/setup-python@v3
7373
with:
74-
python-version: 3.8
74+
python-version: "3.10"
7575

7676
- name: Gather build version
7777
run: |
@@ -81,7 +81,7 @@ jobs:
8181
env:
8282
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
8383

84-
- name: Install PySide2 apt requirements
84+
- name: Install PySide6 apt requirements
8585
run: |
8686
sudo apt update
8787
sudo apt install libopengl0 freeglut3 freeglut3-dev libxcb-icccm4 libxkbcommon-x11-0 libxcb-xkb1 libxcb-render-util0 libxcb-randr0 libxcb-keysyms1 libxcb-image0 -y
@@ -113,7 +113,7 @@ jobs:
113113
dist/FastFlix --test
114114
115115
- name: Upload standalone executable artifact
116-
uses: actions/upload-artifact@v2
116+
uses: actions/upload-artifact@v3
117117
with:
118118
name: FastFlix_${{ env.VERSION }}_ubuntu_20_x86_64
119119
path: |
@@ -125,10 +125,10 @@ jobs:
125125
runs-on: windows-2019
126126

127127
steps:
128-
- uses: actions/checkout@v2
129-
- uses: actions/setup-python@v2
128+
- uses: actions/checkout@v3
129+
- uses: actions/setup-python@v3
130130
with:
131-
python-version: 3.8
131+
python-version: "3.10"
132132

133133
- name: Gather build version
134134
shell: powershell
@@ -191,80 +191,29 @@ jobs:
191191
move docs\build-licenses.txt LICENSE
192192
193193
- name: Upload standalone executable artifact
194-
uses: actions/upload-artifact@v2
194+
uses: actions/upload-artifact@v3
195195
with:
196196
name: FastFlix_${{ env.VERSION }}_win64
197197
path: |
198198
FastFlix.exe
199199
LICENSE
200200
201201
- name: Upload installer artifact
202-
uses: actions/upload-artifact@v2
202+
uses: actions/upload-artifact@v3
203203
with:
204204
name: FastFlix_${{ env.VERSION }}_installer
205205
path: FastFlix_${{ env.VERSION }}_installer.exe
206206

207-
build-macos-10:
208-
209-
runs-on: macOS-10.15
210-
211-
steps:
212-
- uses: actions/checkout@v2
213-
- uses: actions/setup-python@v2
214-
with:
215-
python-version: 3.8
216-
217-
- name: Gather build version
218-
run: |
219-
mkdir dist
220-
echo "::set-env name=VERSION::$(python scripts/get_version.py)"
221-
echo "Building branch ${{env.GITHUB_REF}} - version ${{env.VERSION}}"
222-
env:
223-
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
224-
225-
- uses: syphar/restore-pip-download-cache@v1
226-
227-
- name: Insatll requirements
228-
run: |
229-
python -m pip install --upgrade pip setuptools --ignore-installed
230-
python -m pip install --upgrade wheel typing_extensions pyinstaller
231-
python -m pip install --upgrade -r requirements.txt
232-
233-
- name: Grab iso-639 lists
234-
run: |
235-
cp $(python -c "import iso639; print(iso639.mapping.TABLE_PATH)") iso-639-3.tab
236-
cp $(python -c "import iso639; print(iso639.mapping.MAPPING_PATH)") iso-639-3.json
237-
238-
- name: Build executable
239-
run: pyinstaller FastFlix_Nix_OneFile.spec
240-
241-
- name: Copy license to dist
242-
run: |
243-
cp docs/build-licenses.txt dist/LICENSE
244-
245-
- name: Test executable
246-
run: |
247-
chmod +x dist/FastFlix
248-
dist/FastFlix --version
249-
dist/FastFlix --test
250-
251-
- name: Upload standalone executable artifact
252-
uses: actions/upload-artifact@v2
253-
with:
254-
name: FastFlix_${{ env.VERSION }}_macos10
255-
path: |
256-
dist/FastFlix
257-
dist/LICENSE
258-
259207
build-macos-11:
260208

261-
runs-on: macOS-11
209+
runs-on: macos-11
262210

263211
steps:
264-
- uses: actions/checkout@v2
265-
- uses: actions/setup-python@v2
212+
- uses: actions/checkout@v3
213+
214+
- uses: actions/setup-python@v3
266215
with:
267-
python-version: 3.8
216+
python-version: "3.10"
268217

269218
- name: Gather build version
270219
run: |
@@ -301,7 +250,7 @@ jobs:
301250
dist/FastFlix --test
302251
303252
- name: Upload standalone executable artifact
304-
uses: actions/upload-artifact@v2
253+
uses: actions/upload-artifact@v3
305254
with:
306255
name: FastFlix_${{ env.VERSION }}_macos11
307256
path: |
@@ -310,13 +259,14 @@ jobs:
310259
311260
build-macos-12:
312261

313-
runs-on: macOS-12
262+
runs-on: macos-12
314263

315264
steps:
316-
- uses: actions/checkout@v2
317-
- uses: actions/setup-python@v2
265+
- uses: actions/checkout@v3
266+
267+
- uses: actions/setup-python@v3
318268
with:
319-
python-version: 3.8
269+
python-version: "3.10"
320270

321271
- name: Gather build version
322272
run: |
@@ -353,7 +303,7 @@ jobs:
353303
dist/FastFlix --test
354304
355305
- name: Upload standalone executable artifact
356-
uses: actions/upload-artifact@v2
306+
uses: actions/upload-artifact@v3
357307
with:
358308
name: FastFlix_${{ env.VERSION }}_macos12
359309
path: |

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ jobs:
1212
runs-on: ubuntu-20.04
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

17-
- uses: actions/setup-python@v2
17+
- uses: actions/setup-python@v3
1818
with:
19-
python-version: 3.8
19+
python-version: "3.10"
2020

2121
- uses: actions/cache@v2
2222
with:
2323
path: ${{ env.pythonLocation }}
2424
key: ${{ env.pythonLocation }}-black
2525

26-
- run: pip install black==22.3.0
26+
- run: pip install black==22.10.0
2727
- run: python -m black --check .
2828

2929
test:
3030
runs-on: ubuntu-20.04
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3434

35-
- uses: actions/setup-python@v2
35+
- uses: actions/setup-python@v3
3636
with:
37-
python-version: 3.8
37+
python-version: "3.10"
3838

39-
- name: Install PySide2 requirements
39+
- name: Install PySide6 requirements
4040
run: |
4141
sudo apt update
4242
sudo apt install libopengl0 freeglut3 freeglut3-dev -y
@@ -51,5 +51,5 @@ jobs:
5151
5252
- name: Run tests
5353
env:
54-
PYTEST_QT_API: pyside2
54+
PYTEST_QT_API: pyside6
5555
run: pytest tests

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.0.1
3+
rev: v4.4.0
44
hooks:
55
- id: mixed-line-ending
66
- id: trailing-whitespace
@@ -19,7 +19,7 @@ repos:
1919
- id: detect-private-key
2020
- id: end-of-file-fixer
2121
- repo: https://github.com/psf/black
22-
rev: 22.3.0
22+
rev: 22.10.0
2323
hooks:
2424
- id: black
2525
# - repo: https://github.com/pre-commit/mirrors-mypy

‎CHANGES‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## Version 5.0.0
4+
5+
* Adding new GUI backend PySide6
6+
* Adding AV1 support for rigaya's Nvidia and Intel hardware encoders!
7+
* Adding default source directory (thanks to Battlestar1965)
8+
* Adding hidden tabs for things that are not supported for a certain codec
9+
* Adding #345 Change the default priority of spawned tools (thanks to Maximo Piva)
10+
* Adding #371 Add "Stay on Top" (thanks to Hexenhammer)
11+
* Adding rotation detection for side data list, used in phone videos a lot
12+
* Adding #366 All x265 possible profiles (thanks to DesertCookie)
13+
* Fixing #370 Audio Match not working correctly after 4.10.0 (thanks to Hexenhammer)
14+
* Fixing settings panel would always want a restart if any paths to executables were filled on Windows
15+
* Fixing #374 name of hdr10plus tool name and adding link in settings (thanks to Richard Harmonson)
16+
* Fixing check for output same as source on file systems that don't support resolve
17+
* Fixing #378 Deprecated features used for SVT-AV1 (thanks to DesertCookie)
18+
* Fixing #380 Not all subtitles have "codec_name" (thanks to No Name)
19+
* Removing support and builds for Windows 7 and 8
20+
* Removing support and builds for MacOS 10
21+
322
## Version 4.10.0
423

524
* Adding AVIF support using libsvtav1

‎FastFlix_Windows_Installer.spec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for root, dirs, files in os.walk('fastflix'):
1414
all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions', 'box']
1515
with open("requirements.txt", "r") as reqs:
1616
for line in reqs:
17-
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()
17+
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').rstrip("~").strip()
1818
if package not in ("pyinstaller", "pypiwin32"):
1919
all_imports.append(package)
2020

@@ -39,8 +39,9 @@ exe = EXE(pyz,
3939
debug=False,
4040
bootloader_ignore_signals=False,
4141
strip=False,
42-
upx=True,
43-
console=True , icon='fastflix\\data\\icon.ico')
42+
upx=False,
43+
console=True,
44+
icon='fastflix\\data\\icon.ico')
4445
coll = COLLECT(exe,
4546
a.binaries,
4647
a.zipfiles,

‎FastFlix_Windows_OneFile.spec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for root, dirs, files in os.walk('fastflix'):
1414
all_imports = collect_submodules('pydantic') + ['dataclasses', 'colorsys', 'typing_extensions', 'box']
1515
with open("requirements.txt", "r") as reqs:
1616
for line in reqs:
17-
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').strip()
17+
package = line.split("[")[0].split("=")[0].split(">")[0].split("<")[0].replace('"', '').replace("'", '').rstrip("~").strip()
1818
if package not in ("pyinstaller"):
1919
all_imports.append(package)
2020

@@ -44,4 +44,5 @@ exe = EXE(pyz,
4444
upx=False,
4545
upx_exclude=[],
4646
runtime_tmpdir=None,
47-
console=True , icon='fastflix\\data\\icon.ico')
47+
console=True,
48+
icon='fastflix\\data\\icon.ico')

0 commit comments

Comments
 (0)