diff --git a/ct/scraparr.sh b/ct/scraparr.sh index 5fc2199c..14f5d6eb 100644 --- a/ct/scraparr.sh +++ b/ct/scraparr.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/JasonGreenC/ProxmoxVED/refs/heads/scraparr-uv-migration/misc/build.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) # Copyright (c) 2021-2025 community-scripts ORG # Author: JasonGreenC # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE @@ -23,46 +23,33 @@ function update_script() { header_info check_container_storage check_container_resources + if [[ ! -d /opt/scraparr/ ]]; then msg_error "No ${APP} Installation Found!" exit fi - msg_info "Stopping Services" - systemctl stop scraparr - msg_ok "Services Stopped" - - export SCRAPARR_VENV_PATH="/opt/scraparr/.venv" - export SCRAPARR_EXPORTER_BIN="${SCRAPARR_VENV_PATH}/bin/scraparr" - - if [[ ! -d "$PVE_VENV_PATH" || ! -x "$PVE_EXPORTER_BIN" ]]; then - PYTHON_VERSION="3.12" setup_uv - msg_info "Migrating to uv/venv" - rm -rf "$PVE_VENV_PATH" - mkdir -p /opt/scraparr - cd /opt/scraparr - $STD uv venv "$PVE_VENV_PATH" - $STD "$PVE_VENV_PATH/bin/python" -m ensurepip --upgrade - $STD "$PVE_VENV_PATH/bin/python" -m pip install --upgrade pip - $STD "$PVE_VENV_PATH/bin/python" -m pip install prometheus-pve-exporter - msg_ok "Migrated to uv/venv" - else - msg_info "Updating Prometheus Proxmox VE Exporter" - PYTHON_VERSION="3.12" setup_uv - $STD "$PVE_VENV_PATH/bin/python" -m pip install --upgrade prometheus-pve-exporter - msg_ok "Updated Prometheus Proxmox VE Exporter" - fi RELEASE=$(curl -fsSL https://api.github.com/repos/thecfu/scraparr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + if [[ ! -f "${HOME}/.scrappar" ]] || [[ "${RELEASE}" != "$(cat "${HOME}"/.scrappar)" ]]; then + msg_info "Stopping Services" + systemctl stop scraparr + msg_ok "Services Stopped" - msg_info "Updating ${APP} to v${RELEASE}" - fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" - pip -q install -r /opt/scrappar/src/scrappar/requirements.txt --root-user-action=ignore - msg_ok "Updated ${APP}" + PYTHON_VERSION="3.12" setup_uv + fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" "tarball" "latest" "/opt/scraparr" - msg_info "Starting Service" + msg_info "Updating ${APP} to ${RELEASE}" + cd /opt/scraparr || exit + $STD uv venv /opt/scraparr/.venv + $STD /opt/scraparr/.venv/bin/python -m ensurepip --upgrade + $STD /opt/scraparr/.venv/bin/python -m pip install --upgrade pip + $STD /opt/scraparr/.venv/bin/python -m pip install -r /opt/scraparr/src/scraparr/requirements.txt + chmod -R 755 /opt/scraparr + msg_ok "Updated ${APP} to v${RELEASE}" + + msg_info "Starting Services" systemctl start scraparr - msg_ok "Started Service" + msg_ok "Services Started" else msg_ok "No update required. ${APP} is already at v${RELEASE}" fi diff --git a/frontend/public/json/scraparr.json b/frontend/public/json/scraparr.json index 690e1919..731618e3 100644 --- a/frontend/public/json/scraparr.json +++ b/frontend/public/json/scraparr.json @@ -11,7 +11,7 @@ "interface_port": 7100, "documentation": "https://github.com/thecfu/scraparr/blob/main/README.md", "website": "https://github.com/thecfu/scraparr", - "logo": "https://github.com/thecfu/scraparr/raw/main/.github/assets/logos/scraparr_logo.svg", + "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/scraparr-dark.svg", "config_path": "/scraparr/config/config.yaml", "description": "Scraparr is a Prometheus exporter for the *arr suite (Sonarr, Radarr, Lidarr, etc.). It provides metrics that can be scraped by Prometheus to monitor and visualize the health and performance of your *arr applications.", "install_methods": [ diff --git a/install/scraparr-install.sh b/install/scraparr-install.sh index 65eb49ae..4eafe0a6 100644 --- a/install/scraparr-install.sh +++ b/install/scraparr-install.sh @@ -13,11 +13,10 @@ setting_up_container network_check update_os -PYTHON_VERSION="3.12" setup_uv - msg_info "Installing Scraparr" -fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" -cd /opt/scraparr +PYTHON_VERSION="3.12" setup_uv +fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" "tarball" "latest" "/opt/scraparr" +cd /opt/scraparr || exit $STD uv venv /opt/scraparr/.venv $STD /opt/scraparr/.venv/bin/python -m ensurepip --upgrade $STD /opt/scraparr/.venv/bin/python -m pip install --upgrade pip @@ -34,14 +33,15 @@ cat </etc/systemd/system/scraparr.service Description=Scraparr Wants=network-online.target After=network.target + [Service] Type=simple -ExecStart=/opt/scraparr/.venv/bin/python -m /opt/scraparr/src/scraparr/scraparr -User=root +WorkingDirectory=/opt/scraparr/src +ExecStart=/opt/scraparr/.venv/bin/python -m scraparr.scraparr Restart=always + [Install] WantedBy=multi-user.target - EOF systemctl daemon-reload systemctl enable -q --now scraparr