From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Sun, 21 Jan 2024 13:11:01 +0000 (+0100)
Subject: Cleanup binaries (#1014)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=0982c3092a1184ebe5d75a6f33cc25d67b12123f;p=music-assistant-server.git

Cleanup binaries (#1014)
---

diff --git a/music_assistant/server/providers/airplay/__init__.py b/music_assistant/server/providers/airplay/__init__.py
index 0cf4e760..a4313daa 100644
--- a/music_assistant/server/providers/airplay/__init__.py
+++ b/music_assistant/server/providers/airplay/__init__.py
@@ -330,52 +330,21 @@ class AirplayProvider(PlayerProvider):
                 ):
                     self._bridge_bin = bridge_binary_path
                     return bridge_binary_path
-            except OSError:
+            except OSError as err:
+                self.logger.exception(err)
                 return None
 
         base_path = os.path.join(os.path.dirname(__file__), "bin")
-        if platform.system() == "Windows" and (
-            bridge_binary := await check_bridge_binary(
-                os.path.join(base_path, "squeeze2raop-static.exe")
-            )
+
+        system = platform.system().lower()
+        architecture = platform.machine().lower()
+
+        if bridge_binary := await check_bridge_binary(
+            os.path.join(base_path, f"squeeze2raop-{system}-{architecture}-static")
         ):
             return bridge_binary
-        if platform.system() == "Darwin":
-            # macos binary is autoselect x86_64/arm64
-            if bridge_binary := await check_bridge_binary(
-                os.path.join(base_path, "squeeze2raop-macos-static")
-            ):
-                return bridge_binary
-
-        if platform.system() == "FreeBSD":
-            # FreeBSD binary is x86_64 intel
-            if bridge_binary := await check_bridge_binary(
-                os.path.join(base_path, "squeeze2raop-freebsd-x86_64-static")
-            ):
-                return bridge_binary
-
-        if platform.system() == "Linux":
-            architecture = platform.machine()
-            if architecture in ["AMD64", "x86_64"]:
-                # generic linux x86_64 binary
-                if bridge_binary := await check_bridge_binary(
-                    os.path.join(
-                        base_path,
-                        "squeeze2raop-linux-x86_64-static",
-                    )
-                ):
-                    return bridge_binary
 
-            # other linux architecture... try all options one by one...
-            for arch in ["aarch64", "arm", "armv6", "mips", "sparc64", "x86"]:
-                if bridge_binary := await check_bridge_binary(
-                    os.path.join(base_path, f"squeeze2raop-linux-{arch}-static")
-                ):
-                    return bridge_binary
-
-        raise RuntimeError(
-            f"Unable to locate RaopBridge for {platform.system()} ({platform.machine()})"
-        )
+        raise RuntimeError(f"Unable to locate RaopBridge for {system}/{architecture}")
 
     async def _bridge_process_runner(self, slimproto_prov: SlimprotoProvider) -> None:
         """Run the bridge binary in the background."""
diff --git a/music_assistant/server/providers/airplay/bin/libcrypto-1_1.dll b/music_assistant/server/providers/airplay/bin/libcrypto-1_1.dll
deleted file mode 100644
index 21fab8a2..00000000
Binary files a/music_assistant/server/providers/airplay/bin/libcrypto-1_1.dll and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/libssl-1_1.dll b/music_assistant/server/providers/airplay/bin/libssl-1_1.dll
deleted file mode 100644
index b5ad09b2..00000000
Binary files a/music_assistant/server/providers/airplay/bin/libssl-1_1.dll and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-arm64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-arm64-static
new file mode 100755
index 00000000..ca6cb7a5
Binary files /dev/null and b/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-arm64-static differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-x86_64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-x86_64-static
new file mode 100755
index 00000000..69c2027a
Binary files /dev/null and b/music_assistant/server/providers/airplay/bin/squeeze2raop-darwin-x86_64-static differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-freebsd-x86_64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-freebsd-x86_64-static
deleted file mode 100755
index eb2643a1..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-freebsd-x86_64-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-armv6-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-armv6-static
deleted file mode 100755
index 76f8b236..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-armv6-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-mips-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-mips-static
deleted file mode 100755
index 0aa9b475..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-mips-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-powerpc-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-powerpc-static
deleted file mode 100755
index c3c9d28b..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-powerpc-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-sparc64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-sparc64-static
deleted file mode 100755
index 926122da..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-linux-sparc64-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-arm64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-arm64-static
deleted file mode 100755
index ca6cb7a5..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-arm64-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-static
deleted file mode 100755
index 1f6f73ea..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-x86_64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-x86_64-static
deleted file mode 100755
index 69c2027a..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-macos-x86_64-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-solaris-x86_64-static b/music_assistant/server/providers/airplay/bin/squeeze2raop-solaris-x86_64-static
deleted file mode 100755
index 02e8f04d..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-solaris-x86_64-static and /dev/null differ
diff --git a/music_assistant/server/providers/airplay/bin/squeeze2raop-static.exe b/music_assistant/server/providers/airplay/bin/squeeze2raop-static.exe
deleted file mode 100755
index 13a1ebb3..00000000
Binary files a/music_assistant/server/providers/airplay/bin/squeeze2raop-static.exe and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/__init__.py b/music_assistant/server/providers/spotify/__init__.py
index 61508acb..1b68efeb 100644
--- a/music_assistant/server/providers/spotify/__init__.py
+++ b/music_assistant/server/providers/spotify/__init__.py
@@ -797,45 +797,13 @@ class SpotifyProvider(MusicProvider):
             except OSError:
                 return None
 
-        base_path = os.path.join(os.path.dirname(__file__), "librespot")
-        if platform.system() == "Windows" and (
-            librespot := await check_librespot(os.path.join(base_path, "windows", "librespot.exe"))
+        base_path = os.path.join(os.path.dirname(__file__), "bin")
+        system = platform.system().lower()
+        architecture = platform.machine().lower()
+
+        if bridge_binary := await check_librespot(
+            os.path.join(base_path, f"librespot-{system}-{architecture}")
         ):
-            return librespot
-        if platform.system() == "Darwin":
-            # macos binary is x86_64 intel
-            if librespot := await check_librespot(os.path.join(base_path, "osx", "librespot")):
-                return librespot
-
-        if platform.system() == "FreeBSD":
-            # FreeBSD binary is x86_64 intel
-            if librespot := await check_librespot(os.path.join(base_path, "freebsd", "librespot")):
-                return librespot
-
-        if platform.system() == "Linux":
-            architecture = platform.machine()
-            if architecture in ["AMD64", "x86_64"]:
-                # generic linux x86_64 binary
-                if librespot := await check_librespot(
-                    os.path.join(
-                        base_path,
-                        "linux",
-                        "librespot-x86_64",
-                    )
-                ):
-                    return librespot
-
-            # arm architecture... try all options one by one...
-            for arch in ["aarch64", "armv7", "armhf", "arm"]:
-                if librespot := await check_librespot(
-                    os.path.join(
-                        base_path,
-                        "linux",
-                        f"librespot-{arch}",
-                    )
-                ):
-                    return librespot
+            return bridge_binary
 
-        raise RuntimeError(
-            f"Unable to locate Libespot for {platform.system()} ({platform.machine()})"
-        )
+        raise RuntimeError(f"Unable to locate Librespot for {system}/{architecture}")
diff --git a/music_assistant/server/providers/spotify/bin/librespot-darwin-arm64 b/music_assistant/server/providers/spotify/bin/librespot-darwin-arm64
new file mode 100755
index 00000000..84c77696
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-darwin-arm64 differ
diff --git a/music_assistant/server/providers/spotify/bin/librespot-darwin-x86_64 b/music_assistant/server/providers/spotify/bin/librespot-darwin-x86_64
new file mode 100755
index 00000000..84c77696
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-darwin-x86_64 differ
diff --git a/music_assistant/server/providers/spotify/bin/librespot-linux-aarch64 b/music_assistant/server/providers/spotify/bin/librespot-linux-aarch64
new file mode 100755
index 00000000..64644e76
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-linux-aarch64 differ
diff --git a/music_assistant/server/providers/spotify/bin/librespot-linux-arm b/music_assistant/server/providers/spotify/bin/librespot-linux-arm
new file mode 100755
index 00000000..4a841ae5
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-linux-arm differ
diff --git a/music_assistant/server/providers/spotify/bin/librespot-linux-x86 b/music_assistant/server/providers/spotify/bin/librespot-linux-x86
new file mode 100755
index 00000000..0dbe3e8e
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-linux-x86 differ
diff --git a/music_assistant/server/providers/spotify/bin/librespot-linux-x86_64 b/music_assistant/server/providers/spotify/bin/librespot-linux-x86_64
new file mode 100755
index 00000000..57bc88a1
Binary files /dev/null and b/music_assistant/server/providers/spotify/bin/librespot-linux-x86_64 differ
diff --git a/music_assistant/server/providers/spotify/librespot/__init__.py b/music_assistant/server/providers/spotify/librespot/__init__.py
deleted file mode 100644
index 92538754..00000000
--- a/music_assistant/server/providers/spotify/librespot/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Music Assistant: The music library manager in python."""
diff --git a/music_assistant/server/providers/spotify/librespot/freebsd/__init__.py b/music_assistant/server/providers/spotify/librespot/freebsd/__init__.py
deleted file mode 100644
index 92538754..00000000
--- a/music_assistant/server/providers/spotify/librespot/freebsd/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Music Assistant: The music library manager in python."""
diff --git a/music_assistant/server/providers/spotify/librespot/freebsd/librespot b/music_assistant/server/providers/spotify/librespot/freebsd/librespot
deleted file mode 100755
index e48cfe5c..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/freebsd/librespot and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/linux/__init__.py b/music_assistant/server/providers/spotify/librespot/linux/__init__.py
deleted file mode 100644
index 92538754..00000000
--- a/music_assistant/server/providers/spotify/librespot/linux/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Music Assistant: The music library manager in python."""
diff --git a/music_assistant/server/providers/spotify/librespot/linux/librespot-aarch64 b/music_assistant/server/providers/spotify/librespot/linux/librespot-aarch64
deleted file mode 100755
index 5e42d14f..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/linux/librespot-aarch64 and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/linux/librespot-arm b/music_assistant/server/providers/spotify/librespot/linux/librespot-arm
deleted file mode 100755
index 5cd38c75..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/linux/librespot-arm and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/linux/librespot-armhf b/music_assistant/server/providers/spotify/librespot/linux/librespot-armhf
deleted file mode 100755
index 18c2e05b..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/linux/librespot-armhf and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/linux/librespot-armv7 b/music_assistant/server/providers/spotify/librespot/linux/librespot-armv7
deleted file mode 100755
index 1db6879f..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/linux/librespot-armv7 and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/linux/librespot-x86_64 b/music_assistant/server/providers/spotify/librespot/linux/librespot-x86_64
deleted file mode 100755
index bbbbe9ce..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/linux/librespot-x86_64 and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/osx/__init__.py b/music_assistant/server/providers/spotify/librespot/osx/__init__.py
deleted file mode 100644
index 92538754..00000000
--- a/music_assistant/server/providers/spotify/librespot/osx/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Music Assistant: The music library manager in python."""
diff --git a/music_assistant/server/providers/spotify/librespot/osx/librespot b/music_assistant/server/providers/spotify/librespot/osx/librespot
deleted file mode 100755
index 915bff88..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/osx/librespot and /dev/null differ
diff --git a/music_assistant/server/providers/spotify/librespot/windows/__init__.py b/music_assistant/server/providers/spotify/librespot/windows/__init__.py
deleted file mode 100644
index 92538754..00000000
--- a/music_assistant/server/providers/spotify/librespot/windows/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Music Assistant: The music library manager in python."""
diff --git a/music_assistant/server/providers/spotify/librespot/windows/librespot.exe b/music_assistant/server/providers/spotify/librespot/windows/librespot.exe
deleted file mode 100755
index a973f4e1..00000000
Binary files a/music_assistant/server/providers/spotify/librespot/windows/librespot.exe and /dev/null differ