Skip to content

Commit

Permalink
Show total number of programs available in -l... (#1113)
Browse files Browse the repository at this point in the history 
* Show total number of programs available in `-l`...

...and keep all the lists locally so you can consult them offline, in case of no connection.

* Update APP-MANAGER

* Update APP-MANAGER

* Extend `--pkg` flag to `-q` for programs from Toolpacks database

* Add the .toolpack extension in the Toolpacks completion terms...

...this improves speed in `-i` (and without adding the flag) and `-a`

* Update APP-MANAGER

* Update APP-MANAGER

...use local list of toolpacks for completion terms

* Improves the speed of Toolpack list creation

* Update database.am

...option `-l`, suggest the use of the `--all` flag

* Update APP-MANAGER
  • Loading branch information
@ivan-hc
ivan-hc authored Nov 13, 2024
1 parent fc30b2b commit 37d8edd
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 42 deletions.
35 changes: 29 additions & 6 deletions APP-MANAGER
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

AMVERSION="9.1-6"
AMVERSION="9.1.1"

# Determine main repository and branch
AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
Expand Down Expand Up @@ -362,7 +362,7 @@ _am_newrepo_check "$@"

# 3RD PARTY SOURCES -- TOOLPACK
toolpack_repo="https://github.com/Azathothas/Toolpacks"
export toolpack_readme="https://bin.pkgforge.dev/${ARCH}/AM.txt"
toolpack_readme="https://bin.pkgforge.dev/${ARCH}/AM.txt"
export toolpack_name="1" toolpack_description="2" toolpack_site="3" toolpack_dl="4" toolpack_ver="5"

################################################################################
Expand All @@ -380,7 +380,7 @@ function _completion_lists() {
# Remove existing lists and download new ones
curl -Ls "$APPSLISTDB" > "$AMDATADIR/$arch-apps"
awk -v FS="(◆ | : )" '{print $2}' <"$AMDATADIR"/"$arch"-apps > "$AMDATADIR"/list
curl -Ls "$toolpack_readme" | grep -v "\.appimage " 2>/dev/null | cut -d' ' -f2- | awk '{print $1}' | uniq >> "$AMDATADIR"/list
[ -f "$AMDATADIR"/"$ARCH"-toolpack ] && awk '{print $2}' "$AMDATADIR"/"$ARCH"-toolpack | sed -e 's/$/.toolpack/' >> "$AMDATADIR"/list
# Append options to the list
for o in $available_options; do
echo "$o" >> "$AMDATADIR"/list
Expand Down Expand Up @@ -699,6 +699,27 @@ function _sync_installation_scripts() {
done
}

function _sync_appimages_list() {
rm -f "$AMDATADIR/$ARCH-appimages"
APPIMAGE_NAMES=$(curl -Ls https://portable-linux-apps.github.io/appimages.md | tr '/)' '\n' | grep -i ".md$" | uniq | sed 's/.md$//g' | grep -v "\[")
for appimage in $APPIMAGE_NAMES; do
grep "◆ $appimage :" "$AMDATADIR/$ARCH-apps" >> "$AMDATADIR/$ARCH-appimages" &
done
wait
}

function _sync_toolpacks_list() {
rm -f "$AMDATADIR/$ARCH-toolpack"
curl -Ls "$toolpack_readme" | grep -v "\.appimage " | cut -d":" -f1 | cut -d"@" -f2 | sed 's/^| /◆ /g; s/ | https$/./g; s/ | / : /g' > "$AMDATADIR/$ARCH-toolpack"
}

function _sync_databases() {
echo -e "$DIVIDING_LINE\n Check and update offline lists of additional databases..."
_sync_appimages_list
_sync_toolpacks_list
_completion_lists
}

function _sync_modules() {
echo -e "$DIVIDING_LINE\n Check for updates in modules..."
MODULES=$(curl -Ls "$AMREPO/APP-MANAGER" | tr '"' '\n' | grep "[a-z]\.am$")
Expand All @@ -723,7 +744,6 @@ function _sync_modules() {

function _sync_amcli() {
echo "$DIVIDING_LINE"
_completion_lists
CURRENT_AM_VERSION="$AMVERSION"
echo -ne "\n ◆ SYNCHRONIZING \"$AMCLIUPPER\" VERSION \"$CURRENT_AM_VERSION\"...\r" && sleep 0.25
_clean_amcachedir 1>/dev/null
Expand All @@ -746,6 +766,7 @@ function _use_sync() {
_online_check
_betatester_message_on
_sync_installation_scripts
_sync_databases
if [ "$(realpath "$0")" != "/usr/bin/am" ]; then
_sync_modules
_sync_amcli
Expand Down Expand Up @@ -1128,7 +1149,8 @@ case "$1" in
${LightBlue}$AMCLI -l
${LightBlue}$AMCLI -l --all
${LightBlue}$AMCLI -l --appimages\033[0m
${LightBlue}$AMCLI -l --appimages
${LightBlue}$AMCLI -l --toolpack {KEYWORD}\033[0m
Description: Shows the list of all the apps available, or just the AppImages. It can also be extended with additional flags, the \"--all\" flag allows you to consult the set of all supported databases (see \"--toolpack\").
Expand Down Expand Up @@ -1159,7 +1181,8 @@ case "$1" in
${LightBlue}$AMCLI -q {KEYWORD}
${LightBlue}$AMCLI -q --all {KEYWORD}
${LightBlue}$AMCLI -q --appimages {KEYWORD}
${LightBlue}$AMCLI -q --pkg {PROGRAM1} {PROGRAM2}\033[0m
${LightBlue}$AMCLI -q --pkg {PROGRAM1} {PROGRAM2}
${LightBlue}$AMCLI -q --toolpack {KEYWORD}\033[0m
Description: Search for keywords in the list of available applications, add the \"--appimages\" option to list only the AppImages or add \"--pkg\" to list multiple programs at once. It can also be extended with additional flags, the \"--all\" flag allows you to consult the set of all supported databases (see \"--toolpack\").
Expand Down
78 changes: 42 additions & 36 deletions modules/database.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@ _list() {
APPSNUMBER=$(("$ITEMSNUMBER" - "$LIBNUMBER"))
# Determine the number of available apps from the list
AVAILABLE_APPS_NUMBER=$(grep -v "ffwa-\|\"kdegames\"\|\"kdeutils\"\|\"node\"\|\"platform-tools\"" "$AMDATADIR/$ARCH-apps" | grep -e "$" -c)
if ! test -f "$AMDATADIR/$ARCH-appimages"; then
_online_check
_sync_appimages_list
AVAILABLE_APPIMAGES_NUMBER=$(grep -e "$" -c "$AMDATADIR/$ARCH-appimages")
else
AVAILABLE_APPIMAGES_NUMBER=$(grep -e "$" -c "$AMDATADIR/$ARCH-appimages")
fi
if ! test -f "$AMDATADIR/$ARCH-toolpack"; then
_online_check
_sync_toolpacks_list
AVAILABLE_TOOLPACKS_NUMBER=$(grep -e "$" -c "$AMDATADIR/$ARCH-toolpack")
else
AVAILABLE_TOOLPACKS_NUMBER=$(grep -e "$" -c "$AMDATADIR/$ARCH-toolpack")
fi
[ -n "$AVAILABLE_TOOLPACKS_NUMBER" ] && AVAILABLE_TOTAL_APPS_NUMBER=$(("$AVAILABLE_APPS_NUMBER" + "$AVAILABLE_TOOLPACKS_NUMBER"))
# Generate a list of the installed apps with version
[ ! -f "$AMCACHEDIR"/version-args ] && _check_version
if [ -n "$APPMAN_ITEMS" ]; then
Expand All @@ -336,77 +351,67 @@ _list() {
if [ "$LIBNUMBER" != 0 ]; then
# Check if the installed libraries are more than one
if [ "$LIBNUMBER" = 1 ]; then
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $AVAILABLE_APPS_NUMBER AVAILABLE, AND $LIBNUMBER LIBRARY"
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER PROGRAMS OUT OF $AVAILABLE_TOTAL_APPS_NUMBER AVAILABLE, AND $LIBNUMBER LIBRARY"
else
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $AVAILABLE_APPS_NUMBER AVAILABLE, AND $LIBNUMBER LIBRARIES"
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER PROGRAMS OUT OF $AVAILABLE_TOTAL_APPS_NUMBER AVAILABLE, AND $LIBNUMBER LIBRARIES"
fi
else
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER APPLICATIONS OUT OF $AVAILABLE_APPS_NUMBER AVAILABLE"
MESSAGE=" YOU HAVE INSTALLED $APPSNUMBER PROGRAMS OUT OF $AVAILABLE_TOTAL_APPS_NUMBER AVAILABLE"
fi
}

_list_appimages() {
# Determine the number of available apps
APPIMAGE_NAMES=$(curl -Ls https://portable-linux-apps.github.io/appimages.md | tr '/)' '\n' | grep -i ".md$" | uniq | sed 's/.md$//g' | grep -v "\[")
if ! test -f "$AMCACHEDIR/$ARCH-appimages"; then
wget -q --tries=10 --timeout=20 --spider https://github.com && _sync_appimages_list
if ! test -f "$AMDATADIR/$ARCH-appimages"; then
_online_check
for appimage in $APPIMAGE_NAMES; do
grep "◆ $appimage :" "$AMDATADIR/$ARCH-apps" >> "$AMCACHEDIR/$ARCH-appimages" &
done
wait
_sync_appimages_list
fi
AVAILABLE_APPIMAGES_NUMBER=$(grep -e "$" -c "$AMCACHEDIR/$ARCH-appimages")
}

_list_toolpacks() {
# Determine the number of available apps
if ! test -f "$AMCACHEDIR/$ARCH-toolpack"; then
wget -q --tries=10 --timeout=20 --spider https://github.com && _sync_toolpacks_list
if ! test -f "$AMDATADIR/$ARCH-toolpack"; then
_online_check
toolpack_md=$(curl -Ls "$toolpack_readme" | grep -v "\.appimage ")
TOOLPACK_NAMES=$(echo "$toolpack_md" | cut -d' ' -f2- | awk '{print $1}')
for toolpack in $TOOLPACK_NAMES; do
toolpack_arg=$(echo "$toolpack_md" | grep -i "^| $toolpack " | tr '|' '\n' | cut -c 2- | grep .) \
&& toolpack_about_description=$(echo "$toolpack_arg" | awk -F: "NR==$toolpack_description" | sed 's/ $/./g') \
&& echo "◆ $toolpack : $toolpack_about_description" >> "$AMCACHEDIR/$ARCH-toolpack" &
done
wait
sort "$AMCACHEDIR/$ARCH-toolpack" | uniq > "$AMCACHEDIR/$ARCH-toolpack-new" && mv "$AMCACHEDIR/$ARCH-toolpack-new" "$AMCACHEDIR/$ARCH-toolpack" || exit 1
_sync_toolpacks_list
fi
AVAILABLE_TOOLPACKS_NUMBER=$(grep -e "$" -c "$AMCACHEDIR/$ARCH-toolpack")
}

_list_msg_head() {
echo "" && echo "$MESSAGE" && echo "" && echo "$MESSAGE2" && echo ""
}

_list_msg_suggest_all() {
printf "\n To list all installable programs, use the \"%b--all\033[0m\" flag\n" "${LightBlue}"
}

_list_msg_footer() {
echo "$LIST" && echo ""
}

_list_toolpacks_msg() {
_list_msg_head
echo " LIST OF THE $AVAILABLE_TOOLPACKS_NUMBER TOOLPACK PROGRAMS AVAILABLE:"
echo " LIST OF THE $AVAILABLE_TOOLPACKS_NUMBER PROGRAMS AVAILABLE IN THE \"TOOLPACKS\" DATABASE:"
_list_msg_suggest_all
_list_msg_footer
}

_list_appimages_msg() {
_list_msg_head
echo " LIST OF THE $AVAILABLE_APPIMAGES_NUMBER APPIMAGES AVAILABLE IN THE 'AM' REPOSITORY:"
echo " LIST OF THE $AVAILABLE_APPIMAGES_NUMBER APPIMAGES AVAILABLE IN THE \"AM\" DATABASE:"
_list_msg_suggest_all
_list_msg_footer
}

_list_apps_msg() {
_list_msg_head
echo " LIST OF THE $AVAILABLE_APPS_NUMBER APPLICATIONS AVAILABLE IN THE 'AM' REPOSITORY:"
echo " LIST OF THE $AVAILABLE_APPS_NUMBER PROGRAMS AVAILABLE IN THE \"AM\" DATABASE:"
_list_msg_suggest_all
_list_msg_footer
}

_list_apps_all_msg() {
_list_msg_head
AVAILABLE_APPS_NUMBER=$(grep -v "ffwa-\|\"kdegames\"\|\"kdeutils\"\|\"node\"\|\"platform-tools\"" "$AMDATADIR/$ARCH-apps" | grep -e "$" -c)
AVAILABLE_TOOLPACKS_NUMBER=$(grep -e "$" -c "$AMCACHEDIR/$ARCH-toolpack")
AVAILABLE_TOTAL_PROGRAMS=$(("$AVAILABLE_APPS_NUMBER" + "$AVAILABLE_TOOLPACKS_NUMBER"))
echo " LIST OF THE $AVAILABLE_TOTAL_PROGRAMS PROGRAMS AVAILABLE IN ALL OUR SUPPORTED DATABASES:"
echo " LIST OF THE $AVAILABLE_TOTAL_APPS_NUMBER PROGRAMS AVAILABLE IN ALL SUPPORTED DATABASES:"
_list_msg_footer
}

Expand Down Expand Up @@ -455,21 +460,21 @@ case "$1" in
_list
if [ "$2" = --all ]; then
_list_toolpacks
LIST=$(sort "$AMDATADIR/$ARCH-apps" "$AMCACHEDIR/$ARCH-toolpack" | uniq | _pretty_list)
LIST=$(sort "$AMDATADIR/$ARCH-apps" "$AMDATADIR/$ARCH-toolpack" | uniq | _pretty_list)
_list_apps_all_msg | less -Ir
echo "$DIVIDING_LINE"
echo " $(("$AVAILABLE_APPS_NUMBER" + "$AVAILABLE_TOOLPACKS_NUMBER")) programs in all supported databases"
echo "$DIVIDING_LINE"
elif [ "$2" = --appimages ]; then
_list_appimages
LIST=$(sort "$AMCACHEDIR/$ARCH-appimages" | _pretty_list)
LIST=$(sort "$AMDATADIR/$ARCH-appimages" | _pretty_list)
_list_appimages_msg | less -Ir
echo "$DIVIDING_LINE"
echo " $AVAILABLE_APPIMAGES_NUMBER AppImages in the \"AM\" database"
echo "$DIVIDING_LINE"
elif [ "$2" = --toolpack ]; then
_list_toolpacks
LIST=$(sort "$AMCACHEDIR/$ARCH-toolpack" | _pretty_list)
LIST=$(sort "$AMDATADIR/$ARCH-toolpack" | _pretty_list)
_list_toolpacks_msg | less -Ir
echo "$DIVIDING_LINE"
echo " $AVAILABLE_TOOLPACKS_NUMBER programs in the \"Toolpacks\" database"
Expand All @@ -496,24 +501,25 @@ case "$1" in
entries="$(echo "$@" | cut -f3- -d ' ' | tr -s ' ' '|')"
printf "\n Search results for packages: %s\n\n" "$entries" | tr '[:lower:]' '[:upper:]'
grep -iE "$entries" "$AMDATADIR/$ARCH-apps" --color=always | _pretty_list_compat
[ -f "$AMDATADIR/$ARCH-toolpack" ] && grep -iE "$entries" "$AMDATADIR/$ARCH-toolpack" --color=always | _pretty_list_compat
elif [ "$2" = --appimages ]; then
entries="$(echo "$@" | cut -f3- -d ' ')"
printf "\n Search results for \"%s\":\n\n" "$entries" | tr '[:lower:]' '[:upper:]'
pattern="$(echo "$entries" | sed 's/ /(?=.*/g; s/$/)/g; s/(/)(/g; s/^/(?=.*/g;')"
_list_appimages
grep -Pi "$pattern" "$AMCACHEDIR/$ARCH-appimages" | _pretty_list_compat
grep -Pi "$pattern" "$AMDATADIR/$ARCH-appimages" | _pretty_list_compat
elif [ "$2" = --toolpack ]; then
entries="$(echo "$@" | cut -f3- -d ' ')"
printf "\n Search results for \"%s\":\n\n" "$entries" | tr '[:lower:]' '[:upper:]'
pattern="$(echo "$entries" | sed 's/ /(?=.*/g; s/$/)/g; s/(/)(/g; s/^/(?=.*/g;')"
_list_toolpacks
grep -Pi "$pattern" "$AMCACHEDIR/$ARCH-toolpack" | _pretty_list_compat
grep -Pi "$pattern" "$AMDATADIR/$ARCH-toolpack" | _pretty_list_compat
elif [ "$2" = --all ]; then
entries="$(echo "$@" | cut -f3- -d ' ')"
printf "\n Search results for \"%s\":\n\n" "$entries" | tr '[:lower:]' '[:upper:]'
pattern="$(echo "$entries" | sed 's/ /(?=.*/g; s/$/)/g; s/(/)(/g; s/^/(?=.*/g;')"
_list_toolpacks
sort "$AMCACHEDIR/$ARCH-toolpack" "$AMDATADIR/$ARCH-apps" | grep -Pi "$pattern" | _pretty_list_compat
sort "$AMDATADIR/$ARCH-toolpack" "$AMDATADIR/$ARCH-apps" | grep -Pi "$pattern" | _pretty_list_compat
else
entries="$(echo "$@" | cut -f2- -d ' ')"
printf "\n Search results for \"%s\":\n\n" "$entries" | tr '[:lower:]' '[:upper:]'
Expand Down

0 comments on commit 37d8edd

Please sign in to comment.