Merge pull request #33 from enteraname74/develop

v0.7.0-Desktop

desktopApp/.gitignore

@@ -1,4 +1,10 @@
 /build
 .gradle
 
-soulSearchingDatabase.db
+soulSearchingDatabase.db
+
+# Flatpak
+build-dir
+repo
+.flatpak-builder
+*.flatpak

desktopApp/README.md

@@ -0,0 +1,7 @@
+# Soul Searching Desktop
+
+Originally an Android application, *Soul Searching* is now also available as a desktop application.
+For now, it works for Linux. The best way to use the application is with a flatpak, as it holds all the needed dependencies for the app to work properly.
+
+## Building the application
+Use the `packageFlatpakReleaseDistributable` gradle task to build a flatpak of the application.

desktopApp/build.gradle.kts

@@ -64,9 +64,65 @@ compose.desktop {
                 appCategory = "AudioVideo;Player;"
                 appRelease = "1"
                 rpmLicenseType = "GPL-3.0-or-later"
-                iconFile.set(project.file("src/main/composeResources/drawable/app_icon.png"))
+                iconFile.set(project.file("src/main/composeResources/drawable/app_icon_bg.png"))
             }
 
         }
     }
 }
+tasks {
+    register<Tar>("packageTarReleaseDistributable") {
+        group = "compose desktop"
+        from(named("createReleaseDistributable"))
+        archiveBaseName = "soulsearching"
+        archiveClassifier = "linux"
+        compression = Compression.GZIP
+        archiveExtension = "tar.gz"
+
+        val version = libs.versions.desktop.version.name.get()
+
+        archiveFileName = "soulsearching-$version-linux.tar.gz"
+    }
+
+    task("packageFlatpakReleaseDistributable") {
+        group = "compose desktop"
+        description = "Builds a flatpak and stores it in the build/flatpak folder."
+        dependsOn("packageTarReleaseDistributable")
+
+        val appId = "io.github.enteraname74.soulsearching"
+
+        doLast {
+            println("packageFlatpakReleaseDistributable -- INFO -- Building manifest")
+            exec {
+                commandLine(
+                    "flatpak-builder",
+                    "--user",
+                    "--force-clean",
+                    "build-dir",
+                    "$appId.yml"
+                )
+            }
+            println("packageFlatpakReleaseDistributable -- INFO -- Creating flatpak executable")
+            exec {
+                commandLine(
+                    "flatpak",
+                    "build-export",
+                    "repo",
+                    "build-dir"
+                )
+            }
+            val outputDir = file("$buildDir/flatpak")
+            outputDir.mkdirs()
+            println("packageFlatpakReleaseDistributable -- Will install flatpak in: $outputDir")
+            exec {
+                commandLine(
+                    "flatpak",
+                    "build-bundle",
+                    "repo",
+                    "${outputDir.absolutePath}/$appId.flatpak",
+                    appId
+                )
+            }
+        }
+    }
+}

desktopApp/io.github.enteraname74.soulsearching.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Soul Searching
+GenericName=Music Player
+Exec=SoulSearching
+Comment=Music player application.
+Icon=io.github.enteraname74.soulsearching
+Terminal=false
+Type=Application
+Categories=Audio;Player;Music;
+Keywords=Music;Player;Audio;Songs;Playlist;Albums;Artists;

desktopApp/io.github.enteraname74.soulsearching.yml

@@ -0,0 +1,45 @@
+app-id: io.github.enteraname74.soulsearching
+runtime: org.freedesktop.Platform
+runtime-version: '22.08'
+sdk: org.freedesktop.Sdk
+command: SoulSearching
+build-options:
+  env:
+    BUILDCC: gcc
+finish-args:
+  - --share=network
+  - --share=ipc
+  - --socket=pulseaudio
+  - --filesystem=home
+  - --device=dri
+  - --socket=x11
+modules:
+  - name: vlc
+    buildsystem: autotools
+    config-opts:
+      - --disable-lua
+      - --disable-a52
+    build-commands:
+      - export BUILDCC=gcc
+      - ./configure --prefix=/app --disable-lua --disable-a52
+      - make -j$(nproc)
+      - make install
+    sources:
+      - type: archive
+        url: https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz
+        sha256: adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5
+
+
+  - name: SoulSearching
+    buildsystem: simple
+    build-commands:
+      - install -Dm 644 -t /app/share/applications io.github.enteraname74.soulsearching.desktop
+      - install -Dm 644 app_icon_bg.png /app/share/icons/hicolor/128x128/apps/io.github.enteraname74.soulsearching.png
+      - cp -ru * /app
+    sources:
+      - type: archive
+        path: build/distributions/soulsearching-0.7.0-linux.tar.gz
+      - type: file
+        path: src/main/composeResources/drawable/app_icon_bg.png
+      - type: file
+        path: io.github.enteraname74.soulsearching.desktop

