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]>
cdgriffith · Aug 22, 2024 · bcabdd8 · bcabdd8
1 parent f3cfc88
commit bcabdd8
Show file tree

Hide file tree

Showing 21 changed files with 223 additions and 178 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -94,8 +94,12 @@ jobs:
       run: |
         mkdir dist
         New-Item -Path Env: -Name VERSION -Value $(python.exe scripts\get_version.py)
+        New-Item -Path Env: -Name EXACT_VERSION -Value $(python.exe scripts\get_version.py exact)
+        New-Item -Path Env: -Name PRODUCT_VERSION -Value $(python.exe scripts\get_version.py nsis)
         echo "Building branch $env:GITHUB_REF - version $env:VERSION"
         echo "::set-env name=VERSION::$env:VERSION"
+        echo "::set-env name=EXACT_VERSION::$env:EXACT_VERSION"
+        echo "::set-env name=PRODUCT_VERSION::$env:PRODUCT_VERSION"
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
@@ -133,7 +137,7 @@ jobs:
     - name: Package installer
       shell: cmd
       run: |
-        makensis.exe FastFlix.nsi
+        makensis.exe /INPUTCHARSET UTF8 /DVERSION=${{ env.EXACT_VERSION }} /DPRODUCT_VERSION=${{ env.PRODUCT_VERSION }} FastFlix.nsi
         move FastFlix_installer.exe dist\FastFlix_${{ env.VERSION }}_installer.exe
 
     - uses: skymatic/code-sign-action@v1
@@ -166,7 +170,7 @@ jobs:
           LICENSE
 
     - name: Upload installer artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: FastFlix_${{ env.VERSION }}_installer
         path: FastFlix_${{ env.VERSION }}_installer.exe
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 5.8.1
+
+* 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)
+
 ## Version 5.8.0
 
 * Adding #283 support for experimental DTS (dca) audio by adding -strict -2 (thanks to Sub7)

diff --git a/FastFlix.nsi b/FastFlix.nsi
@@ -3,10 +3,33 @@
 
 !include "MUI2.nsh"
 !include LogicLib.nsh
+!include "TextFunc.nsh"
+!include "FileFunc.nsh"
+
 ;--------------------------------
 
+!define PRODUCT_NAME      "FastFlix"
+!define PRODUCT_AUTHOR    "Chris Griffith"
+!define PRODUCT_COPYRIGHT "(c) Chris Griffith 2021-2024"
+
+VIProductVersion "${PRODUCT_VERSION}"
+VIFileVersion    "${PRODUCT_VERSION}"
+
+; -------------------------------------------------------------------- Installer exe properties
+
+VIAddVersionKey "ProductName"        "${PRODUCT_NAME}"
+VIAddVersionKey "ProductVersion"     "${PRODUCT_VERSION}"
+VIAddVersionKey "CompanyName"        "${PRODUCT_AUTHOR}"
+VIAddVersionKey "LegalTrademarks"    "${PRODUCT_COPYRIGHT}"
+VIAddVersionKey "LegalCopyright"     "${PRODUCT_COPYRIGHT}"
+VIAddVersionKey "FileVersion"        "${PRODUCT_VERSION}"
+VIAddVersionKey "FileDescription"    "${PRODUCT_NAME} installer"
+
+VIAddVersionKey "InternalName"       "${PRODUCT_NAME}"
+
+
 ; The name of the installer
-Name "FastFlix"
+Name "${PRODUCT_NAME} ${VERSION}"
 
 ; The file to write
 OutFile "FastFlix_installer.exe"
@@ -20,10 +43,10 @@ Unicode True
 SetCompressor lzma
 
 ; The default installation directory
