Update to v5.0

7 files changed, 41 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abb446206926..05f99fe0b19f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = tiny-media-manager
 	pkgdesc = A multi-OS media managment tool
-	pkgver = 4.3.14
+	pkgver = 5.0
 	pkgrel = 1
 	url = https://www.tinymediamanager.org/
 	install = tinyMediaManager.install
 	arch = any
 	license = Apache
 	depends = libmediainfo
-	depends = java-runtime>=11
-	noextract = tmm_4.3.14_linux.tar.gz
-	source = tmm_4.3.14_linux.tar.gz::https://release.tinymediamanager.org/v4/dist/tmm_4.3.14_linux-amd64.tar.gz
+	optdepends = ffmpeg: replace bundled version
+	optdepends = java-runtime>=11: replace bundled version
+	noextract = tmm_5.0_linux.tar.xz
+	source = tmm_5.0_linux.tar.xz::https://archive.tinymediamanager.org/v5.0/tinyMediaManager-5.0-linux-amd64.tar.xz
 	source = tinyMediaManager.desktop
 	source = tinymediamanager
 	source = tinymediamanager-cli
-	source = tinymediamanager.JAVA_OPTS
-	sha256sums = d6e5a6f3d9623c2be9be70429ffc892fcee688b39a286e13ea773ed9fdc0a487
-	sha256sums = 02bbfd492d10114cd314fc24fd7016532b0b992077d722d8bfccc4f99a79b7a3
-	sha256sums = 1b59df28ba5d1c52e6681b132a6342e8a38e4e6ae131c4f3a6db0d498f4fbf4f
-	sha256sums = 2d7501c13d4b608e440fec5db404a44d66fe91b2b7e2811c711feab06b292299
-	sha256sums = 0ef3bc3693a346dde08c0d01693a48ccf630bea2cb2aa2e31ce9ce77a408f2ba
+	sha256sums = 1c827e592313a1e41c763b4d782483d35c8a3406a8ddaf3eb2d6508ee020ff49
+	sha256sums = 7f4107fa13ffff4ecfdfcc38cbeb96800ab48117fef7abfe38a175a842ce86e1
+	sha256sums = d97b2206915a882c034149f3fa097445bb8bb350441bf8fdf331245e11be4f6c
+	sha256sums = d6cc87cf9166f0c47940ffa6c279a9c2bc237533ebf38afb2a387532019f5675
 
 pkgname = tiny-media-manager
diff --git a/PKGBUILD b/PKGBUILD
index 54e3ff07b376..0a108c4921fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Larslol140 <larslol140@gmail.com>
+# Maintainer: Larslol140 <lars@larslol140.com>
 # Contributor: Fabian Köhler <fabian.koehler@protonmail.ch>
 # Contributor: Simon Legner <Simon.Legner@gmail.com>
 # Contributor: Filippo Berto <berto.f at protonmail dot com>
@@ -6,26 +6,39 @@
 
 _gitname=tinyMediaManager
 pkgname=tiny-media-manager
-pkgver=4.3.14
+pkgver=5.0
 pkgrel=1
 pkgdesc="A multi-OS media managment tool"
 arch=('any')
 url="https://www.tinymediamanager.org/"
 license=('Apache')
-depends=('libmediainfo' 'java-runtime>=11')
+depends=(
+  'libmediainfo'
+)
+optdepends=(
+  'ffmpeg: replace bundled version'
+  'java-runtime>=11: replace bundled version'
+)
 install=tinyMediaManager.install
