From 3958172e813135529a8089ef55a045faa28835e2 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 23 Jun 2025 16:47:32 +0200 Subject: [PATCH] fixes --- ct/metube.sh | 88 ++++++++++++++++++++++++++++++++------- install/metube-install.sh | 2 +- 2 files changed, 73 insertions(+), 17 deletions(-) diff --git a/ct/metube.sh b/ct/metube.sh index 85c2c48cb..db4fd47a4 100644 --- a/ct/metube.sh +++ b/ct/metube.sh @@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV APP="MeTube" var_tags="${var_tags:-media;youtube}" var_cpu="${var_cpu:-1}" -var_ram="${var_ram:-1024}" +var_ram="${var_ram:-2048}" var_disk="${var_disk:-10}" var_os="${var_os:-debian}" var_version="${var_version:-12}" @@ -23,40 +23,96 @@ function update_script() { header_info check_container_storage check_container_resources + if [[ ! -d /opt/metube ]]; then msg_error "No ${APP} Installation Found!" exit fi + msg_info "Stopping ${APP} Service" systemctl stop metube msg_ok "Stopped ${APP} Service" - msg_info "Updating ${APP} to latest Git" - cd /opt - if [ -d metube_bak ]; then - rm -rf metube_bak + msg_info "Backing up Old Installation" + if [[ -d /opt/metube_bak ]]; then + rm -rf /opt/metube_bak fi - mv metube metube_bak + mv /opt/metube /opt/metube_bak + msg_ok "Backup created" + + msg_info "Cloning Latest ${APP} Release" $STD git clone https://github.com/alexta69/metube /opt/metube + msg_ok "Cloned ${APP}" + + msg_info "Building Frontend" cd /opt/metube/ui $STD npm install $STD node_modules/.bin/ng build - cd /opt/metube - cp /opt/metube_bak/.env /opt/metube/ - $STD pip3 install pipenv - $STD pipenv install + msg_ok "Built Frontend" - if [ -d "/opt/metube_bak" ]; then - rm -rf /opt/metube_bak + PYTHON_VERSION="3.13" setup_uv + + msg_info "Setting up Python Environment (uv)" + $STD uv venv /opt/metube/.venv + $STD /opt/metube/.venv/bin/python -m ensurepip --upgrade + $STD /opt/metube/.venv/bin/python -m pip install --upgrade pip + $STD /opt/metube/.venv/bin/python -m pip install pipenv + msg_ok "Python Environment Ready" + + msg_info "Installing Backend Requirements" + cd /opt/metube + $STD /opt/metube/.venv/bin/pipenv install + msg_ok "Installed Backend" + + msg_info "Restoring Environment File" + if [[ -f /opt/metube_bak/.env ]]; then + cp /opt/metube_bak/.env /opt/metube/.env fi - msg_ok "Updated ${APP} to latest Git" + msg_ok "Restored .env" + + if [[ ! -d /opt/metube/.venv ]]; then + msg_info "Migrating to uv-based environment" + PYTHON_VERSION="3.13" setup_uv + $STD uv venv /opt/metube/.venv + $STD /opt/metube/.venv/bin/python -m ensurepip --upgrade + $STD /opt/metube/.venv/bin/python -m pip install --upgrade pip + $STD /opt/metube/.venv/bin/python -m pip install pipenv + $STD /opt/metube/.venv/bin/pipenv install + + msg_info "Patching systemd Service" + cat </etc/systemd/system/metube.service +[Unit] +Description=Metube - YouTube Downloader +After=network.target + +[Service] +Type=simple +WorkingDirectory=/opt/metube +EnvironmentFile=/opt/metube/.env +ExecStart=/opt/metube/.venv/bin/pipenv run python3 app/main.py +Restart=always +User=root + +[Install] +WantedBy=multi-user.target +EOF + msg_ok "Patched systemd Service" + fi + $STD systemctl daemon-reload + msg_ok "Service Updated" + + msg_info "Cleaning up" + rm -rf /opt/metube_bak + $STD apt-get -y autoremove + $STD apt-get -y autoclean + msg_ok "Cleaned Up" msg_info "Starting ${APP} Service" - systemctl start metube + systemctl enable -q --now metube sleep 1 msg_ok "Started ${APP} Service" - msg_ok "Updated Successfully!\n" - exit + + msg_ok "Updated Successfully!" } start diff --git a/install/metube-install.sh b/install/metube-install.sh index 9f12cad03..207a7c696 100644 --- a/install/metube-install.sh +++ b/install/metube-install.sh @@ -36,7 +36,7 @@ cd /opt/metube/ui $STD npm install $STD node_modules/.bin/ng build cd /opt/metube -$STD uv venv /opt/motioneye/.venv +$STD uv venv /opt/metube/.venv $STD /opt/metube/.venv/bin/python -m ensurepip --upgrade $STD /opt/metube/.venv/bin/python -m pip install --upgrade pip $STD /opt/metube/.venv/bin/python -m pip install pipenv