Merge pull request #142 from kurwjan/flathub-support

Vito0912 · web-flow · commit 9f05e5435af6 · 2025-01-27T18:46:34.000+01:00
Testing Snapcraft support by kurwjan
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -301,24 +301,25 @@ jobs:
           
           cp /usr/lib/x86_64-linux-gnu/libsecret-1.so* AppDir/usr/lib/ || true
           
-          cp assets/images/logo/logo_blue_big_abs.png AppDir/usr/share/icons/hicolor/256x256/apps/buchable.png
-          cp assets/images/logo/logo_blue_big_abs.png AppDir/buchable.png
+          cp assets/images/logo/logo_blue_big_abs.png AppDir/usr/share/icons/hicolor/256x256/apps/io.github.vito0912.abs_flutter.png
+          cp assets/images/logo/logo_blue_big_abs.png AppDir/io.github.vito0912.abs_flutter.png
           
-          cat > AppDir/buchable.desktop << EOL
+          cat > AppDir/io.github.vito0912.abs_flutter.desktop << EOL
           [Desktop Entry]
           Name=Buchable
-          Comment=The unofficial cross-platform app for Audiobookshelf
-          Exec=abs_flutter
-          Icon=buchable
-          Terminal=false
+          Comment=Enjoy hearing self-hosted audiobooks.
+          Exec=buchable
           Type=Application