-noextract=("tmm_${pkgver}_linux.tar.gz")
-source=("tmm_${pkgver}_linux.tar.gz::https://release.tinymediamanager.org/v4/dist/tmm_${pkgver}_linux-amd64.tar.gz"
+noextract=("tmm_${pkgver}_linux.tar.xz")
+source=("tmm_${pkgver}_linux.tar.xz::https://archive.tinymediamanager.org/v${pkgver}/tinyMediaManager-${pkgver}-linux-amd64.tar.xz"
         "tinyMediaManager.desktop"
         "tinymediamanager"
-        "tinymediamanager-cli"
-        "tinymediamanager.JAVA_OPTS")
+        "tinymediamanager-cli")
+
+sha256sums=('1c827e592313a1e41c763b4d782483d35c8a3406a8ddaf3eb2d6508ee020ff49'
+            '7f4107fa13ffff4ecfdfcc38cbeb96800ab48117fef7abfe38a175a842ce86e1'
+            'd97b2206915a882c034149f3fa097445bb8bb350441bf8fdf331245e11be4f6c'
+            'd6cc87cf9166f0c47940ffa6c279a9c2bc237533ebf38afb2a387532019f5675')
+
+prepare() {
+  sed -i "s|HOME_DIR|${HOME}|" "${startdir}/tinyMediaManager.install"
+}
 
 package() {
   destpath="$pkgdir/usr/share/$_gitname"
   mkdir -p "$destpath"
-  tar -xvf "tmm_${pkgver}_linux.tar.gz" --directory "$destpath" --strip-components 1
-  install -m644 tinymediamanager.JAVA_OPTS "$destpath/tmm.JAVA_OPTS"
+  tar -xvf "tmm_${pkgver}_linux.tar.xz" --directory "$destpath" --strip-components 1
 
   # Install desktop entry
   install -D "$srcdir/tinyMediaManager.desktop" "$pkgdir/usr/share/applications/tinyMediaManager.desktop"
@@ -36,8 +49,3 @@ package() {
   install -D "$srcdir/tinymediamanager" "$pkgdir/usr/bin/tinymediamanager"
 }
 
-sha256sums=('d6e5a6f3d9623c2be9be70429ffc892fcee688b39a286e13ea773ed9fdc0a487'
-            '02bbfd492d10114cd314fc24fd7016532b0b992077d722d8bfccc4f99a79b7a3'
-            '1b59df28ba5d1c52e6681b132a6342e8a38e4e6ae131c4f3a6db0d498f4fbf4f'
-            '2d7501c13d4b608e440fec5db404a44d66fe91b2b7e2811c711feab06b292299'
-            '0ef3bc3693a346dde08c0d01693a48ccf630bea2cb2aa2e31ce9ce77a408f2ba')
diff --git a/tinyMediaManager.desktop b/tinyMediaManager.desktop
index cac0be7b419c..aad8d1d7fff0 100755
--- a/tinyMediaManager.desktop
+++ b/tinyMediaManager.desktop
@@ -6,4 +6,4 @@ Exec=/usr/bin/tinymediamanager
 Icon=/usr/share/tinyMediaManager/tmm.png
 Comment=A multi-OS media managment tool
 Categories=AudioVideo;Video;Database;Java;
-Version=2.9.2
+Version=5.0
\ No newline at end of file
diff --git a/tinyMediaManager.install b/tinyMediaManager.install
index e972755906e9..df3757278543 100644
--- a/tinyMediaManager.install
+++ b/tinyMediaManager.install
@@ -8,4 +8,11 @@ post_upgrade() {
     warning ''
     warning 'tinyMediaManager v4 changed to a subscription based license model, see https://www.tinymediamanager.org/blog/version-4-0/'
   fi
+  if [ -d HOME_DIR/.tiny-media-manager ]; then
+    warning "This package no longer stores user data in $HOME/.tiny-media-manager. Please migrate the data to .local/share/tinyMediaManager"
+    warning '$ mkdir $HOME/.local/share/tinyMediaManager/'
+    warning '$ mv $HOME/.tiny-media-manager/{backup,data} $HOME/.local/share/tinyMediaManager'
+    warning 'Optional remove the old data directory'
+    warning '$ rm -r $HOME/.tiny-media-manager'
+  fi
 }
diff --git a/tinymediamanager b/tinymediamanager
index 1962865a2f95..60863cdc52e3 100644
--- a/tinymediamanager
+++ b/tinymediamanager
@@ -2,16 +2,4 @@
 # Launch script for tinyMediaManager
 set -e
 
-mkdir --parents "$HOME/.tiny-media-manager"
-mkdir --parents "$HOME/.tiny-media-manager/templates"
-cd "$HOME/.tiny-media-manager"
-ln --symbolic --force /usr/share/tinyMediaManager/templates/templates.jar ./templates/templates.jar
-ln --symbolic --force --no-dereference /usr/share/tinyMediaManager/native "$HOME/.tiny-media-manager/native"
-ln --symbolic --force /usr/share/tinyMediaManager/version "$HOME/.tiny-media-manager/version"
-
-source /usr/share/tinyMediaManager/tmm.JAVA_OPTS
-
-java $JAVA_OPTS \
-  -Dappbase=https://www.tinymediamanager.org/ \
-  -cp /usr/share/tinyMediaManager/tmm.jar:/usr/share/tinyMediaManager/lib/* \
-  org.tinymediamanager.TinyMediaManager
+/usr/share/tinyMediaManager/tinyMediaManager -noupdate=true
diff --git a/tinymediamanager-cli b/tinymediamanager-cli
index 0ee6aea55af8..654ba72b2bfc 100644
--- a/tinymediamanager-cli
+++ b/tinymediamanager-cli
@@ -2,18 +2,4 @@
 # Command line interface for tinyMediaManager
 set -e
 
-mkdir --parents "$HOME/.tiny-media-manager"
-mkdir --parents "$HOME/.tiny-media-manager/templates"
-cd "$HOME/.tiny-media-manager"
-ln --symbolic --force /usr/share/tinyMediaManager/templates/templates.jar ./templates/templates.jar
-ln --symbolic --force --no-dereference /usr/share/tinyMediaManager/native "$HOME/.tiny-media-manager/native"
-ln --symbolic --force /usr/share/tinyMediaManager/version "$HOME/.tiny-media-manager/version"
-
-source /usr/share/tinyMediaManager/tmm.JAVA_OPTS
-
-java $JAVA_OPTS \
-  -Dappbase=https://www.tinymediamanager.org/ \
-  -Djava.awt.headless=true \
-  -cp /usr/share/tinyMediaManager/tmm.jar:/usr/share/tinyMediaManager/lib/* \
-  org.tinymediamanager.TinyMediaManager \
-  "$@"
+/usr/share/tinyMediaManager/tinyMediaManager -noupdate=true -headless=true
diff --git a/tinymediamanager.JAVA_OPTS b/tinymediamanager.JAVA_OPTS
deleted file mode 100644
index 3b6c1782873d..000000000000
--- a/tinymediamanager.JAVA_OPTS
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $ cat pkg/tiny-media-manager/usr/share/tinyMediaManager/getdown.txt | grep -E "jvmarg = (\[linux] )?-" | grep -o -- "-.*" | sed 's/^/JAVA_OPTS="$JAVA_OPTS /' | sed 's/$/"/'
-
-JAVA_OPTS="$JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions"
-JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC"
-JAVA_OPTS="$JAVA_OPTS -XX:+UseStringDeduplication"
-JAVA_OPTS="$JAVA_OPTS -Xms64m"
-#JAVA_OPTS="$JAVA_OPTS -Xmx512m"
-JAVA_OPTS="$JAVA_OPTS -Xss512k"
-JAVA_OPTS="$JAVA_OPTS -splash:splashscreen.png"
-JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"
-JAVA_OPTS="$JAVA_OPTS -XX:CompileCommand=exclude,ca/odell/glazedlists/impl/filter/TextMatchers,matches"
-JAVA_OPTS="$JAVA_OPTS -XX:CompileCommand=exclude,ca/odell/glazedlists/impl/filter/BoyerMooreCaseInsensitiveTextSearchStrategy,indexOf"
-JAVA_OPTS="$JAVA_OPTS -Djna.nosys=true"
-JAVA_OPTS="$JAVA_OPTS -Dawt.useSystemAAFontSettings=on"
-JAVA_OPTS="$JAVA_OPTS -Dswing.aatext=true"