desktopApp/src/main/kotlin/Main.kt

@@ -27,7 +27,7 @@ fun main() = application {
             icon = painterResource(Res.drawable.app_icon),
             onPreviewKeyEvent = {
                 playbackManager.handleKeyEvent(event = it)
-                true
+                false
             }
         ) {
             MaterialTheme {

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ compose = "1.6.2"
 compose-ui = "1.5.1"
 compose-plugin = "1.6.2"
 coroutines-core = "1.8.0"
-desktop-version-name = "0.1.0"
+desktop-version-name = "0.7.0"
 exposed = "0.46.0"
 file-kit = "0.8.1"
 foundation-desktop = "1.6.2"

shared-ui/src/desktopMain/kotlin/com/github/enteraname74/soulsearching/di/PlatformModule.desktop.kt

@@ -24,7 +24,7 @@ actual val platformModule: Module = module {
     single<SoulSearchingSettings> {
         SoulSearchingSettingsImpl(
             settings = PreferencesSettings(
-                delegate = Preferences.userRoot()
+                delegate = Preferences.userRoot().node("com/github/enteraname74/soulsearching")
             )
         )
     }

shared-ui/src/desktopMain/kotlin/com/github/enteraname74/soulsearching/domain/AppVersion.desktop.kt

@@ -1,5 +1,5 @@
 package com.github.enteraname74.soulsearching.domain
 
 actual object AppVersion {
-    actual val versionName = "0.1.0"
+    actual val versionName = "0.7.0"
 }

shared-ui/src/desktopMain/kotlin/com/github/enteraname74/soulsearching/model/MusicFetcherDesktopImpl.kt

@@ -28,6 +28,7 @@ import org.jaudiotagger.tag.FieldKey
 import org.jaudiotagger.tag.Tag
 import org.jetbrains.skia.Image
 import java.io.File
+import java.net.URLConnection
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -51,7 +52,7 @@ class MusicFetcherDesktopImpl(
     upsertFolderUseCase: UpsertFolderUseCase,
     upsertMusicIntoAlbumUseCase: UpsertMusicIntoAlbumUseCase,
     upsertMusicIntoArtistUseCase: UpsertMusicIntoArtistUseCase,
-): MusicFetcher(
+) : MusicFetcher(
     isMusicAlreadySavedUseCase = isMusicAlreadySavedUseCase,
     getArtistFromNameUseCase = getArtistFromNameUseCase,
     getCorrespondingAlbumUseCase = getCorrespondingAlbumUseCase,
@@ -79,6 +80,33 @@ class MusicFetcherDesktopImpl(
         }
     }
 
+    private fun isMusicFile(file: File): Boolean {
+        val mimeType: String = URLConnection.guessContentTypeFromName(file.name) ?: return false
+        val authorizedMimeTypes =
+            listOf(
+                "audio/mpeg",        // MP3 files
+                "audio/mp4",         // MP4 files with audio (M4A)
+                "audio/wav",         // WAV files
+                "audio/ogg",         // Ogg Vorbis files
+                "audio/flac",        // FLAC files
+                "audio/aac",         // AAC files
+                "audio/opus",        // Opus files
+                "audio/x-ms-wma",    // Windows Media Audio files
+                "audio/aiff",        // AIFF files
+                "audio/webm",        // WebM files with audio
+                "audio/amr",         // AMR files
+                "audio/vnd.rn-realaudio", // RealAudio files
+                "audio/midi",        // MIDI files
+                "audio/3gpp",        // 3GP files with audio
+                "audio/x-m4a",       // M4A files
+                "audio/x-xmf",       // XMF files
+                "audio/x-ms-asf",    // ASF files with audio
+                "audio/x-wav",       // RAW audio format (often used for WAV)
+                "audio/eac3"         // Enhanced AC-3 files
+            )
+        return authorizedMimeTypes.contains(mimeType)
+    }
+
     /**
      * Extract mp3 files from current directory.
      */
@@ -99,8 +127,7 @@ class MusicFetcherDesktopImpl(
             updateProgress(count / files.size, file.parent)
             if (file.isHidden || !file.canRead()) {
                 continue
-            }
-            else if (file.name.endsWith(".mp3") || file.name.endsWith(".m4a")) {
+            } else if (isMusicFile(file = file)) {
                 try {
                     val audioFile: AudioFile = AudioFileIO.read(file)
                     val tag: Tag = audioFile.tag