From 98ae0973f3c0bf0e22f6a610084687f504873412 Mon Sep 17 00:00:00 2001 From: n00mkrad <61149547+n00mkrad@users.noreply.github.com> Date: Sun, 9 Nov 2025 17:21:45 +0100 Subject: [PATCH] PackageBuild: Use CodeLegacy (.NET Framework) dir --- Build/PackageBuild.bat | 40 +++++++++++++++-------------- CodeLegacy/Main/InterpolateUtils.cs | 2 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Build/PackageBuild.bat b/Build/PackageBuild.bat index acc3212..efae7ca 100644 --- a/Build/PackageBuild.bat +++ b/Build/PackageBuild.bat @@ -10,36 +10,38 @@ set /p packSlim="Package Slim (no Pytorch) archive? (Y/N) " set /p packFull="Package Full (with Pytorch for Ampere and older) archive? (Y/N) " set /p packWebBase="Package web installer (base.7z) file? (Y/N) " -cd ..\Code\bin\x64\Release +cd /D ..\CodeLegacy\bin\packed rmdir /s/q FlowframesApp%ver% mkdir "FlowframesApp%ver%" mkdir "FlowframesApp%ver%/FlowframesData" mkdir "FlowframesApp%ver%/FlowframesData/pkgs" -rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E -xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I -xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I -xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I -xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I -xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I -xcopy "../../../../pkgs/flavr-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\flavr-cuda" /E /I -xcopy "../../../../pkgs/xvfi-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\xvfi-cuda" /E /I -xcopy "../../../../pkgs/rife-ncnn-vs" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn-vs" /E /I +rem xcopy "../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E +xcopy "../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I +xcopy "../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I +xcopy "../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I +xcopy "../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I +xcopy "../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I +xcopy "../../../pkgs/flavr-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\flavr-cuda" /E /I +xcopy "../../../pkgs/xvfi-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\xvfi-cuda" /E /I +xcopy "../../../pkgs/rife-ncnn-vs" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn-vs" /E /I echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" xcopy Flowframes.exe "FlowframesApp%ver%" +xcopy FlowframesCmd.exe "FlowframesApp%ver%" +xcopy Magick.Native-Q8-x64.dll "FlowframesApp%ver%" -cd ../../../../Build +cd /D ../../../Build -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs -del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini +rmdir /s/q ..\CodeLegacy\bin\packed\FlowframesApp%ver%\FlowframesData\logs +del ..\CodeLegacy\bin\packed\FlowframesApp%ver%\FlowframesData\config.ini IF /I "%packSlim%"=="Y" ( rem PACK SLIM - 7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" + 7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\CodeLegacy\bin\packed\FlowframesApp%ver%" ) echo 1 @@ -47,16 +49,16 @@ IF /I "%packWebBase%"=="Y" ( echo 2 rem PACK WEB BASE rem mkdir "WebInstaller/%ver%/base.7z" - 7za.exe a "WebInstaller/%ver%/base.7z" -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%\*" + 7za.exe a "WebInstaller/%ver%/base.7z" -m0=flzma2 -mx7 "..\CodeLegacy\bin\packed\FlowframesApp%ver%\*" ) IF /I "%packFull%"=="Y" ( - xcopy "../pkgs/py-amp" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I - 7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" - rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp + xcopy "../pkgs/py-amp" "..\CodeLegacy\bin\packed\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I + 7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\CodeLegacy\bin\packed\FlowframesApp%ver%" + rmdir /s/q ..\CodeLegacy\bin\packed\FlowframesApp%ver%\FlowframesData\pkgs\py-amp ) -rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% +rmdir /s/q ..\CodeLegacy\bin\packed\FlowframesApp%ver% rem pause \ No newline at end of file diff --git a/CodeLegacy/Main/InterpolateUtils.cs b/CodeLegacy/Main/InterpolateUtils.cs index 011d113..08fdfdb 100644 --- a/CodeLegacy/Main/InterpolateUtils.cs +++ b/CodeLegacy/Main/InterpolateUtils.cs @@ -141,7 +141,7 @@ namespace Flowframes.Main passes = false; } - if(passes && (s.dedupe && I.currentMediaFile.IsVfr)) + if(passes && s.dedupe && I.currentMediaFile.IsVfr) { UiUtils.ShowMessageBox($"Using de-duplication on VFR videos is currently not supported.\n\nGo to Quick Settings and either disable De-Duplication, or force VFR off."); passes = false;