From 84094188e9bec51732405e9b68062955874cb224 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Fri, 9 Apr 2021 19:27:48 -0500
Subject: [PATCH] api: better list management and all apps hide hidden apps

---
 api | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/api b/api
index 52ad38c..7aead60 100755
--- a/api
+++ b/api
@@ -15,6 +15,16 @@ else
   error "Failed to detect OS CPU architecture! Something is very wrong."
 fi
 
+list_intersect() { #Outputs only the apps that appear in both stdin and in $1
+  #                      change \n to \|     |   remove last "\|"
+  grep -x "$(echo "$1" | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+}
+
+list_subtract() { #Outputs a list of apps from stdin, minus the ones that appear in $1
+  #                       change \n to \|     |   remove last "\|"
+  grep -vx "$(echo "$1" | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+}
+
 list_apps() { #installed, uninstalled, corrupted, cpu_installable, online, online_only, local, local_only
   if [ -z "$1" ] || [ "$1" == local ];then
     #list all apps
@@ -22,47 +32,51 @@ list_apps() { #installed, uninstalled, corrupted, cpu_installable, online, onlin
     
   elif [ "$1" == installed ];then
     #list installed apps
-    #list apps|only show  (          list of installed apps                | remove match string  |   basename    | change \n to \|     |   remove last "\|"  )
-    list_apps | grep -x "$(grep -rx 'installed' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!' | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    #list apps|   only show      (          list of installed apps                | remove match string  |   basename   )
+    list_apps local | list_intersect "$(grep -rx 'installed' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!')"
     
   elif [ "$1" == corrupted ];then
     #list corrupted apps
-    #list apps|only show  (          list of corrupted apps                | remove match string  |   basename    | change \n to \|     |   remove last "\|"  )
-    list_apps | grep -x "$(grep -rx 'corrupted' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!' | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    #list apps|only show         (          list of corrupted apps                | remove match string  |   basename   )
+    list_apps local | list_intersect "$(grep -rx 'corrupted' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!')"
     
   elif [ "$1" == uninstalled ];then
     #list uninstalled apps
     #list apps that have a status file containing "uninstalled"
-    list_apps | grep -x "$(grep -rx 'uninstalled' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!' | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    list_apps local | list_intersect "$(grep -rx 'uninstalled' "${DIRECTORY}/data/status" | awk -F: '{print $1}' | sed 's!.*/!!')"
     #also list apps that don't have a status file
-    list_apps | grep -vx "$(ls "${DIRECTORY}/data/status" | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    list_apps local | list_subtract "$(ls "${DIRECTORY}/data/status")"
     
   elif [ "$1" == cpu_installable ];then
     #list apps that can be installed on the device's OS architecture (32-bit or 64-bit)
     #find all apps that have install-XX script or an install script
     find "${DIRECTORY}/apps" -type f \( -name "install-$arch" -o -name "install" \) | sed "s+/install-$arch++g" | sed "s+/install++g" | sed "s+${DIRECTORY}/apps/++g" | sort | uniq
     
+  elif [ "$1" == hidden ];then
+    #list apps that are hidden
+    cat "${DIRECTORY}/data/categories/structure" | grep '|hidden' | awk -F'|' '{print $1}'
+    
+  elif [ "$1" == visible ];then
+    #list apps that are in any other category but 'hidden'
+    cat "${DIRECTORY}/data/categories/structure" | grep -v '|hidden' | awk -F'|' '{print $1}'
+    
   elif [ "$1" == online ];then
     #list apps that exist on the online git repo
-    
     if [ -d "${DIRECTORY}/update/pi-apps/apps" ];then
       #if update folder exists, just use that
       ls "${DIRECTORY}/update/pi-apps/apps"
     else
-      #if update folder doesn't exist, then parse github HTML to get a lost of online apps. Horrible idea, but it works!
+      #if update folder doesn't exist, then parse github HTML to get a list of online apps. Horrible idea, but it works!
       wget -qO- "${repo_url}/tree/master/apps" | grep 'title=".*" data-pjax=' -o | sed 's/title="//g' | sed 's/" data-pjax=//g'
     fi
     
   elif [ "$1" == online_only ];then
     #list apps that exist only on the git repo, and not locally
-    
-    #                                           change \n to \|    |  remove last "\|"
-    list_apps online | grep -vx "$(list_apps | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    list_apps online | list_subtract "$(list_apps local)"
     
   elif [ "$1" == local_only ];then
     #list apps that exist only locally, and not on the git repo
-    #                                           change \n to \|    |  remove last "\|"
-    list_apps | grep -vx "$(list_apps online | sed -z 's/\n/\\|/g' | sed -z 's/\\|$/\n/g')"
+    list_apps local | list_subtract "$(list_apps online)"
     
   fi
   
@@ -120,7 +134,7 @@ app_categories() { #lists all apps in a virtual filesystem based on categories f
   list_apps installed | sed 's+^+Installed/+g'
   
   #show special All Apps category
-  list_apps cpu_installable | sed 's+^+All Apps/+g'
+  list_apps cpu_installable | list_intersect "$(list_apps visible)" | sed 's+^+All Apps/+g'
 }
 
 usercount() { # $1 is app name. if empty, all are shown.
@@ -137,3 +151,5 @@ usercount() { # $1 is app name. if empty, all are shown.
   
 }
 
+
+