Skip to content

Commit bcabdd8

Browse files
cdgriffithbovirusmarillat
authored
Version 5.8.1 (#606)
* Fixing #598 'dict' object has no attribute 'to_yaml' (thanks to dmo marillat) * Fixing #599 Italian language translations (thanks to bovirus) * Fixing #600 Update NSIS installer script #601 to include Italian (thanks to bovirus) * Fixing #603 Themes stylesheet aren't included in python package (thanks to dmo marillat) * Fixing #605 HDR2SDR double tonemapping in Rigaya NVENC and QSV Encoders (thanks to Darksyderz) --------- Co-authored-by: bovirus <[email protected]> Co-authored-by: dmo <[email protected]>
1 parent f3cfc88 commit bcabdd8

File tree

21 files changed

+223
-178
lines changed

21 files changed

+223
-178
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,12 @@ jobs:
9494
run: |
9595
mkdir dist
9696
New-Item -Path Env: -Name VERSION -Value $(python.exe scripts\get_version.py)
97+
New-Item -Path Env: -Name EXACT_VERSION -Value $(python.exe scripts\get_version.py exact)
98+
New-Item -Path Env: -Name PRODUCT_VERSION -Value $(python.exe scripts\get_version.py nsis)
9799
echo "Building branch $env:GITHUB_REF - version $env:VERSION"
98100
echo "::set-env name=VERSION::$env:VERSION"
101+
echo "::set-env name=EXACT_VERSION::$env:EXACT_VERSION"
102+
echo "::set-env name=PRODUCT_VERSION::$env:PRODUCT_VERSION"
99103
env:
100104
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
101105

@@ -133,7 +137,7 @@ jobs:
133137
- name: Package installer
134138
shell: cmd
135139
run: |
136-
makensis.exe FastFlix.nsi
140+
makensis.exe /INPUTCHARSET UTF8 /DVERSION=${{ env.EXACT_VERSION }} /DPRODUCT_VERSION=${{ env.PRODUCT_VERSION }} FastFlix.nsi
137141
move FastFlix_installer.exe dist\FastFlix_${{ env.VERSION }}_installer.exe
138142
139143
- uses: skymatic/code-sign-action@v1
@@ -166,7 +170,7 @@ jobs:
166170
LICENSE
167171
168172
- name: Upload installer artifact
169-
uses: actions/upload-artifact@v3
173+
uses: actions/upload-artifact@v4
170174
with:
171175
name: FastFlix_${{ env.VERSION }}_installer
172176
path: FastFlix_${{ env.VERSION }}_installer.exe

‎CHANGES‎

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

3+
## Version 5.8.1
4+
5+
* Fixing #598 'dict' object has no attribute 'to_yaml' (thanks to dmo marillat)
6+
* Fixing #599 Italian language translations (thanks to bovirus)
7+
* Fixing #600 Update NSIS installer script #601 to include Italian (thanks to bovirus)
8+
* Fixing #603 Themes stylesheet aren't included in python package (thanks to dmo marillat)
9+
* Fixing #605 HDR2SDR double tonemapping in Rigaya NVENC and QSV Encoders (thanks to Darksyderz)
10+
311
## Version 5.8.0
412

513
* Adding #283 support for experimental DTS (dca) audio by adding -strict -2 (thanks to Sub7)

‎FastFlix.nsi‎

Lines changed: 67 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,33 @@
33

44
!include "MUI2.nsh"
55
!include LogicLib.nsh
6+
!include "TextFunc.nsh"
7+
!include "FileFunc.nsh"
8+
69
;--------------------------------
710

11+
!define PRODUCT_NAME "FastFlix"
12+
!define PRODUCT_AUTHOR "Chris Griffith"
13+
!define PRODUCT_COPYRIGHT "(c) Chris Griffith 2021-2024"
14+
15+
VIProductVersion "${PRODUCT_VERSION}"
16+
VIFileVersion "${PRODUCT_VERSION}"
17+
18+
; -------------------------------------------------------------------- Installer exe properties
19+
20+
VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
21+
VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
22+
VIAddVersionKey "CompanyName" "${PRODUCT_AUTHOR}"
23+
VIAddVersionKey "LegalTrademarks" "${PRODUCT_COPYRIGHT}"
24+
VIAddVersionKey "LegalCopyright" "${PRODUCT_COPYRIGHT}"
25+
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
26+
VIAddVersionKey "FileDescription" "${PRODUCT_NAME} installer"
27+
28+
VIAddVersionKey "InternalName" "${PRODUCT_NAME}"
29+
30+
831
; The name of the installer
9-
Name "FastFlix"
32+
Name "${PRODUCT_NAME} ${VERSION}"
1033

1134
; The file to write
1235
OutFile "FastFlix_installer.exe"
@@ -20,10 +43,10 @@ Unicode True
2043
SetCompressor lzma
2144

2245
; The default installation directory
23-
InstallDir $PROGRAMFILES64\FastFlix
46+
InstallDir $PROGRAMFILES64\${PRODUCT_NAME}
2447

2548
; Registry key to check for directory (so if you install again, it will overwrite the old one automatically)
26-
InstallDirRegKey HKLM "Software\FastFlix" "Install_Dir"
49+
InstallDirRegKey HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
2750

2851
;--------------------------------
2952

@@ -36,55 +59,76 @@ InstallDirRegKey HKLM "Software\FastFlix" "Install_Dir"
3659

3760
!insertmacro MUI_UNPAGE_CONFIRM
3861
!insertmacro MUI_UNPAGE_INSTFILES
39-
!define MUI_FINISHPAGE_TEXT "Thank you for installing FastFlix!"
62+
!define MUI_FINISHPAGE_TEXT "$(LSTR05)"
4063
!insertmacro MUI_PAGE_FINISH
41-
42-
4364
;Languages
4465

4566
!insertmacro MUI_LANGUAGE "English"
67+
!insertmacro MUI_LANGUAGE "Italian"
68+
69+
LangString LSTR01 1033 "Before proceeding with the installation of ${PRODUCT_NAME} you must uninstall the currently installed version.$\r$\n$\r$\nPlease ensure that ${PRODUCT_NAME} is not currently running!"
70+
LangString LSTR02 1033 "FastFlix (required)"
71+
LangString LSTR03 1033 "Start Menu Shortcuts"
72+
LangString LSTR04 1033 "Uninstall"
73+
LangString LSTR05 1033 "Thank you for installing ${PRODUCT_NAME}!"
74+
75+
LangString LSTR01 1040 "Prima di procedere all'installazione di ${PRODUCT_NAME} è necessario disinstallare la versione attualmente installata.$\r$\n$\r$\nAssicurati che ${PRODUCT_NAME} non sia attualmente in esecuzione!"
76+
LangString LSTR02 1040 "FastFlix (richiesto)"
77+
LangString LSTR03 1040 "Collegamenti menu Start"
78+
LangString LSTR04 1040 "Disinstalla"
79+
LangString LSTR05 1040 "Grazie per aver installato ${PRODUCT_NAME}!"
80+
4681

4782
;--------------------------------
4883
Function .onInit
4984
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "UninstallString"
5085
${If} $0 != ""
51-
Messagebox MB_OK|MB_ICONINFORMATION "You will now be prompted to first uninstall the previous version of FastFlix. Please ensure it is not currently running!"
86+
Messagebox MB_OK|MB_ICONINFORMATION "$(LSTR01)"
5287
ExecWait '$0 _?=$INSTDIR'
5388
${EndIf}
5489
FunctionEnd
5590

5691

5792
; The stuff to install
58-
Section "FastFlix (required)"
93+
Section "$(LSTR02)"
5994

6095
SectionIn RO
6196

6297
; Set output path to the installation directory.
6398
SetOutPath $INSTDIR
6499

100+
65101
Delete "$INSTDIR\uninstall.exe"
66102
; Put file there
67-
File /r "dist\FastFlix\*"
103+
File /r "dist\${PRODUCT_NAME}\*"
68104

69105
; Write the installation path into the registry
70-
WriteRegStr HKLM SOFTWARE\FastFlix "Install_Dir" "$INSTDIR"
71-
WriteRegStr HKLM SOFTWARE\FastFlix "UninstallString" '"$INSTDIR\uninstall.exe"'
106+
WriteRegStr HKLM SOFTWARE\${PRODUCT_NAME} "Install_Dir" "$INSTDIR"
107+
WriteRegStr HKLM SOFTWARE\${PRODUCT_NAME} "UninstallString" '"$INSTDIR\uninstall.exe"'
72108

73109
; Write the uninstall keys for Windows
74-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "DisplayName" "FastFlix"
75-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "UninstallString" '"$INSTDIR\uninstall.exe"'
76-
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "NoModify" 1
77-
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "NoRepair" 1
110+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
111+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
112+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_AUTHOR}"
113+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\FastFlix.exe"
114+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
115+
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
116+
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
117+
118+
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
119+
IntFmt $0 "0x%08X" $0 #< conv to DWORD
120+
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "EstimatedSize" "$0"
121+
78122
WriteUninstaller "$INSTDIR\uninstall.exe"
79123

