Separate official from community AppImages

.github/workflows/test.yml

@@ -59,7 +59,7 @@ jobs:
         # until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway
         # Find out which files in data/ have been changed in the last commit
         #set -x    # Debug #379
-        FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2-| sed -e 's|dev/null||g')
+        FILES=$(git log -1 -p data/* | grep "+++" | cut -d '/' -f 2- | grep -v "dev/null" | grep -v "README.md")
         echo "Last changed files from the FILES variable:"
         echo "$FILES" ; if [ -z "$FILES" ] ; then echo "Variable FILES is empty." && exit 1 ; fi
         # Work on these files that have been changed in the last commit

apps/AppImagePool.md

@@ -2,23 +2,19 @@
 layout: app
 
 permalink: /AppImagePool/
+
+official: true
 description: A simple, modern AppImageHub Client.
 license: GPL-3.0-only
 
 icons:
   - AppImagePool/icons/scalable/appimagepool.svg
 screenshots:
-- https://github.com/prateekmedia/appimagepool/blob/main/assets/screenshot/home.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/main/assets/screenshot/category.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/main/assets/screenshot/app.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/main/assets/screenshot/search.jpg?raw=true
+- https://github.com/prateekmedia/appimagepool/blob/5.0.0/assets/screenshot/home.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/5.0.0/assets/screenshot/category.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/5.0.0/assets/screenshot/app.jpg?raw=truehttps://github.com/prateekmedia/appimagepool/blob/5.0.0/assets/screenshot/search.jpg?raw=true
 
 authors:
-  - name: prateekmedia
-    url: https://github.com/prateekmedia
 
 links:
-  - type: GitHub
-    url: prateekmedia/appimagepool
-  - type: Download
-    url: https://github.com/prateekmedia/appimagepool/releases
 
 desktop:
   Desktop Entry:
@@ -31,12 +27,14 @@ desktop:
     Categories: Utility
     Keywords: AppImage
   AppImageHub:
-    X-AppImage-Signature: 'directory ''/home/runner/.gnupg'' created keybox ''/home/runner/.gnupg/pubring.kbx''
-      created [don''t know]: invalid packet (ctb=0a) no signature found the signature
-      could not be verified. Please remember that the signature file (.sig or .asc)
-      should be the first file given on the command line.'
+    X-IsOfficial: true
+    X-AppImage-Signature: 'keybox ''/home/runner/.gnupg/pubring.kbx'' created [don''t
+      know]: invalid packet (ctb=0a) no signature found the signature could not be verified.
+      Please remember that the signature file (.sig or .asc) should be the first file
+      given on the command line.'
     X-AppImage-Type: 2
     X-AppImage-Architecture: x86_64
+    X-AppImage-Payload-License: GPL-3.0
 
 appdata:
   Type: desktop-application
@@ -49,18 +47,15 @@ appdata:
     C: >-
       <p>Simple AppImageHub Client</p>
 
-      <p>Top Features:</p>
+      <p>Main Highlights:</p>
 
       <ul>
-        <li>FLOSS and non profit app</li>
-        <li>Simple categories</li>
+        <li>Simplified categories</li>
         <li>Download from github directly, no extra-server involved</li>
-        <li>Upgrade and Downgrade appimages easily</li>
+        <li>Integrate and Disintegrate appimages easily from your system</li>
         <li>Version History and multi download support</li>
-        <li>Fast downloader</li>
+        <li>FLOSS and non profit app</li>
       </ul>
-
-      <p>Note : Some features are not implemented yet.</p>
   DeveloperName:
     C: prateekmedia
   ProjectLicense: GPL-3.0-only
@@ -72,9 +67,33 @@ appdata:
   Screenshots:
   - thumbnails: []
     source-image:
-      url: https://github.com/prateekmedia/appimagepool/blob/main/assets/screenshot/search.jpg?raw=true
+      url: https://github.com/prateekmedia/appimagepool/blob/5.0.0/assets/screenshot/search.jpg?raw=true
       lang: C
   Releases:
+  - version: 5.0.0
+    unix-timestamp: 1648252800
+  - version: 4.9.9
+    unix-timestamp: 1609977600
+  - version: 4.9.0
+    unix-timestamp: 1639872000
+  - version: 4.4.0
+    unix-timestamp: 1636675200
+  - version: 4.0.0
+    unix-timestamp: 1634256000
+  - version: 3.0.0
+    unix-timestamp: 1632873600
+  - version: 2.9.0
+    unix-timestamp: 1632787200
+  - version: 2.6.6
+    unix-timestamp: 1632700800
+  - version: 2.6.0
+    unix-timestamp: 1632700800
+  - version: 2.5.0
+    unix-timestamp: 1632096000
+  - version: 2.4.1
+    unix-timestamp: 1631750400
+  - version: 2.4.0
+    unix-timestamp: 1630886400
   - version: 2.3.1
     unix-timestamp: 1630800000
   - version: 2.3.0

apps/Yuzu.md

@@ -0,0 +1,41 @@
+---
+layout: app
+
+permalink: /Yuzu/
+
+official: true
+description: Nintendo Switch video game console emulator
+
+icons:
+  - Yuzu/icons/scalable/yuzu.svg
+
+screenshots:
+  - Yuzu/screenshot.png
+
+authors:
+
+links:
+
+desktop:
+  Desktop Entry:
+    Version: 1.0
+    Type: Application
+    Name: yuzu
+    GenericName: Switch Emulator
+    Comment: Nintendo Switch video game console emulator
+    Icon: yuzu
+    TryExec: yuzu
+    Exec: yuzu %f
+    Categories: Game
+    MimeType: application/x-nx-nro
+    Keywords: Switch
+  AppImageHub:
+    X-IsOfficial: true
+    X-AppImage-UpdateInformation: gh-releases-zsync|yuzu-emu|yuzu-mainline|latest|yuzu-*.AppImage.zsync
+    X-AppImage-Signature: 'keybox ''/home/runner/.gnupg/pubring.kbx'' created [don''t
+      know]: invalid packet (ctb=0a) no signature found the signature could not be verified.
+      Please remember that the signature file (.sig or .asc) should be the first file
+      given on the command line.'
+    X-AppImage-Type: 2
+    X-AppImage-Architecture: x86_64
+---

code/worker.sh

@@ -35,14 +35,34 @@ if [ x"${URL:0:22}" == x"https://api.github.com" ] || [ x"${GHURL:0:22}" == x"ht
   if [ x"" == x"$URL" ] ; then
     URL=$(wget -q "$GHURL" -O - | grep browser_download_url | grep -i AppImage | grep -v 'AppImage\.' | head -n 1 | cut -d '"' -f 4) # No 64-bit one found, trying any; TODO: Handle more than one AppImage per release
   fi
+
+  # If neither found, try the same but without the token
+  # For some reason it causes issues sometimes
+  if [ x"" == x"$URL" ] ; then
+    NO_TOKEN=true
+    GHURL="https://api.github.com/repos/$GHUSER/$GHREPO/releases"
+    URL=$(wget -q "$GHURL" -O - | grep browser_download_url | grep -i AppImage | grep -v 'AppImage\.' | grep -ie 'amd.\?64\|x86.64\|x64\|linux.\?64' | head -n 1 | cut -d '"' -f 4) # TODO: Handle more than one AppImage per release
+  fi
+
+  if [ x"" == x"$URL" ] ; then
+    URL=$(wget -q "$GHURL" -O - | grep browser_download_url | grep -i AppImage | grep -v 'AppImage\.' | head -n 1 | cut -d '"' -f 4) # No 64-bit one found, trying any; TODO: Handle more than one AppImage per release
+  fi
+
   if [ x"" == x"$URL" ] ; then
     echo "Unable to get download URL for the AppImage. Is it really there on GitHub Releases?"
     exit 1
   fi
+
   echo "URL from GitHub API: $URL"
   GHUSER=$(echo "$URL" | cut -d '/' -f 4)
   GHREPO=$(echo "$URL" | cut -d '/' -f 5)
-  LICENSE=$(wget --header "Accept: application/vnd.github.drax-preview+json" "https://api.github.com/repos/$GHUSER/$GHREPO?access_token=$GH_TOKEN" -O - | grep spdx_id | cut -d '"' -f 4 | head -n 1)
+
+  if [ $NO_TOKEN ]; then
+    LICENSE=$(wget --header "Accept: application/vnd.github.drax-preview+json" "https://api.github.com/repos/$GHUSER/$GHREPO" -O - | grep spdx_id | cut -d '"' -f 4 | head -n 1)
+  else
+    LICENSE=$(wget --header "Accept: application/vnd.github.drax-preview+json" "https://api.github.com/repos/$GHUSER/$GHREPO?access_token=$GH_TOKEN" -O - | grep spdx_id | cut -d '"' -f 4 | head -n 1)
+  fi
+
 fi
 
 # Download the file if it is not already there
@@ -323,6 +343,13 @@ chmod 644 "$DATAFILE" # https://github.com/AppImage/AppImageHub/issues/19
 echo "" >> "$DATAFILE"
 echo "[AppImageHub]" >> "$DATAFILE"
 
+if [ "$(basename $(dirname $1))" = "official" ]; then
+  OFFICIAL_APPIMAGE="true"
+  echo "X-IsOfficial=true" >> "$DATAFILE"
+else
+  echo "X-IsOfficial=false" >> "$DATAFILE"
+fi
+
 if [ ! -z "$UPDATE_INFORMATION" ] ; then
   echo "X-AppImage-UpdateInformation=${UPDATE_INFORMATION}" >> "$DATAFILE"
 else
@@ -423,6 +450,14 @@ sudo chmod a+x appstreamcli-x86_64.AppImage
   echo "layout: app" >> apps/$INPUTBASENAME.md
   echo "" >> apps/$INPUTBASENAME.md
   echo "permalink: /$INPUTBASENAME/" >> apps/$INPUTBASENAME.md
+  echo "" >> apps/$INPUTBASENAME.md
+
+  if [ $OFFICIAL_APPIMAGE ]; then
+    echo "official: true" >> apps/$INPUTBASENAME.md
+  else
+    echo "official: false" >> apps/$INPUTBASENAME.md
+  fi
+
   # Description
   DESKTOP_COMMENT=$(grep "^Comment=.*" database/$INPUTBASENAME/*.desktop | cut -d '=' -f 2- )
   if [ -f database/$INPUTBASENAME/*appdata.xml ] ; then

data/README.md

@@ -0,0 +1,10 @@
+This is the directory that new AppImages should be submitted to.
+
+If you are the developer of an AppImage or are certain that the AppImage you
+want to add is official (eg: straight from the official website) it should be
+added under `official`. If you want to add a community-maintained AppImage, it
+must be added under `community`.
+
+Add a single file with the name of the application and inside that file add a
+single line, either pointing to a direct download to the AppImage, or to a
+GitHub page that hosts it under its releases.