Use latest package versions

.github/workflows/main.yml

@@ -4,28 +4,35 @@ on:
   push:
     branches:
       - master
+      - main
 jobs:
   build-win64:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Setup Python 3.9
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+    - name: Setup Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
-    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+        python-version: 3.13
+    - name: Setup git SDK
+      uses: git-for-windows/setup-git-for-windows-sdk@v1
       with:
         flavor: minimal
+    - name: Download mpv
+      id: mpv
+      uses: nguyenngoclongdev/[email protected]
+      with:
+        repository: 'shinchiro/mpv-winbuild-cmake'
+        latest: true
+        fileName: 'mpv-dev-x86_64-v3*.7z'
     - name: Install dependencies
       run: |
-        curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-x86_64-20240513-git-61f72bd.7z > mpv.7z
-        7z x mpv.7z
+        7z x "${{ fromJson(steps.mpv.outputs.downloaded_files)[0] }}"
         mv libmpv-2.dll mpv-2.dll
         pip install wheel
-        pip install git+https://github.com/pythonnet/pythonnet@438bcdd3f0b2e2ee358b407cfc96e4385e5783fc
-        pip install .[all] pywebview==3.4 pywin32==304
+        pip install .[all] pythonnet pywebview pywin32
         ./gen_pkg.sh --skip-build
-        python ./get_pywebview_natives.py
       shell: bash
     - name: PyInstaller Bootloader
       run: |
@@ -47,24 +54,30 @@ jobs:
   build-win32:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Setup Python 3.9
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+    - name: Setup Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
-    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+        python-version: 3.13
+    - name: Setup git SDK
+      uses: git-for-windows/setup-git-for-windows-sdk@v1
       with:
         flavor: minimal
+    - name: Download mpv
+      id: mpv
+      uses: nguyenngoclongdev/[email protected]
+      with:
+        repository: 'shinchiro/mpv-winbuild-cmake'
+        latest: true
+        fileName: 'mpv-dev-i686*.7z'
     - name: Install dependencies
       run: |
-        curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-i686-20240513-git-61f72bd.7z > mpv.7z
-        7z x mpv.7z
+        7z x "${{ fromJson(steps.mpv.outputs.downloaded_files)[0] }}"
         mv libmpv-2.dll mpv-2.dll
         pip install wheel
-        pip install git+https://github.com/pythonnet/pythonnet@438bcdd3f0b2e2ee358b407cfc96e4385e5783fc
-        pip install .[all] pywebview==3.4 pywin32==304
+        pip install .[all] pythonnet pywebview pywin32
         ./gen_pkg.sh --skip-build
-        python ./get_pywebview_natives.py
       shell: bash
     - name: PyInstaller Bootloader
       run: |

CONTRIBUTING.md

@@ -34,7 +34,7 @@ starting development on a feature. If you PR a feature with required dependencie
 optional ones.
 
 Current Dependencies:
- - `python-mpv` - Provides `libmpv1` playback backend.
+ - `python-mpv` - Provides `libmpv` playback backend.
  - `python-mpv-jsonipc` - Provides `mpv` playback backend. (First-Party)
  - `jellyfin-apiclient-python` - Provides API client to Jellyfin. (First-Party)
  - `pywin32` - Allows window management on Windows. (Optional)
@@ -68,7 +68,7 @@ Current Dependencies:
  - `rich_presence.py` - Module which implements Discord Rich Presence integration.
  - `svp_integration.py` - Implements SVP API and menu functionality for controlling SVP.
  - `syncplay.py` - Implements the SyncPlay time syncing events and algorithms.
-     - Note that time syncing with the server is [part of the api client](https://github.com/iwalton3/jellyfin-apiclient-python/blob/master/jellyfin_apiclient_python/timesync_manager.py). 
+     - Note that time syncing with the server is [part of the api client](https://github.com/jellyfin/jellyfin-apiclient-python/blob/master/jellyfin_apiclient_python/timesync_manager.py). 
  - `timeline.py` - Thread to trigger playback events to the Jellyfin server.
      - Note: `player.py` is where the actual response is created.
  - `update_check.py` - Implements update checking, notifications, and the menu option to open the release page.

build-win-32.bat

@@ -1,7 +1,7 @@
 @echo off
 rd /s /q __pycache__ dist build
 set PATH=%PATH%;%CD%
-pyinstaller -w --add-binary "mpv-2.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\trickplay-osc.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\thumbfast.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
+pyinstaller -w --add-binary "mpv-2.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\trickplay-osc.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\thumbfast.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" --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

build-win-dbg.bat

@@ -2,4 +2,4 @@
 rd /s /q __pycache__ build 
 rd /s /q dist\run
 set PATH=%PATH%;%CD%
-pyinstaller -c --add-binary "mpv-2.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\systray.png;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
+pyinstaller -c --add-binary "mpv-2.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\systray.png;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" --icon jellyfin.ico run.py

build-win.bat

@@ -1,7 +1,7 @@
 @echo off
 rd /s /q __pycache__ dist build
 set PATH=%PATH%;%CD%
-pyinstaller -w --add-binary "mpv-2.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\trickplay-osc.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\thumbfast.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
+pyinstaller -w --add-binary "mpv-2.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\trickplay-osc.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\thumbfast.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" --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

jellyfin_mpv_shim/player.py

@@ -41,9 +41,9 @@
         # noinspection PyPackageRequirements
         import mpv
 
-        log.info("Using libmpv1 playback backend.")
+        log.info("Using libmpv playback backend.")
     except OSError:
-        log.warning("Could not find libmpv1.")
+        log.warning("Could not find libmpv.")
         python_mpv_available = False
 
 if settings.mpv_ext or not python_mpv_available:

run.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Newer revisions of python-mpv require mpv-1.dll in the PATH.
+# Newer revisions of python-mpv require mpv-2.dll in the PATH.
 import os
 import sys
 import multiprocessing

setup.py

@@ -13,7 +13,7 @@
 }
 
 if sys.platform.startswith("win32"):
-    win_extra = ["pywin32", "clr-loader==0.1.7", "pythonnet==3.0.0a2"]
+    win_extra = ["pywin32", "clr-loader", "pythonnet"]
     extras["all"] += win_extra
     extras["mirror"] += win_extra
 
@@ -60,9 +60,9 @@
         "Operating System :: OS Independent",
     ],
     extras_require=extras,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=[
-        "python-mpv",
+        "mpv @ git+https://github.com/jaseg/python-mpv.git@main",
         "jellyfin-apiclient-python>=1.9.2",
         "python-mpv-jsonipc>=1.2.0",
         "requests",