Merge pull request 'fix: update repository URLs from Dictionarry-Hub to BiluliB' (#22) from profilarr-script into dev

Reviewed-on: #22

ct/profilarr.sh

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+source <(curl -fsSL https://git.bila.li/Proxmox/proxmox-ve-install-scripts/raw/branch/dev/misc/build.func)
 # Copyright (c) 2021-2025 community-scripts ORG
 # Author: GitHub Copilot
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://github.com/Dictionarry-Hub/profilarr
 
 # App Default Values
-APP="Profilarr"
+APP="profilarr"
-var_tags="arr;automation"
+var_tags="${var_tags:-arr}"
-var_cpu="2"
+var_cpu="${var_cpu:-2}"
-var_ram="2048"
+var_ram="${var_ram:-2048}"
-var_disk="8"
+var_disk="${var_disk:-8}"
-var_os="debian"
+var_os="${var_os:-debian}"
-var_version="12"
+var_version="${var_version:-12}"
-var_unprivileged="1"
+var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
 variables
@@ -30,59 +30,102 @@ function update_script() {
         msg_error "No ${APP} Installation Found!"
         exit
     fi
-
+    setup_uv
     # Crawling the new version and checking whether an update is required
-    RELEASE=$(curl -fsSL https://api.github.com/repos/Dictionarry-Hub/profilarr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+    RELEASE=$(curl -fsSL https://api.github.com/repos/BiluliB/profilarr/releases/latest | grep "tag_name" | cut -d'"' -f4)
-    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
+    if [[ -z "$RELEASE" ]]; then
-        # Stopping Services
+        msg_error "Failed to fetch latest release version"
-        msg_info "Stopping $APP"
+        exit 1
-        systemctl stop profilarr
-        msg_ok "Stopped $APP"
-
-        # Creating Backup
-        msg_info "Creating Backup"
-        tar -czf "/opt/${APP}_backup_$(date +%F).tar.gz" /opt/${APP} /opt/${APP}_config
-        msg_ok "Backup Created"
-
-        # Execute Update
-        msg_info "Updating $APP to v${RELEASE}"
-        temp_file=$(mktemp)
-        curl -fsSL -o "$temp_file" "https://github.com/Dictionarry-Hub/profilarr/archive/refs/tags/v${RELEASE}.zip"
-        cd /tmp
-        unzip -q "$temp_file"
-        rm -rf /opt/${APP}/backend /opt/${APP}/frontend
-        mv "profilarr-${RELEASE}/backend" /opt/${APP}/
-        mv "profilarr-${RELEASE}/frontend" /opt/${APP}/
-
-        # Update Python dependencies
-        cd /opt/${APP}/backend
-        /opt/${APP}/venv/bin/pip install -r requirements.txt
-
-        # Build frontend
-        cd /opt/${APP}/frontend
-        npm install
-        npm run build
-        cp -r dist/* /opt/${APP}/backend/app/static/
-
-        msg_ok "Updated $APP to v${RELEASE}"
-
-        # Starting Services
-        msg_info "Starting $APP"
-        systemctl start profilarr
-        msg_ok "Started $APP"
-
-        # Cleaning up
-        msg_info "Cleaning Up"
-        rm -f "$temp_file"
-        rm -rf "/tmp/profilarr-${RELEASE}"
-        msg_ok "Cleanup Completed"
-
-        # Last Action
-        echo "${RELEASE}" >/opt/${APP}_version.txt
-        msg_ok "Update Successful"
-    else
-        msg_ok "No update required. ${APP} is already at v${RELEASE}"
     fi
+    if [[ -f /opt/${APP}_version.txt ]] && [[ "${RELEASE}" == "$(cat /opt/${APP}_version.txt)" ]]; then
+        msg_ok "No update required. ${APP} is already at ${RELEASE}"
+        exit
+    fi
+
+    # Stopping Services
+    msg_info "Stopping $APP"
+    systemctl stop ${APP}
+    msg_ok "Stopped $APP"
+
+    # Creating Backup
+    msg_info "Creating Backup"
+    if ls /opt/"${APP}"_backup_*.tar.gz &>/dev/null; then
+        rm -f /opt/"${APP}"_backup_*.tar.gz
+        msg_info "Removed previous backup"
+    fi
+    tar -czf "/opt/${APP}_backup_$(date +%F).tar.gz" /opt/${APP} /opt/${APP}_config
+    msg_ok "Backup Created"
+
+    # Execute Update
+    msg_info "Updating $APP to ${RELEASE}"
+    temp_file=$(mktemp)
+    curl -fsSL -o "$temp_file" "https://github.com/BiluliB/profilarr/archive/refs/tags/${RELEASE}.zip"
+    unzip -q -o "$temp_file" -d /tmp
+
+    # Find the actual extracted directory name
+    EXTRACTED_DIR=$(find /tmp -maxdepth 1 -name "profilarr-*" -type d | head -n1)
+    if [[ -z "$EXTRACTED_DIR" ]]; then
+        msg_error "Failed to find extracted directory"
+        exit 1
+    fi
+
+    rm -rf /opt/${APP}/backend /opt/${APP}/frontend
+    mv "${EXTRACTED_DIR}/backend" /opt/${APP}/
+    mv "${EXTRACTED_DIR}/frontend" /opt/${APP}/
+
+    # Update Python dependencies
+    msg_info "Updating Python dependencies"
+    cd /opt/${APP}/backend || exit
+
+    # Create a temporary requirements file excluding the incompatible PyYAML version
+    temp_req_file=$(mktemp)
+    grep -v "^PyYAML" requirements.txt >"$temp_req_file"
+
+    if [[ -f "/opt/${APP}/.requirements_checksum" ]]; then
+        CURRENT_CHECKSUM=$(md5sum "$temp_req_file" | awk '{print $1}')
+        STORED_CHECKSUM=$(cat /opt/${APP}/.requirements_checksum)
+        if [[ "$CURRENT_CHECKSUM" != "$STORED_CHECKSUM" ]]; then
+            msg_info "Requirements have changed. Performing full upgrade."
+            # Ensure compatible PyYAML is installed
+            $STD uv pip install --python /opt/${APP}/venv/bin/python "PyYAML>=6.0"
+            $STD uv pip install -r "$temp_req_file" --python /opt/${APP}/venv/bin/python
+        else
+            msg_info "Requirements unchanged. Verifying installation."
+            $STD uv pip install -r "$temp_req_file" --python /opt/${APP}/venv/bin/python
+        fi
+    else
+        # Ensure compatible PyYAML is installed
+        $STD uv pip install --python /opt/${APP}/venv/bin/python "PyYAML>=6.0"
+        $STD uv pip install -r "$temp_req_file" --python /opt/${APP}/venv/bin/python
+    fi
+    md5sum "$temp_req_file" | awk '{print $1}' >/opt/${APP}/.requirements_checksum
+    rm -f "$temp_req_file"
+    msg_ok "Updated Python dependencies"
+
+    # Build frontend
+    msg_info "Building Frontend"
+    cd /opt/${APP}/frontend || exit
+    npm install
+    npm run build
+    # Ensure the static directory exists before copying
+    mkdir -p /opt/${APP}/backend/app/static/
+    cp -r dist/* /opt/${APP}/backend/app/static/
+    msg_ok "Built Frontend"
+
+    # Starting Services
+    msg_info "Starting $APP"
+    systemctl start ${APP}
+    msg_ok "Started $APP"
+
+    # Cleaning up
+    msg_info "Cleaning Up"
+    rm -f "$temp_file"
+    rm -rf "$EXTRACTED_DIR"
+    msg_ok "Cleanup Completed"
+
+    # Last Action
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+    msg_ok "Updated $APP to v${RELEASE}"
     exit
 }
 

install/profilarr-install.sh

@@ -5,7 +5,6 @@
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://github.com/Dictionarry-Hub/profilarr
 
-# Import Functions and Setup
 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
 verb_ip6
@@ -18,47 +17,67 @@ APPLICATION="profilarr"
 
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-    curl \
-    wget \
-    git \
     unzip \
     build-essential \
-    python3 \
+    libyaml-dev \
-    python3-pip \
+    python3-dev \
-    python3-venv \
+    git
-    ca-certificates \
-    gnupg
 msg_ok "Installed Dependencies"
 
+msg_info "Installing Python"
+$STD apt-get install -y \
+    python3 \
+    python3-venv
+msg_ok "Installed Python"
+
+msg_info "Setup uv"
+setup_uv
+msg_ok "Setup uv"
+
 msg_info "Installing Node.js"
-$STD mkdir -p /etc/apt/keyrings
+NODE_VERSION="20" install_node_and_modules
-$STD curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-$STD echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-$STD apt-get update
-$STD apt-get install -y nodejs
 msg_ok "Installed Node.js"
 
 msg_info "Setup ${APPLICATION}"
-RELEASE=$(curl -fsSL https://api.github.com/repos/Dictionarry-Hub/profilarr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+RELEASE=$(curl -fsSL https://api.github.com/repos/BiluliB/profilarr/releases/latest  | grep "tag_name" | cut -d'"' -f4)
+if [[ -z "$RELEASE" ]]; then
+    msg_error "Failed to fetch latest release version"
+    exit 1
+fi
 temp_file=$(mktemp)
-$STD curl -fsSL -o "$temp_file" "https://github.com/Dictionarry-Hub/profilarr/archive/refs/tags/v${RELEASE}.zip"
+$STD curl -fsSL -o "$temp_file" "https://github.com/BiluliB/profilarr/archive/refs/tags/${RELEASE}.zip"
-cd /tmp
+$STD unzip -q "$temp_file" -d /tmp
-$STD unzip -q "$temp_file"
 $STD mkdir -p /opt/${APPLICATION}
 $STD mkdir -p /opt/${APPLICATION}_config
-$STD mv "profilarr-${RELEASE}/backend" /opt/${APPLICATION}/
-$STD mv "profilarr-${RELEASE}/frontend" /opt/${APPLICATION}/
-$STD chown -R root:root /opt/${APPLICATION}
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
-msg_ok "Setup ${APPLICATION}"
 
-msg_info "Setting up Python Virtual Environment"
+# Find the actual extracted directory name
-$STD python3 -m venv /opt/${APPLICATION}/venv
+EXTRACTED_DIR=$(find /tmp -maxdepth 1 -name "profilarr-*" -type d | head -n1)
-$STD /opt/${APPLICATION}/venv/bin/pip install --upgrade pip
+if [[ -z "$EXTRACTED_DIR" ]]; then
-cd /opt/${APPLICATION}/backend
+    msg_error "Failed to find extracted directory"
-$STD /opt/${APPLICATION}/venv/bin/pip install -r requirements.txt
+    exit 1
-$STD /opt/${APPLICATION}/venv/bin/pip install gunicorn
+fi
-msg_ok "Setup Python Environment"
+
+$STD mv "${EXTRACTED_DIR}/backend" /opt/${APPLICATION}/
+$STD mv "${EXTRACTED_DIR}/frontend" /opt/${APPLICATION}/
+echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+$STD uv venv /opt/${APPLICATION}/venv
+
+# Install compatible PyYAML first, then exclude it from requirements
+$STD uv pip install --python /opt/${APPLICATION}/venv/bin/python "PyYAML>=6.0"
+
+# Create modified requirements file
+temp_req_file=$(mktemp)
+grep -v "^PyYAML" /opt/${APPLICATION}/backend/requirements.txt >"$temp_req_file"
+echo "PyYAML>=6.0" >>"$temp_req_file"
+
+$STD uv pip install --python /opt/${APPLICATION}/venv/bin/python -r "$temp_req_file"
+$STD uv pip install --python /opt/${APPLICATION}/venv/bin/python gunicorn
+
+# Store the modified requirements checksum for future updates
+md5sum "$temp_req_file" | awk '{print $1}' >/opt/${APPLICATION}/.requirements_checksum
+
+rm -f "$temp_req_file"
+msg_ok "Setup ${APPLICATION}"
 
 msg_info "Building Frontend"
 cd /opt/${APPLICATION}/frontend
@@ -78,19 +97,135 @@ After=network.target
 Type=simple
 User=root
 WorkingDirectory=/opt/${APPLICATION}/backend
-Environment=PATH=/opt/${APPLICATION}/venv/bin
+Environment=PATH=/opt/${APPLICATION}/venv/bin:/usr/local/bin:/usr/bin:/bin
 Environment=CONFIG_PATH=/opt/${APPLICATION}_config
-ExecStart=/opt/${APPLICATION}/venv/bin/gunicorn --bind 0.0.0.0:6868 --workers 2 --timeout 120 app.main:create_app()
+Environment=PYTHONPATH=/opt/${APPLICATION}/backend
+Environment=GIT_PYTHON_REFRESH=quiet
+ExecStart=/opt/${APPLICATION}/venv/bin/python -m gunicorn --bind 0.0.0.0:6868 --workers 2 --timeout 120 --pythonpath /opt/${APPLICATION}/backend "app.main:create_app()"
 Restart=always
 RestartSec=10
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
 $STD systemctl daemon-reload
-$STD systemctl enable ${APPLICATION}.service
+
-$STD systemctl start ${APPLICATION}.service
+# Test the application manually first
+msg_info "Testing Application"
+cd /opt/${APPLICATION}/backend
+
+# Check if the main module exists and is importable
+if ! /opt/${APPLICATION}/venv/bin/python -c "
+import sys
+import os
+sys.path.insert(0, '/opt/${APPLICATION}/backend')
+os.environ['GIT_PYTHON_REFRESH'] = 'quiet'
+try:
+    import app.main
+    print('✓ app.main imported successfully')
+except ImportError as e:
+    print(f'✗ Import error: {e}')
+    sys.exit(1)
+except Exception as e:
+    print(f'✗ Other error: {e}')
+    sys.exit(1)
+"; then
+    msg_error "Application import test failed"
+
+    # Try alternative approaches
+    msg_info "Trying alternative startup methods"
+
+    # Check if there's a direct run.py or main.py
+    if [[ -f "/opt/${APPLICATION}/backend/run.py" ]]; then
+        cat <<EOF >/etc/systemd/system/${APPLICATION}.service
+[Unit]
+Description=Profilarr Profile Manager
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/${APPLICATION}/backend
+Environment=PATH=/opt/${APPLICATION}/venv/bin:/usr/local/bin:/usr/bin:/bin
+Environment=CONFIG_PATH=/opt/${APPLICATION}_config
+Environment=GIT_PYTHON_REFRESH=quiet
+ExecStart=/opt/${APPLICATION}/venv/bin/python run.py
+Restart=always
+RestartSec=10
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    elif [[ -f "/opt/${APPLICATION}/backend/main.py" ]]; then
+        cat <<EOF >/etc/systemd/system/${APPLICATION}.service
+[Unit]
+Description=Profilarr Profile Manager
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/${APPLICATION}/backend
+Environment=PATH=/opt/${APPLICATION}/venv/bin:/usr/local/bin:/usr/bin:/bin
+Environment=CONFIG_PATH=/opt/${APPLICATION}_config
+Environment=GIT_PYTHON_REFRESH=quiet
+ExecStart=/opt/${APPLICATION}/venv/bin/python main.py
+Restart=always
+RestartSec=10
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    else
+        # Fallback to Flask development server
+        cat <<EOF >/etc/systemd/system/${APPLICATION}.service
+[Unit]
+Description=Profilarr Profile Manager
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/${APPLICATION}/backend
+Environment=PATH=/opt/${APPLICATION}/venv/bin:/usr/local/bin:/usr/bin:/bin
+Environment=CONFIG_PATH=/opt/${APPLICATION}_config
+Environment=GIT_PYTHON_REFRESH=quiet
+Environment=FLASK_APP=app.main:create_app
+Environment=FLASK_RUN_HOST=0.0.0.0
+Environment=FLASK_RUN_PORT=6868
+ExecStart=/opt/${APPLICATION}/venv/bin/python -m flask run
+Restart=always
+RestartSec=10
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    fi
+
+    $STD systemctl daemon-reload
+fi
+
+systemctl enable ${APPLICATION}
+systemctl start ${APPLICATION}
+
+# Wait and check status
+sleep 5
+if systemctl is-active --quiet ${APPLICATION}; then
+    msg_ok "Service started successfully"
+else
+    msg_error "Service failed to start. Checking logs..."
+    journalctl -u ${APPLICATION} --no-pager -n 20
+    exit 1
+fi
 msg_ok "Created Service"
 
 motd_ssh
@@ -98,7 +233,7 @@ customize
 
 msg_info "Cleaning up"
 rm -f "$temp_file"
-rm -rf "/tmp/profilarr-${RELEASE}"
+rm -rf "$EXTRACTED_DIR"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"