diff options
| author | JPVenson <github@jpb.email> | 2024-11-13 10:34:09 +0000 |
|---|---|---|
| committer | JPVenson <github@jpb.email> | 2024-11-13 10:34:09 +0000 |
| commit | 4747edd635d639027e08fcaa8116e221692268dc (patch) | |
| tree | 3b56b1f3b1a480fe5ef30a3de7ff0fe5ec37f067 | |
| parent | 11388c0144d103357fd942e10ad3a91524b29d69 (diff) | |
| parent | cafc74c64cc901e8de10bb74ec4396a1ec3724ca (diff) | |
Merge branch 'feature/EFUserData' of https://github.com/JPVenson/jellyfin into feature/EFUserData
| -rw-r--r-- | .devcontainer/devcontainer.json | 5 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .vscode/launch.json | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 063901c80..df097a3d1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -24,5 +24,8 @@ "hostRequirements": { "memory": "8gb", "cpus": 4 - } + }, + "mounts": [ + "source=/opt/docker/data/jellyfin/config10.9.11/metadata/,target=/workspaces/jellyfin/TestData/metadata,type=bind,consistency=cached" + ] } diff --git a/.gitignore b/.gitignore index d5a0367bf..c636f797b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,8 @@ local.properties .settings/ .loadpath +TestData + # External tool builders .externalToolBuilders/ diff --git a/.vscode/launch.json b/.vscode/launch.json index 7e50d4f0a..72ee2f418 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -35,7 +35,7 @@ "request": "launch", "preLaunchTask": "build", "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll", - "args": ["--nowebclient", "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"], + "args": ["--nowebclient", "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg", "--datadir", "/workspaces/jellyfin/TestData"], "cwd": "${workspaceFolder}/Jellyfin.Server", "console": "internalConsole", "stopAtEntry": false, |