-InstallDir $PROGRAMFILES64\FastFlix
+InstallDir $PROGRAMFILES64\${PRODUCT_NAME}
 
 ; Registry key to check for directory (so if you install again, it will overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\FastFlix" "Install_Dir"
+InstallDirRegKey HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
 
 ;--------------------------------
 
@@ -36,55 +59,76 @@ InstallDirRegKey HKLM "Software\FastFlix" "Install_Dir"
 
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
-  !define MUI_FINISHPAGE_TEXT "Thank you for installing FastFlix!"
+  !define MUI_FINISHPAGE_TEXT "$(LSTR05)"
   !insertmacro MUI_PAGE_FINISH
-
-
 ;Languages
 
   !insertmacro MUI_LANGUAGE "English"
+  !insertmacro MUI_LANGUAGE "Italian"
+
+  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!"
+  LangString LSTR02 1033  "FastFlix (required)"
+  LangString LSTR03 1033  "Start Menu Shortcuts"
+  LangString LSTR04 1033  "Uninstall"
+  LangString LSTR05 1033  "Thank you for installing ${PRODUCT_NAME}!"
+
+  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!"
+  LangString LSTR02 1040  "FastFlix (richiesto)"
+  LangString LSTR03 1040  "Collegamenti menu Start"
+  LangString LSTR04 1040  "Disinstalla"
+  LangString LSTR05 1040  "Grazie per aver installato ${PRODUCT_NAME}!"
+
 
 ;--------------------------------
 Function .onInit
   ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "UninstallString"
   ${If} $0 != ""
-    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!"
+    Messagebox MB_OK|MB_ICONINFORMATION  "$(LSTR01)"
     ExecWait '$0 _?=$INSTDIR'
   ${EndIf}
 FunctionEnd
 
 
 ; The stuff to install
-Section "FastFlix (required)"
+Section "$(LSTR02)"
 
   SectionIn RO
 
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
 
+
   Delete "$INSTDIR\uninstall.exe"
   ; Put file there
-  File /r "dist\FastFlix\*"
+  File /r "dist\${PRODUCT_NAME}\*"
 
   ; Write the installation path into the registry
-  WriteRegStr HKLM SOFTWARE\FastFlix "Install_Dir" "$INSTDIR"
-  WriteRegStr HKLM SOFTWARE\FastFlix "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM SOFTWARE\${PRODUCT_NAME} "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM SOFTWARE\${PRODUCT_NAME} "UninstallString" '"$INSTDIR\uninstall.exe"'
 
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "DisplayName" "FastFlix"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix" "NoRepair" 1
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_AUTHOR}"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\FastFlix.exe"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
+
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0 #< conv to DWORD
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "EstimatedSize" "$0"
+
   WriteUninstaller "$INSTDIR\uninstall.exe"
 
 SectionEnd
 
 ; Optional section (can be disabled by the user)
-Section "Start Menu Shortcuts"
+Section "$(LSTR03)"
 
-  CreateDirectory "$SMPROGRAMS\FastFlix"
-  CreateShortcut "$SMPROGRAMS\FastFlix\FastFlix.lnk" "$INSTDIR\FastFlix.exe"
-  CreateShortcut "$SMPROGRAMS\FastFlix\Uninstall FastFlix.lnk" "$INSTDIR\uninstall.exe"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateShortcut  "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\FastFlix.exe"
+  CreateShortcut  "$SMPROGRAMS\${PRODUCT_NAME}\$(LSTR04) ${PRODUCT_NAME}.lnk" "$INSTDIR\uninstall.exe"
 
 SectionEnd
 
@@ -93,17 +137,17 @@ SectionEnd
 Section "Uninstall"
 
   ; Remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FastFlix"
-  DeleteRegKey HKLM SOFTWARE\FastFlix
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+  DeleteRegKey HKLM SOFTWARE\${PRODUCT_NAME}
 
   ; Remove files
   Delete $INSTDIR\*
 
   ; Remove shortcuts, if any
-  Delete "$SMPROGRAMS\FastFlix\*.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.lnk"
 
   ; Remove directories
-  RMDir "$SMPROGRAMS\FastFlix"
+  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
   RMDir /r "$INSTDIR"
   RMDir "$INSTDIR"
 

diff --git a/README.md b/README.md
@@ -137,8 +137,9 @@ Russian (русский), Polish (polskie), Korean (한국어), Romanian.
 If something sounds wrong in your language, please open an issue with which line in
 [the language file](https://github.com/cdgriffith/FastFlix/blob/master/fastflix/data/languages.yaml) needs fixed!
 
-Special thanks to [leonardyan](https://github.com/leonardyan) for numerous Chinese corrections and
-[Ta0ba0](https://github.com/Ta0ba0) for the Russian fixes!
+Special thanks to [leonardyan](https://github.com/leonardyan) for numerous Chinese corrections,
+[Ta0ba0](https://github.com/Ta0ba0) for the Russian language updates and 
+[bovirus](https://github.com/bovirus) for Italian language updates!
 
 # License