From dc948f298146306c5a817e52257ace87fece2b3d Mon Sep 17 00:00:00 2001
From: Ian Walton <ian@iwalton.com>
Date: Wed, 21 Apr 2021 17:22:10 -0400
Subject: [PATCH] Add HiDPI manifest and remove portable mode. (#211)

---
 .github/workflows/main.yml |  5 -----
 artifacts.sh               |  3 +--
 build-win-32.bat           |  2 ++
 build-win.bat              |  5 ++---
 hidpi.manifest             | 23 +++++++++++++++++++++++
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 hidpi.manifest

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e69b1a9..59af130 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,11 +42,6 @@ jobs:
       with:
         name: windows
         path: ${{ github.workspace }}/publish/Installer/*.exe
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: windows-portable
-        path: ${{ github.workspace }}/publish/Portable/*.exe
   build-win32:
     runs-on: windows-latest
     steps:
diff --git a/artifacts.sh b/artifacts.sh
index 44ab9d3..dea5166 100644
--- a/artifacts.sh
+++ b/artifacts.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-mkdir -p publish publish/Portable publish/Installer publish/InstallerLegacy publish/Debug
+mkdir -p publish publish/Installer publish/InstallerLegacy publish/Debug
 version=$(cat jellyfin_mpv_shim/constants.py | grep '^CLIENT_VERSION' | cut -d '"' -f 2)
 if [[ "$1" == "standard" ]]
 then
     cp dist/jellyfin-mpv-shim_version_installer.exe publish/Installer/jellyfin-mpv-shim_${version}_installer.exe || exit 1
-    cp dist/run.exe publish/Portable/jellyfin-mpv-shim_${version}_portable.exe || exit 1
     #mv dist/run publish/Debug/ || exit 1
 elif [[ "$1" == "legacy" ]]
 then
diff --git a/build-win-32.bat b/build-win-32.bat
index 08a557d..33e37e9 100644
--- a/build-win-32.bat
+++ b/build-win-32.bat
@@ -3,5 +3,7 @@ rd /s /q __pycache__ dist build
 set PATH=%PATH%;%CD%
 pyinstaller -w --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --hidden-import pystray._win32 --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --icon jellyfin.ico run.py
 if %errorlevel% neq 0 exit /b %errorlevel%
+del dist\run\run.exe.manifest
+copy hidpi.manifest dist\run\run.exe.manifest
 "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "Jellyfin MPV Shim.iss"
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/build-win.bat b/build-win.bat
index c330932..1956640 100644
--- a/build-win.bat
+++ b/build-win.bat
@@ -1,10 +1,9 @@
 @echo off
 rd /s /q __pycache__ dist build
 set PATH=%PATH%;%CD%
-pyinstaller -w --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --hidden-import pystray._win32 --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --icon jellyfin.ico run.py
-if %errorlevel% neq 0 exit /b %errorlevel%
-rd /s /q __pycache__ build
 pyinstaller -wF --add-binary "mpv-1.dll;." --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --hidden-import pystray._win32 --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --icon jellyfin.ico run.py
 if %errorlevel% neq 0 exit /b %errorlevel%
+del dist\run\run.exe.manifest
+copy hidpi.manifest dist\run\run.exe.manifest
 "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "Jellyfin MPV Shim.iss"
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/hidpi.manifest b/hidpi.manifest
new file mode 100644
index 0000000..f0543f2
--- /dev/null
+++ b/hidpi.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity language="*" name="Microsoft.Windows.Common-Controls" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" type="win32" version="6.0.0.0"/>
+      <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"/>
+    </dependentAssembly>
+  </dependency>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file