From 5820820de0f15a47c852f5029976ccafcb45faf2 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Sat, 6 Jan 2024 14:17:20 -0500 Subject: [PATCH] FF Multi Converter: switch to updated fork from l-koehler closes https://github.com/Botspot/pi-apps/issues/2513 also add auto-updater --- .../workflows/updates/FF Multi Converter.sh | 6 +++++ apps/FF Multi Converter/credits | 2 +- apps/FF Multi Converter/description | 6 ++--- apps/FF Multi Converter/install | 27 ++++++++++--------- apps/FF Multi Converter/uninstall | 11 +++++--- apps/FF Multi Converter/website | 2 +- 6 files changed, 33 insertions(+), 21 deletions(-) create mode 100755 .github/workflows/updates/FF Multi Converter.sh diff --git a/.github/workflows/updates/FF Multi Converter.sh b/.github/workflows/updates/FF Multi Converter.sh new file mode 100755 index 0000000000..febcb7a2f8 --- /dev/null +++ b/.github/workflows/updates/FF Multi Converter.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +webVer=$(get_release l-koehler/FF-converter) +all_url="https://github.com/l-koehler/FF-converter/releases/download/v${webVer}/ffconverter-${webVer}.tar.gz" + +source $GITHUB_WORKSPACE/.github/workflows/update_github_script.sh \ No newline at end of file diff --git a/apps/FF Multi Converter/credits b/apps/FF Multi Converter/credits index 14d5d1e018..4f2605f7c8 100644 --- a/apps/FF Multi Converter/credits +++ b/apps/FF Multi Converter/credits @@ -1,2 +1,2 @@ Thanks to Crilum on GitHub for writing the scripts. -Thanks to ilstad on GitHub and all Contributors for creating FF Multi Converter! \ No newline at end of file +Thanks to ilstad and l-koehler on GitHub and all Contributors for creating FF Converter! \ No newline at end of file diff --git a/apps/FF Multi Converter/description b/apps/FF Multi Converter/description index 5d0c5fa33b..324ec4c6cf 100644 --- a/apps/FF Multi Converter/description +++ b/apps/FF Multi Converter/description @@ -2,7 +2,7 @@ Simple file conversions for audio, video, images and documents. It uses FFmpeg for audio/video files, the ImageMagick software suite for image conversions and unoconv for document files. -The goal of FF Multi Converter is to gather the most popular multimedia types in one application and provide conversion options for them easily through a user-friendly graphical interface. +The goal of FF Converter is to gather the most popular multimedia types in one application and provide conversion options for them easily through a user-friendly graphical interface. -To run: Menu -> Office -> FF Multi Converter -To run in a terminal: ffmulticonverter +To run: Menu -> Office -> FF Converter +To run in a terminal: ffconverter diff --git a/apps/FF Multi Converter/install b/apps/FF Multi Converter/install index a780eb9ded..e7337141b0 100755 --- a/apps/FF Multi Converter/install +++ b/apps/FF Multi Converter/install @@ -1,17 +1,18 @@ #!/bin/bash -cd /tmp -install_packages python3 python3-pyqt5 python3-distutils ffmpeg imagemagick unoconv || exit 1 -git_clone https://github.com/ilstam/FF-Multi-Converter || exit 1 +version=2.1.4 + +# remove deprecated files. Old installations used a multitude of install methods so the files could be in many places. +if [ -f /usr/local/bin/ffmulticonverter ] || [ -f /usr/local/share/applications/ffmulticonverter.desktop ]; then + for i in $(find /usr -path "*ffmulticonverter*"); do + sudo rm -rf $i + done +fi -cd FF-Multi-Converter || error 'Failed to cd into "FF-Multi-Converter" directory!' +install_packages python3 python3-pyqt5 python3-distutils ffmpeg imagemagick unoconv || exit 1 +pipx_install --system-site-packages "ffconverter==$version" || exit 1 -case $__os_codename in -mantic|bookworm) - errors="$(sudo python3 setup.py install --old-and-unmanageable 2>&1)" || error "Failed to install FF Multi Converter!\nErrors:\n$errors" - ;; -*) - errors="$(sudo python3 setup.py install 2>&1)" || error "Failed to install FF Multi Converter!\nErrors:\n$errors" - ;; -esac -sudo rm -rf FF-Multi-Converter +# add .desktop symlinks since pipx does not create them https://github.com/pypa/pipx/issues/717 +sudo mkdir -p /usr/local/share/applications /usr/local/share/icons +sudo ln -sf /usr/local/pipx/venvs/ffconverter/share/applications/ffconverter.desktop /usr/local/share/applications/ffconverter.desktop +sudo ln -sf /usr/local/pipx/venvs/ffconverter/share/pixmaps/ffconverter.png /usr/local/share/icons/ffconverter.png diff --git a/apps/FF Multi Converter/uninstall b/apps/FF Multi Converter/uninstall index 91eaf75407..84a7ef3a97 100755 --- a/apps/FF Multi Converter/uninstall +++ b/apps/FF Multi Converter/uninstall @@ -1,7 +1,12 @@ #!/bin/bash -for i in $(find /usr -path "*ffmulticonverter*"); do - sudo rm -rf $i -done +# remove deprecated files. Old installations used a multitude of install methods so the files could be in many places. +if [ -f /usr/local/bin/ffmulticonverter ] || [ -f /usr/local/share/applications/ffmulticonverter.desktop ]; then + for i in $(find /usr -path "*ffmulticonverter*"); do + sudo rm -rf $i + done +fi +pipx_uninstall ffconverter || exit 1 purge_packages || exit 1 +sudo rm -f /usr/local/share/applications/ffconverter.desktop /usr/local/share/icons/ffconverter.png diff --git a/apps/FF Multi Converter/website b/apps/FF Multi Converter/website index f256038160..cb045aa52d 100644 --- a/apps/FF Multi Converter/website +++ b/apps/FF Multi Converter/website @@ -1 +1 @@ -https://sites.google.com/site/ffmulticonverter/ +https://github.com/l-koehler/FF-converter