-          Categories=Audio;AudioVideo;Player;
-          StartupWMClass=buchable
-          X-GNOME-UsesNotifications=true
+          Icon=io.github.vito0912.abs_flutter.png
+          Terminal=false
+          Keywords=Audiobook,Player,Audiobookshelf,Listen;
+          Categories=Multimedia;Audio;AudioVideo;Player;
           MimeType=audio/*;video/*;
+          X-GNOME-UsesNotifications=true
+          StartupWMClass=buchable
           EOL
           
-          cp AppDir/buchable.desktop AppDir/usr/share/applications/
+          cp AppDir/io.github.vito0912.abs_flutter.desktop AppDir/usr/share/applications/
           
           cat > AppDir/AppRun << EOL
           #!/bin/sh
@@ -384,7 +385,7 @@ jobs:
           mv ubuntu-artifacts/app-release.apk ubuntu-artifacts/android-release-${{ env.VERSION }}.apk
           mv ubuntu-artifacts/app-release.aab ubuntu-artifacts/android-release-${{ env.VERSION }}.aab
           mv ubuntu-artifacts/web-release.zip ubuntu-artifacts/web-release-${{ env.VERSION }}.zip
-          mv linux-artifacts/linux-release.zip linux-artifacts/linux-release-${{ env.VERSION }}.zip
+          mv linux-artifacts/linux-release.zip linux-artifacts/linux-release.zip
           mv linux-artifacts/buchable-${{ env.VERSION }}-x86_64.AppImage linux-artifacts/buchable-${{ env.VERSION }}-x86_64.AppImage || true
 
       - name: Create GitHub Release
@@ -403,7 +404,7 @@ jobs:
             windows-artifacts/windows-Release-${{ env.VERSION }}.zip
             windows-artifacts/windows-installer-release-${{ env.VERSION }}.msix
             windows-artifacts/windows-installer-release-${{ env.VERSION }}-store.msix
-            linux-artifacts/linux-release-${{ env.VERSION }}.zip
+            linux-artifacts/linux-release.zip
             linux-artifacts/buchable-${{ env.VERSION }}-x86_64.AppImage
 
   publish-release:
diff --git a/lib/main.dart b/lib/main.dart
@@ -21,7 +21,6 @@ import 'package:flutter_settings_screens/flutter_settings_screens.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:just_audio_media_kit/just_audio_media_kit.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:path/path.dart' as path;
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sembast/sembast_io.dart';
@@ -45,7 +44,7 @@ void main() async {
 
   if (!kIsWeb) {
     appDir = Platform.isLinux
-        ? '${path.join('/home', Platform.environment['USER']!, '.abs_flutter')}'
+        ? (await getApplicationSupportDirectory()).path
         : '${(await getApplicationDocumentsDirectory()).path.replaceAll('\\', '/')}/abs_flutter';
 
     await Directory(appDir).create(recursive: true);
diff --git a/lib/provider/download_provider.dart b/lib/provider/download_provider.dart
@@ -8,6 +8,7 @@ import 'package:abs_flutter/provider/user_provider.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:saf_util/saf_util.dart';
 import 'package:saf_util/saf_util_platform_interface.dart';
 import 'package:path/path.dart' as path;
@@ -56,10 +57,9 @@ class DownloadListNotifier extends StateNotifier<List<DownloadInfo>> {
     _saveDownloads();
   }
 
-  String _getDownloadPath(DownloadInfo download) {
+  Future<String> _getDownloadPath(DownloadInfo download) async {
     if ( !kIsWeb && Platform.isLinux) {
-      final homeDir = Directory(path.join('/home', Platform.environment['USER']!));
-      return path.join(homeDir.path, '.abs_flutter', download.folderPath);
+      return path.join((await getApplicationSupportDirectory()).path, download.folderPath);
     }
     return download.folderPath;
   }
@@ -102,7 +102,7 @@ class DownloadListNotifier extends StateNotifier<List<DownloadInfo>> {
           log('Error deleting file: $e', name: 'removeDownload');
         }
       } else {
-        final folder = Directory(_getDownloadPath(download));
+        final folder = Directory(await _getDownloadPath(download));
         // For windows support / and \ in path
         final folderName = folder.path.replaceAll('\\', '/').split('/').last;
         if (folderName == download.itemId || folderName == download.episodeId) {
diff --git a/lib/provider/downloader_provider.dart b/lib/provider/downloader_provider.dart
@@ -166,8 +166,7 @@ class DownloadProvider extends ChangeNotifier {
       String path = await update.task.filePath();
 
       if (!kIsWeb && Platform.isLinux) {
-        String homeDir = '/home/${Platform.environment['USER']}';
-        path = path.replaceFirst('/.abs_flutter', '$homeDir/.abs_flutter');
+        path = (await getApplicationSupportDirectory()).path;
       }
 
       Directory(path).parent.deleteSync(recursive: true);
@@ -400,8 +399,7 @@ class DownloadProvider extends ChangeNotifier {
     Directory? homeDir;
 
     if (!kIsWeb && Platform.isLinux) {
-      final homeDir = Platform.environment['USER'];
-      savePath = path.join('/home', homeDir, '.abs_flutter');
+      savePath = (await getApplicationSupportDirectory()).path;
 
       if (episodeId != null) {
         savePath = path.join(savePath, itemId, episodeId);
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "abs_flutter")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "de.vito.absapp.abs_flutter")
+set(APPLICATION_ID "io.github.vito0912.abs_flutter")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/linux/io.github.vito0912.abs_flutter.appdata.xml b/linux/io.github.vito0912.abs_flutter.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>io.github.vito0912.abs_flutter</id>
+
+  <name>Buchable</name>
+  <summary>Enjoy hearing self-hosted audiobooks.</summary>
+
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+
+  <description>
+    <p>
+      test
+    </p>
+  </description>
+
+  <launchable type="desktop-id">io.github.vito0912.abs_flutter.desktop</launchable>
+</component>
diff --git a/linux/my_application.cc b/linux/my_application.cc
@@ -20,32 +20,7 @@ static void my_application_activate(GApplication* application) {
   GtkWindow* window =
       GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
 
-  // Use a header bar when running in GNOME as this is the common style used
-  // by applications and is the setup most users will be using (e.g. Ubuntu
-  // desktop).
-  // If running on X and not using GNOME then just use a traditional title bar
-  // in case the window manager does more exotic layout, e.g. tiling.
-  // If running on Wayland assume the header bar will work (may need changing
-  // if future cases occur).
-  gboolean use_header_bar = TRUE;
-#ifdef GDK_WINDOWING_X11
-  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen)) {
-    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-      use_header_bar = FALSE;
-    }
-  }
-#endif
-  if (use_header_bar) {
-    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "abs_flutter");
-    gtk_header_bar_set_show_close_button(header_bar, TRUE);
-    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  } else {
-    gtk_window_set_title(window, "abs_flutter");
-  }
+  gtk_window_set_title(window, "Buchable");
 
   gtk_window_set_default_size(window, 1280, 720);
   gtk_widget_show(GTK_WIDGET(window));
@@ -117,6 +92,8 @@ static void my_application_class_init(MyApplicationClass* klass) {
 static void my_application_init(MyApplication* self) {}
 
 MyApplication* my_application_new() {
+  g_set_prgname(APPLICATION_ID);
+
   return MY_APPLICATION(g_object_new(my_application_get_type(),
                                      "application-id", APPLICATION_ID,
                                      "flags", G_APPLICATION_NON_UNIQUE,
diff --git a/pubspec.lock b/pubspec.lock
@@ -72,11 +72,12 @@ packages:
   audio_service_mpris:
     dependency: "direct main"
     description:
-      name: audio_service_mpris
-      sha256: b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.5"
+      path: "."
+      ref: ad6f743b73e320670449026fa1852d9978438bb9
+      resolved-ref: ad6f743b73e320670449026fa1852d9978438bb9
+      url: "https://github.com/Feichtmeier/audio-service-mpris"
+    source: git
+    version: "0.1.3"
   audio_service_platform_interface:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -35,7 +35,10 @@ dependencies:
   audio_service: ^0.18.15
   package_info_plus: ^8.0.1
   just_audio_windows: ^0.2.2
-  audio_service_mpris: ^0.1.5
+  audio_service_mpris:
+    git:
+      url: https://github.com/Feichtmeier/audio-service-mpris
+      ref: ad6f743b73e320670449026fa1852d9978438bb9
   just_audio_media_kit: 2.0.3
   flutter_settings_screens: ^0.3.4
   device_info_plus: ^10.1.1
diff --git a/snap/gui/app_icon.desktop b/snap/gui/app_icon.desktop
diff --git a/snap/gui/buchable.desktop b/snap/gui/buchable.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Buchable
+Comment=Enjoy hearing self-hosted audiobooks.
+Exec=buchable
+Type=Application
+Icon=${SNAP}/meta/gui/buchable.png
+Terminal=false
+Keywords=Audiobook,Player,Audiobookshelf,Listen;
+Categories=Multimedia;Audio;AudioVideo;Player;
+MimeType=audio/*;video/*;
+X-GNOME-UsesNotifications=true
+StartupWMClass=buchable
diff --git a/snap/gui/buchable.png b/snap/gui/buchable.png
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,38 +1,83 @@
 name: buchable
-version: 1.4.0
-summary: An ABS app
-description: Client for Audiobookshelf
+version: 1.7.8
+summary: Enjoy hearing self-hosted audiobooks.
+description: testtesttesttestttest
+website: https://github.com/Vito0912/abs_flutter
+contact: fito0912@duck.com
+source-code: https://github.com/Vito0912/abs_flutter
+icon: snap/gui/buchable.png
 
 confinement: strict
-base: core22
+base: core22 # We could also use core24.
 grade: stable
+license: BSD-3-Clause
+
+# For now we just stay on x64_86
+architectures:
+  - build-on: amd64
+    build-for: amd64
 
 slots:
-  dbus-buchable:
-    interface: dbus
-    bus: session
-    name: org.bar.buchable
+  mpris: # We need this so package:audio_service has proper permissions to function.
+    interface: mpris
+    name: ABSPlayback
 
 apps:
   buchable:
-    command: buchable
-    extensions: [gnome]
+    command: abs_flutter # Name of the executable file.
+    extensions: [gnome] # Provides various graphics libraries (like GTK) or so.
     plugs:
+      # Support for every desktop out there.
+      - desktop
+      - desktop-legacy
+      - wayland
+
       - network
+
+      # No auto-connect! Need to ask for permission. (package:ConnectivityPlus needs it to access NetworkManager)
+      - network-manager-observe
+
+      # There are some ALSA warnings/errors but they can be ignored.
+      - audio-playback
     slots:
-      - dbus-super-cool-app
+      - mpris
+    environment:
+      # Needed because the app needs to access libmpv and other associated libraries.
+      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/caca:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vdpau:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/mfx
+
 parts:
-  buchable:
-    source: .
-    plugin: flutter
-    flutter-target: lib/main.dart
-  uet-lms:
+  buchable: # Entrypoint for the app.
     source: .
     plugin: flutter
     flutter-target: lib/main.dart
+
+    # Needed for permissions
     build-packages:
       - libsecret-1-dev
       - libjsoncpp-dev
     stage-packages:
       - libsecret-1-0
-      - libjsoncpp-dev
+
+      # Needed for MediaKit
+      - libmpv-dev
+
+  # This part removes all the files in this snap which already exist in
+  # connected content and base snaps. Since these files will be available
+  # at runtime from the content and base snaps, they do not need to be
+  # included in this snap itself.
+  #
+  # More info: https://forum.snapcraft.io/t/reducing-the-size-of-desktop-snaps/17280#heading--cleanup-part
+  #
+  cleanup:
+    after: # Make this part run last; list all your other parts here
+      - buchable
+    plugin: nil
+    build-snaps: # List all content-snaps and base snaps you're using here
+      - core22
+      - gtk-common-themes
+      - gnome-42-2204 # (core22 version)
+    override-prime: |
+      set -eux
+      for snap in "core22" "gtk-common-themes" "gnome-42-2204"; do  # List all content-snaps and base snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
+      done
