Merge branch 'master' into supahfox-patch-1

Author: iwalton3

Diff for: .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: |

Diff for: 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.

Diff for: README.md

@@ -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

Diff for: build-win-32.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

Diff for: build-win-dbg.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

Diff for: build-win.bat

@@ -24,6 +24,7 @@ def win32(app: str):
 
 confdirs = (
     ("linux", posix),
+    ("openbsd", posix),
     ("win32", win32),
     ("cygwin", posix),
     (

Diff for: get_pywebview_natives.py

@@ -24,7 +24,7 @@ def _show_file_darwin(path: str):
     subprocess.Popen(["open", path])
 
 
-def _show_file_linux(path: str):
+def _show_file_xdg(path: str):
     subprocess.Popen(["xdg-open", path])
 
 
@@ -33,14 +33,18 @@ def _show_file_win32(path: str):
 
 
 _show_file_func = {
-    "darwin": _show_file_darwin,
-    "linux": _show_file_linux,
-    "win32": _show_file_win32,
-    "cygwin": _show_file_win32,
+    "darwin":  _show_file_darwin,
+    "linux":   _show_file_xdg,
+    "openbsd": _show_file_xdg,
+    "win32":   _show_file_win32,
+    "cygwin":  _show_file_win32,
 }
 
 try:
-    show_file = _show_file_func[sys.platform]
+    show_file = None
+    for platform, func in _show_file_func.items():
+        if sys.platform.startswith(platform):
+            show_file = func
 
     def open_config():
         show_file(confdir(APP_NAME))
@@ -466,7 +470,10 @@ def setup(icon: Icon):
             icon.visible = True
             self.r_queue.put(("ready", None))
 
-        icon.run(setup=setup)
+        try:
+            icon.run(setup=setup)
+        except Exception:
+            pass
         self.r_queue.put(("die", None))
 
 

Diff for: jellyfin_mpv_shim/conffile.py

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2024-06-05 13:53-0400\n"
-"PO-Revision-Date: 2025-01-09 14:01+0000\n"
+"PO-Revision-Date: 2025-03-03 16:54+0000\n"
 "Last-Translator: M Alb <[email protected]>\n"
 "Language-Team: Danish <https://translate.jellyfin.org/projects/jellyfin/"
 "jellyfin-desktop/da/>\n"
@@ -204,7 +204,7 @@ msgstr "Stor"
 
 #: jellyfin_mpv_shim/menu.py:44
 msgid "Huge"
-msgstr "Meget stor"
+msgstr "Kæmpe"
 
 #: jellyfin_mpv_shim/menu.py:130
 msgid "Main Menu"
@@ -272,7 +272,7 @@ msgstr "Vælg lyd spor"
 
 #: jellyfin_mpv_shim/menu.py:298
 msgid "Select Subtitle Track"
-msgstr "Skift undertekst spor"
+msgstr "Vælg undertekst spor"
 
 #: jellyfin_mpv_shim/menu.py:306
 msgid "None"
@@ -312,15 +312,15 @@ msgstr "Skift standard omkodningsprofil"
 
 #: jellyfin_mpv_shim/menu.py:456
 msgid "Select Subtitle Color"
-msgstr "Skift farve på undertekster"
+msgstr "Vælg farve på undertekster"
 
 #: jellyfin_mpv_shim/menu.py:465
 msgid "Select Subtitle Size"
-msgstr "Skift størrelse på undertekster"
+msgstr "Vælg størrelse på undertekster"
 
 #: jellyfin_mpv_shim/menu.py:475
 msgid "Select Subtitle Position"
-msgstr "Skift placering for undertekster"
+msgstr "Vælg placering for undertekster"
 
 #: jellyfin_mpv_shim/menu.py:477
 msgid "Bottom"

Diff for: jellyfin_mpv_shim/gui_mgr.py

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2024-06-05 13:53-0400\n"
-"PO-Revision-Date: 2024-10-28 11:41+0000\n"
-"Last-Translator: Spiros Vita <[email protected]>\n"
+"PO-Revision-Date: 2025-03-17 10:01+0000\n"
+"Last-Translator: Thunderstrike116 <[email protected]>\n"
 "Language-Team: Greek <https://translate.jellyfin.org/projects/jellyfin/"
 "jellyfin-desktop/el/>\n"
 "Language: el\n"
@@ -420,7 +420,7 @@ msgstr "Πάντα να παραλείπονται οι τίτλοι τέλου
 
 #: jellyfin_mpv_shim/menu.py:559
 msgid "Ask to Skip Credits"
-msgstr "Παράλειψη τίτλων τέλους κατόπιν ερώτησης"
+msgstr "Ερώτηση για παράλειψη τίτλων τέλους"
 
 #: jellyfin_mpv_shim/menu.py:561
 msgid "Enable thumbnail previews"

Diff for: jellyfin_mpv_shim/messages/da/LC_MESSAGES/base.po

@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2024-06-05 13:53-0400\n"
-"PO-Revision-Date: 2022-07-04 21:06+0000\n"
-"Last-Translator: WWWesten <wwwesten@gmail.com>\n"
+"PO-Revision-Date: 2025-03-17 10:01+0000\n"
+"Last-Translator: Joesph boukolos <joseph+weblate@boukolos.com>\n"
 "Language-Team: Esperanto <https://translate.jellyfin.org/projects/jellyfin/"
 "jellyfin-desktop/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: pygettext.py 1.5\n"
 
 #: jellyfin_mpv_shim/bulk_subtitle.py:29
@@ -355,10 +355,8 @@ msgid "Transcode Hi10p to 8bit"
 msgstr "Transkodigo Hi10p al 8bit"
 
 #: jellyfin_mpv_shim/menu.py:506
-#, fuzzy
-#| msgid "Transcode to H265"
 msgid "Transcode HDR"
-msgstr "Transkodo al H.265"
+msgstr "Transkodi al H.265"
 
 #: jellyfin_mpv_shim/menu.py:507
 msgid "Direct Paths"

Diff for: jellyfin_mpv_shim/messages/el/LC_MESSAGES/base.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2024-06-05 13:53-0400\n"
-"PO-Revision-Date: 2025-01-09 14:01+0000\n"
-"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
+"PO-Revision-Date: 2025-02-18 23:28+0000\n"
+"Last-Translator: Brian Bentancour <bbab40@gmail.com>\n"
 "Language-Team: Spanish (Argentina) <https://translate.jellyfin.org/projects/"
 "jellyfin/jellyfin-desktop/es_AR/>\n"
 "Language: es_AR\n"
@@ -128,7 +128,7 @@ msgstr "Cerrar"
 
 #: jellyfin_mpv_shim/gui_mgr.py:454
 msgid "Configure Servers"
-msgstr "Configurar Servidores"
+msgstr "Configurar servidores"
 
 #: jellyfin_mpv_shim/gui_mgr.py:455
 msgid "Show Console"
@@ -224,7 +224,7 @@ msgstr "Cambiar la calidad del video"
 
 #: jellyfin_mpv_shim/menu.py:139 jellyfin_mpv_shim/syncplay.py:634
 msgid "SyncPlay"
-msgstr "SyncPlay"
+msgstr "Reproducción sincronizada"
 
 #: jellyfin_mpv_shim/menu.py:145
 msgid "MPV Shim v{0} Release Info/Download"
@@ -307,22 +307,18 @@ msgid "Manual by Track Index (Less Reliable)"
 msgstr "Manual por índice de pista (Menos confiable)"
 
 #: jellyfin_mpv_shim/menu.py:421
-#, fuzzy
 msgid "Select Default Transcode Profile"
 msgstr "Seleccioná el perfil de transcodificación predeterminado"
 
 #: jellyfin_mpv_shim/menu.py:456
-#, fuzzy
 msgid "Select Subtitle Color"
 msgstr "Seleccionar el color de los subtítulos"
 
 #: jellyfin_mpv_shim/menu.py:465
-#, fuzzy
 msgid "Select Subtitle Size"
 msgstr "Seleccionar el tamaño de los subtítulos"
 
 #: jellyfin_mpv_shim/menu.py:475
-#, fuzzy
 msgid "Select Subtitle Position"
 msgstr "Seleccionar la posición de los subtítulos"