Switch to platformdirs

.rtfd-requirements.txt

@@ -26,7 +26,6 @@ pydantic==2.9.2 ; python_version >= "3.12" and python_version < "4"
 pygls==1.3.1 ; python_version >= "3.12" and python_version < "4"
 pygments==2.18.0 ; python_version >= "3.12" and python_version < "4"
 pyspellchecker==0.8.1 ; python_version >= "3.12" and python_version < "4"
-pyxdg==0.28 ; python_version >= "3.12" and python_version < "4"
 requests==2.32.3 ; python_version >= "3.12" and python_version < "4"
 restructuredtext-lint==1.4.0 ; python_version >= "3.12" and python_version < "4"
 snowballstemmer==2.2.0 ; python_version >= "3.12" and python_version < "4"

.vscode/dictionary.txt

@@ -91,6 +91,7 @@ paren
 parseable
 pipx
 plabel
+platformdirs
 popen
 postprocessors
 prss
@@ -103,7 +104,6 @@ pylint
 pyright
 pytest
 pythonwarnings
-pyxdg
 ratelimit
 ratelimit
 rcfile

open_in_mpv/constants.py

@@ -3,7 +3,7 @@
 import os
 import platform
 
-import xdg.BaseDirectory
+from platformdirs import user_config_dir
 
 __all__ = ('HOST_DATA', 'HOST_DATA_FIREFOX', 'IS_LINUX', 'IS_MAC', 'IS_WIN', 'JSON_FILENAME',
            'MAC_HOSTS_DIRS', 'SYSTEM_HOSTS_DIRS', 'USER_CHROME_HOSTS_REG_PATH_WIN',
@@ -16,27 +16,27 @@
 JSON_FILENAME: Final[str] = 'sh.tat.open_in_mpv.json'
 HOME: Final[str] = os.environ.get('HOME', '')
 
-USER_CHROME_HOSTS_REG_PATH_WIN: Final[str] = 'HKCU:\\Software\\Google\\Chrome\\NativeMessagingHosts'
+USER_CHROME_HOSTS_REG_PATH_WIN: Final[str] = r'HKCU:\Software\Google\Chrome\NativeMessagingHosts'
 
 MAC_HOSTS_DIRS: Final[tuple[str, ...]] = (
     f'{HOME}/Library/Application Support/Chromium/NativeMessagingHosts',
     f'{HOME}/Library/Application Support/Google/Chrome Beta/NativeMessagingHosts',
     f'{HOME}/Library/Application Support/Google/Chrome Canary/NativeMessagingHosts',
     f'{HOME}/Library/Application Support/Google/Chrome/NativeMessagingHosts',
-    f'{HOME}/Library/Application Support/Mozilla/NativeMessagingHosts/')
+    f'{HOME}/Library/Application Support/Mozilla/NativeMessagingHosts')
 
 MACPORTS_BIN_PATH: Final[str] = '/opt/local/bin'
 
 SYSTEM_HOSTS_DIRS: Final[tuple[str, str, str]] = ('/etc/chromium/native-messaging-hosts',
                                                   '/etc/opt/chrome/native-messaging-hosts',
                                                   '/etc/opt/edge/native-messaging-hosts')
 USER_HOSTS_DIRS: Final[tuple[str, ...]] = (
-    f'{xdg.BaseDirectory.xdg_config_home}/BraveSoftware/Brave-Browser/NativeMessagingHosts',
-    f'{xdg.BaseDirectory.xdg_config_home}/chromium/NativeMessagingHosts',
-    f'{xdg.BaseDirectory.xdg_config_home}/google-chrome-beta/NativeMessagingHosts',
-    f'{xdg.BaseDirectory.xdg_config_home}/google-chrome-canary/NativeMessagingHosts',
-    f'{xdg.BaseDirectory.xdg_config_home}/google-chrome/NativeMessagingHosts',
-    f'{xdg.BaseDirectory.xdg_config_home}/.mozilla/native-messaging-hosts/')
+    f'{user_config_dir()}/BraveSoftware/Brave-Browser/NativeMessagingHosts',
+    f'{user_config_dir()}/chromium/NativeMessagingHosts',
+    f'{user_config_dir()}/google-chrome-beta/NativeMessagingHosts',
+    f'{user_config_dir()}/google-chrome-canary/NativeMessagingHosts',
+    f'{user_config_dir()}/google-chrome/NativeMessagingHosts',
+    f'{user_config_dir()}/.mozilla/native-messaging-hosts')
 
 COMMON_HOST_DATA: Final[dict[str, str | None]] = {
     'description': 'Opens a URL in mpv (for use with extension).',

open_in_mpv/open_in_mpv.py

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: MIT
 from collections.abc import Callable, Mapping
-from functools import lru_cache
-from os.path import expandvars
 from pathlib import Path
 from typing import Any, BinaryIO, Final, TextIO, cast, override
 import json
@@ -11,47 +9,17 @@
 import struct
 import subprocess as sp
 import sys
-import tempfile
 
+from platformdirs import user_log_path, user_runtime_path
 import click
-import xdg.BaseDirectory
 
-from .constants import IS_MAC, IS_WIN, MACPORTS_BIN_PATH
+from .constants import MACPORTS_BIN_PATH
 
 FALLBACKS: Final[dict[str, Any]] = {'log': None, 'socket': None}
-logger = logging.getLogger(__name__)
-
-
-@lru_cache
-def get_log_path() -> Path:
-    if IS_MAC:
-        return Path('~/Library/Logs').expanduser()
-    if IS_WIN:
-        return Path(expandvars(r'%LOCALDATA%\open-in-mpv'))
-    try:
-        return Path(xdg.BaseDirectory.save_state_path('open-in-mpv'))
-    except KeyError:
-        FALLBACKS['log'] = tempfile.TemporaryDirectory(prefix='open-in-mpv')
-        return Path(FALLBACKS['log'].name)
-
-
-@lru_cache
-def get_socket_path() -> Path:
-    if IS_MAC:
-        return Path('~/Library/Caches/open-in-mpv.sock').expanduser()
-    if IS_WIN:
-        return Path(expandvars(r'\\.\pipe\open-in-mpv'))
-    try:
-        return Path(xdg.BaseDirectory.get_runtime_dir()) / 'open-in-mpv.sock'
-    except KeyError:
-        with tempfile.NamedTemporaryFile(prefix='open-in-mpv', suffix='.sock', delete=False) as tf:
-            FALLBACKS['socket'] = tf
-            return Path(FALLBACKS['socket'].name)
-
-
-LOG_PATH = get_log_path()
-MPV_SOCKET = get_socket_path()
+LOG_PATH = user_log_path('open-in-mpv')
+MPV_SOCKET = user_runtime_path('open-in-mpv') / 'open-in-mpv.sock'
 VERSION = 'v0.1.7'
+logger = logging.getLogger(__name__)
 
 
 def environment(data_resp: dict[str, Any], *, debugging: bool) -> dict[str, Any]:

pyproject.toml

@@ -21,8 +21,8 @@ version = "0.1.0"
 [tool.poetry.dependencies]
 python = ">=3.12,<4"
 click = ">=8.0,<8.1.8"
+platformdirs = "^4.3.6"
 psutil = ">=5.9.5,<7.0.0"
-pyxdg = "^0.28"
 
 [tool.poetry.group.dev]
 optional = true