80124
SectionEnd
81125

82126
; Optional section (can be disabled by the user)
83-
Section "Start Menu Shortcuts"
127+
Section "$(LSTR03)"
84128

85-
CreateDirectory "$SMPROGRAMS\FastFlix"
86-
CreateShortcut "$SMPROGRAMS\FastFlix\FastFlix.lnk" "$INSTDIR\FastFlix.exe"
87-
CreateShortcut "$SMPROGRAMS\FastFlix\Uninstall FastFlix.lnk" "$INSTDIR\uninstall.exe"
129+
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
130+
CreateShortcut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\FastFlix.exe"
131+
CreateShortcut "$SMPROGRAMS\${PRODUCT_NAME}\$(LSTR04) ${PRODUCT_NAME}.lnk" "$INSTDIR\uninstall.exe"
88132

89133
SectionEnd
90134

@@ -93,17 +137,17 @@ SectionEnd
93137
Section "Uninstall"
94138

95139
; Remove registry keys
96-
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix"
97-
DeleteRegKey HKLM SOFTWARE\FastFlix
140+
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
141+
DeleteRegKey HKLM SOFTWARE\${PRODUCT_NAME}
98142

99143
; Remove files
100144
Delete $INSTDIR\*
101145

102146
; Remove shortcuts, if any
103-
Delete "$SMPROGRAMS\FastFlix\*.lnk"
147+
Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.lnk"
104148

105149
; Remove directories
106-
RMDir "$SMPROGRAMS\FastFlix"
150+
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
107151
RMDir /r "$INSTDIR"
108152
RMDir "$INSTDIR"
109153

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ Russian (русский), Polish (polskie), Korean (한국어), Romanian.
137137
If something sounds wrong in your language, please open an issue with which line in
138138
[the language file](https://github.com/cdgriffith/FastFlix/blob/master/fastflix/data/languages.yaml) needs fixed!
139139

140-
Special thanks to [leonardyan](https://github.com/leonardyan) for numerous Chinese corrections and
141-
[Ta0ba0](https://github.com/Ta0ba0) for the Russian fixes!
140+
Special thanks to [leonardyan](https://github.com/leonardyan) for numerous Chinese corrections,
141+
[Ta0ba0](https://github.com/Ta0ba0) for the Russian language updates and
142+
[bovirus](https://github.com/bovirus) for Italian language updates!
142143

143144
# License
144145

0 commit comments

Comments
 (0)