Merge branch 'rmcrackan:master' into master

.github/workflows/validate-appstream-metainfo.yaml

@@ -0,0 +1,22 @@
+name: Validate MetaInfo
+"on":
+  pull_request:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-appstream-metainfo.yml
+      - Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml
+  push:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-appstream-metainfo.yml
+      - Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml
+
+jobs:
+  validate-appstream-metainfo:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub/flatpak-builder-lint:latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check the MetaInfo file
+        run: flatpak-builder-lint appstream Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml

.github/workflows/validate-desktop-file.yaml

@@ -0,0 +1,21 @@
+name: Check desktop file
+"on":
+  pull_request:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-desktop-file.yml
+      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
+  push:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-desktop-file.yml
+      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
+
+jobs:
+  validate-desktop-file:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo apt --yes install desktop-file-utils
+      - name: Check the desktop file
+        run: desktop-file-validate Source/LoadByOS/LinuxConfigApp/Libation.desktop

Scripts/Bundle_MacOS.sh

@@ -86,8 +86,12 @@ delfiles=( 'libmp3lame.arm64.so' 'libmp3lame.x64.so' 'libmp3lame.x64.dll' 'libmp
 if [[ "$ARCH" == "arm64" ]]
 then
   delfiles+=('libmp3lame.x64.dylib' 'ffmpegaac.x64.dylib')
+  mv $BUNDLE_MACOS/ffmpegaac.arm64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.arm64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
 else
   delfiles+=('libmp3lame.arm64.dylib' 'ffmpegaac.arm64.dylib')
+  mv $BUNDLE_MACOS/ffmpegaac.x64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.x64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
 fi
 
 
@@ -111,4 +115,4 @@ mv $APP_FILE ./bundle/$APP_FILE
 
 rm -r $BUNDLE
 
-echo "Done!"
+echo "Done!"

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>11.5.1.1</Version>
+    <Version>11.5.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="11.0.1" />

Source/LoadByOS/LinuxConfigApp/Libation.desktop

@@ -6,3 +6,5 @@ Comment=Liberate your Audiobooks
 Terminal=false
 Type=Application
 MimeType=x-content/unix-software;
+Categories=Audio;AudioVideo;
+Keywords=audible;audio;audiobook;book;

Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2024 rmcrackan <[email protected]> -->
+<component type="desktop-application">
+  <id>com.getlibation.Libation</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-3.0-only</project_license>
+  <content_rating type="oars-1.1" />
+  <name>Libation</name>
+  <summary>Liberate your Audiobooks</summary>
+  <developer id="com.getlibation">
+    <name>rmcrackan</name>
+  </developer>
+  <update_contact>[email protected]</update_contact>
+  <description>
+    <p>Free and open source app to manage your Audible books.</p>
+    <ul>
+      <li>Import library from audible, including cover art</li>
+      <li>Download and remove DRM from all books</li>
+      <li>Download accompanying PDFs</li>
+      <li>Add tags to books for better organization</li>
+      <li>Powerful advanced search built on the Lucene search engine</li>
+      <li>Customizable saved filters for common searches</li>
+      <li>Open source</li>
+      <li>Supports all regions: US, UK, Canada, Germany, France, Australia, Japan, India, and Spain</li>
+    </ul>
+  </description>
+  <launchable type="desktop-id">com.getlibation.Libation.desktop</launchable>
+  <url type="bugtracker">https://github.com/rmcrackan/Libation/issues</url>
+  <url type="donation">https://paypal.me/mcrackan?locale.x=en_us</url>
+  <url type="homepage">https://getlibation.com</url>
+  <url type="vcs-browser">https://github.com/rmcrackan/Libation</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/main-page-light.png</image>
+      <caption>Listing of audiobooks</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/main-page-dark.png</image>
+      <caption>Listing of audiobooks</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/filter.png</image>
+      <caption>Filtered listing of audiobooks</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/important-settings.png</image>
+      <caption>Settings page with basic settings</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/audio-file-settings.png</image>
+      <caption>Settings for audio file format and conversion</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/download-decrypt-settings.png</image>
+      <caption>Download and decrypt settings</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/Source/LoadByOS/LinuxConfigApp/screenshots/accounts.png</image>
+      <caption>Account list</caption>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="11.5.2" date="2024-10-25">
+      <description>
+        <p>Update Bundle_MacOS.sh to address #854, #1020</p>
+      </description>
+    </release>
+    <release version="11.1" date="2023-10-18">
+      <description>
+        <p>New locale: Brazil</p>
+      </description>
+    </release>
+  </releases>
+</component>