fix: filebot
This commit is contained in:
parent
5191597f63
commit
b02acb5b60
7 changed files with 79 additions and 150 deletions
|
|
@ -2,7 +2,6 @@
|
|||
let
|
||||
cids = import ../staticids.nix;
|
||||
networkPrefix = config.networkPrefix;
|
||||
filebotScript = pkgs.callPackage ./filebot-process.nix {};
|
||||
|
||||
pyloadUser = {
|
||||
isSystemUser = true;
|
||||
|
|
@ -10,7 +9,7 @@ let
|
|||
group = "pyload";
|
||||
home = "/var/lib/pyload";
|
||||
createHome = true;
|
||||
extraGroups = [ "jellyfin" ]; # Access to multimedia directories
|
||||
extraGroups = [ "jellyfin" ]; # Access to multimedia directories
|
||||
};
|
||||
pyloadGroup = {
|
||||
gid = cids.gids.pyload;
|
||||
|
|
@ -46,17 +45,8 @@ in
|
|||
# PyLoad hook scripts directory
|
||||
"d /var/lib/pyload/config 0755 pyload pyload - -"
|
||||
"d /var/lib/pyload/config/scripts 0755 pyload pyload - -"
|
||||
"d /var/lib/pyload/config/scripts/package_extracted 0755 pyload pyload - -"
|
||||
"L+ /var/lib/pyload/config/scripts/package_extracted/filebot-process.sh - - - - ${filebotScript}/bin/filebot-process"
|
||||
];
|
||||
|
||||
# FileBot license secret
|
||||
sops.secrets.filebot-license = {
|
||||
mode = "0440";
|
||||
owner = "pyload";
|
||||
group = "pyload";
|
||||
};
|
||||
|
||||
containers.pyload = {
|
||||
autoStart = true;
|
||||
ephemeral = false;
|
||||
|
|
@ -106,10 +96,6 @@ in
|
|||
hostPath = "/var/lib/multimedia";
|
||||
isReadOnly = false;
|
||||
};
|
||||
"/var/lib/pyload/filebot-license.psm" = {
|
||||
hostPath = config.sops.secrets.filebot-license.path;
|
||||
isReadOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = { lib, config, pkgs, ... }: {
|
||||
|
|
@ -124,7 +110,6 @@ in
|
|||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"unrar"
|
||||
"filebot"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
{ pkgs }:
|
||||
|
||||
pkgs.writeShellScriptBin "filebot-process" ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# FileBot AMC script for automated media organization
|
||||
# Called by PyLoad's package_extracted hook with parameters:
|
||||
# $1 = package_id
|
||||
# $2 = package_name
|
||||
# $3 = download_folder (actual path to extracted files)
|
||||
# $4 = password (optional)
|
||||
|
||||
PACKAGE_ID="''${1:-}"
|
||||
PACKAGE_NAME="''${2:-unknown}"
|
||||
DOWNLOAD_DIR="''${3:-/downloads}"
|
||||
PASSWORD="''${4:-}"
|
||||
|
||||
OUTPUT_DIR="/multimedia"
|
||||
LOG_FILE="/var/lib/pyload/filebot-amc.log"
|
||||
EXCLUDE_LIST="/var/lib/pyload/filebot-exclude-list.txt"
|
||||
|
||||
# Ensure FileBot data directory exists
|
||||
mkdir -p /var/lib/pyload/.local/share/filebot/data
|
||||
mkdir -p "$(dirname "$LOG_FILE")"
|
||||
touch "$EXCLUDE_LIST"
|
||||
|
||||
# Install FileBot license if not already installed
|
||||
if [ ! -f /var/lib/pyload/.local/share/filebot/data/.license ]; then
|
||||
echo "$(date): Installing FileBot license..." >> "$LOG_FILE"
|
||||
${pkgs.filebot}/bin/filebot --license /var/lib/pyload/filebot-license.psm || true
|
||||
fi
|
||||
|
||||
echo "===========================================" >> "$LOG_FILE"
|
||||
echo "$(date): PyLoad package extracted hook triggered" >> "$LOG_FILE"
|
||||
echo "Package ID: $PACKAGE_ID" >> "$LOG_FILE"
|
||||
echo "Package Name: $PACKAGE_NAME" >> "$LOG_FILE"
|
||||
echo "Download Directory: $DOWNLOAD_DIR" >> "$LOG_FILE"
|
||||
echo "===========================================" >> "$LOG_FILE"
|
||||
|
||||
# Check if download directory exists and has media files
|
||||
if [ ! -d "$DOWNLOAD_DIR" ]; then
|
||||
echo "$(date): Download directory does not exist: $DOWNLOAD_DIR" >> "$LOG_FILE"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Check if there are any video/media files to process
|
||||
if ! find "$DOWNLOAD_DIR" -type f \( -iname "*.mkv" -o -iname "*.mp4" -o -iname "*.avi" -o -iname "*.m4v" -o -iname "*.mov" \) -print -quit | grep -q .; then
|
||||
echo "$(date): No media files found in: $DOWNLOAD_DIR" >> "$LOG_FILE"
|
||||
echo "$(date): Skipping FileBot processing" >> "$LOG_FILE"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "$(date): Starting FileBot processing" >> "$LOG_FILE"
|
||||
|
||||
# Run FileBot AMC script
|
||||
set +e # Temporarily disable exit on error to capture exit code
|
||||
${pkgs.filebot}/bin/filebot \
|
||||
-script fn:amc \
|
||||
--output "$OUTPUT_DIR" \
|
||||
--action move \
|
||||
--conflict auto \
|
||||
-non-strict \
|
||||
--log-file "$LOG_FILE" \
|
||||
--def \
|
||||
excludeList="$EXCLUDE_LIST" \
|
||||
movieFormat="$OUTPUT_DIR/movies/{n} ({y})/{n} ({y}) - {vf}" \
|
||||
seriesFormat="$OUTPUT_DIR/tv-shows/{n}/Season {s.pad(2)}/{n} - {s00e00} - {t}" \
|
||||
ut_dir="$DOWNLOAD_DIR" \
|
||||
ut_kind=multi \
|
||||
clean=y \
|
||||
skipExtract=y
|
||||
|
||||
FILEBOT_EXIT_CODE=$?
|
||||
set -e # Re-enable exit on error
|
||||
|
||||
if [ $FILEBOT_EXIT_CODE -ne 0 ]; then
|
||||
echo "$(date): FileBot processing failed with exit code $FILEBOT_EXIT_CODE" >> "$LOG_FILE"
|
||||
exit 0 # Don't fail the hook even if FileBot fails
|
||||
fi
|
||||
|
||||
echo "$(date): FileBot processing completed successfully" >> "$LOG_FILE"
|
||||
|
||||
# Clean up any remaining empty directories
|
||||
find "$DOWNLOAD_DIR" -type d -empty -delete 2>/dev/null || true
|
||||
|
||||
echo "$(date): All processing completed" >> "$LOG_FILE"
|
||||
exit 0
|
||||
''
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
unrar # Required for RAR archive extraction
|
||||
p7zip # Required for 7z and other archive formats
|
||||
unrar # Required for RAR archive extraction
|
||||
p7zip # Required for 7z and other archive formats
|
||||
];
|
||||
|
||||
services.pyload = {
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
systemd.services.pyload = {
|
||||
# Add extraction tools to service PATH
|
||||
path = with pkgs; [
|
||||
unrar # For RAR extraction
|
||||
p7zip # For 7z extraction
|
||||
unrar # For RAR extraction
|
||||
p7zip # For 7z extraction
|
||||
];
|
||||
|
||||
environment = {
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
# Enable ExternalScripts plugin for hooks
|
||||
PYLOAD__EXTERNALSCRIPTS__ENABLED = "1";
|
||||
PYLOAD__EXTERNALSCRIPTS__UNLOCK = "1"; # Run hooks asynchronously
|
||||
PYLOAD__EXTERNALSCRIPTS__UNLOCK = "1"; # Run hooks asynchronously
|
||||
};
|
||||
|
||||
# Bind-mount DNS configuration files into the chroot
|
||||
|
|
@ -50,20 +50,6 @@
|
|||
"/etc/ssl"
|
||||
"/etc/static/ssl"
|
||||
];
|
||||
# Bind mount multimedia directory as writable for FileBot hook scripts
|
||||
BindPaths = [ "/multimedia" ];
|
||||
|
||||
# Override SystemCallFilter to allow @resources syscalls
|
||||
# FileBot (Java) needs resource management syscalls like setpriority
|
||||
# during cleanup operations. Still block privileged syscalls for security.
|
||||
# Use mkForce to completely replace the NixOS module's default filter.
|
||||
SystemCallFilter = lib.mkForce [
|
||||
"@system-service"
|
||||
"@resources" # Explicitly allow resource management syscalls
|
||||
"~@privileged" # Still block privileged operations
|
||||
"fchown" # Re-allow fchown for FileBot file operations
|
||||
"fchown32" # 32-bit compatibility
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue