Update zpi version to 0.0.9

- Updated version to 0.0.9
- Updated URLs to point to zpi instead of zrep
- Updated initialization messages to refer to zpi
- Updated messages to reflect zpi instead of zrep

README.md

@@ -1,31 +1,39 @@
 <img src="zrep-logo.png" width="150" align="left">
 
-# Zsh Repository Tool (zrep)
+# Zrep Package Installer (zpi)
 
-zrep is a powerful and user-friendly package manager for the Zsh shell. It allows you to easily install, manage, and share Zsh packages, such as plugins, themes, and scripts, directly from a central repository.
+zpi is a powerful and user-friendly package manager for the Zsh shell. It allows you to easily install, manage, and share Zsh packages, such as plugins, themes, and scripts, directly from a central repository.
+
+## What is it?
+
+`zpi` in and of itself is the command line tool that you use to install and manage scripts that are placed in `$fpath` used by Zsh. The packages are available on [the zrep website](https://zrep.kekepower.com) where you can, if you want to share your own scripts, register for an account. By sharing your scripts with the community, you are probably making somebody's day easier.
+
+You can read more in the Wiki.
 
 ## Key Features
 
-- **Easy Installation**: zrep simplifies the process of installing Zsh packages. With a single command, you can install packages from the zrep repository.
+- **Easy Installation**: zpi simplifies the process of installing Zsh packages. With a single command, you can install packages from the zrep repository.
 
-- **Package Management**: zrep provides a set of commands to manage your installed packages. You can list, enable, disable, update, and remove packages effortlessly.
+- **Package Management**: zpi provides a set of commands to manage your installed packages. You can list, enable, disable, update, and remove packages effortlessly.
 
 - **Centralized Repository**: All packages are stored in a central repository, making it convenient to discover and share Zsh packages with the community.
 
-- **Automatic Setup**: zrep automatically sets up the necessary configuration files and directories, ensuring a smooth integration with your Zsh environment.
+- **Automatic Setup**: zpi automatically sets up the necessary configuration files and directories, ensuring a smooth integration with your Zsh environment.
 
-- **Customizable**: zrep allows you to customize the installation directory and other settings through a configuration file.
+- **Customizable**: zpi allows you to customize the installation directory and other settings through a configuration file.
 
 ## Getting Started
 
-To start using zrep, simply run the `zrep init` command to initialize the tool. zrep will guide you through the setup process and create the required configuration files.
+To start using zpi, simply run the `zpi init` command to initialize the tool. zpi will guide you through the setup process and create the required configuration files.
 
-Once initialized, you can explore and install packages using commands like `zrep install <author/package>`, `zrep list`, and `zrep enable <author/package>`.
+Use the search function on **[the zrep website](https://zrep.kekepower.com)** to find useful scripts until a search function is added to the `zpi` script some time in the future.
+
+Once initialized, you can explore and install packages using commands like `zpi install <author/package>`, `zpi list`, and `zpi enable <author/package>`.
 
 ## Contributing
 
-zrep is an open-source project, and contributions are welcome! If you have any ideas, bug reports, or feature requests, please open an issue on the GitHub repository.
+zpi is an open-source project, and contributions are welcome! If you have any ideas, bug reports, or feature requests, please open an issue on the GitHub repository.
 
 ## License
 
-zrep is released under the MIT License.
+zpi is released under the MIT License.

zpi

@@ -2,13 +2,17 @@
 
 setopt extendedglob
 
-VERSION="0.0.6" # Wed-2024-04-03
+VERSION="0.0.9" # Sat-2024-04-06
-ZREP="Zsh Repository Tool"
+ZREP="Zrep Package Installer"
 # Define the default path to .zreprc
 ZREP_CONFIG="${HOME}/.zreprc"
 
 function zrep_fpath() {
     local base_dir="${1}"
+    local mode="${2:-generic}"  # Default mode is 'generic'
+
+    # Ensure globbing finds dotfiles and nullglob avoids empty directory issues
+    setopt local_options dotglob nullglob
 
     # Check if the base directory exists
     if [[ ! -d "${base_dir}" ]]; then
@@ -16,12 +20,28 @@ function zrep_fpath() {
         return 1
     fi
 
-    # Add directories containing at least one file to fpath
+    if [[ "${mode}" == "zrep_load" ]]; then
-    for dir in ${base_dir}/**/*(/N); do
+        # Specific mode for first_letter/author/script structure
-        if [[ -n $(ls -A "${dir}/") ]]; then
+        for one_char_dir in ${base_dir}/?; do
-            fpath=(${dir} $fpath)
+            [[ -d "${one_char_dir}" ]] || continue
-        fi
+
-    done
+            for script_dir in ${one_char_dir}/*/*(/); do
+                local script_name=$(basename "${script_dir}")
+                local matching_files=("${script_dir}/${script_name}".*)
+
+                if (( ${#matching_files} )); then
+                    fpath+=("${script_dir}")
+                fi
+            done
+        done
+    else
+        # Generic mode for any directory containing at least one file
+        for dir in ${base_dir}/**/*(/N); do
+            if [[ -n $(ls -A "${dir}/") ]]; then
+                fpath+=("${dir}")
+            fi
+        done
+    fi
 }
 
 if [[ ${1} != "init" ]]; then
@@ -89,7 +109,7 @@ function zrep_main_version_string() {
 function zrep_version() {
   zrep_msg info "\nCreated by kekePower - 2024"
   zrep_msg info "License: MIT"
-  zrep_msg info "https://git.kekepower.com/kekePower/zrep/"
+  zrep_msg info "https://git.kekepower.com/kekePower/zpi/"
   zrep_msg info "Please see '${base_colors[${current_theme[help]}]}${ZSH_SCRIPT:t} help${base_colors[end]}${base_colors[${current_theme[info]}]}' for more info${base_colors[end]}"
   exit
 }
@@ -115,6 +135,65 @@ function zrep_msg() {
     printf "%b\n" "${color}${message}${base_colors[end]}"
 }
 
+#################################################################################################
+# Function to URL-encode strings in Zsh
+zrep_search_url_encode() {
+    local string="${1}"
+    local strlen=${#string}
+    local encoded=""
+
+    for (( pos=0 ; pos<strlen ; pos++ )); do
+        c=${string:$pos:1}
+        case "$c" in
+            [-_.~a-zA-Z0-9] ) o="${c}" ;;
+            * )               printf -v o '%%%02x' "'$c"
+        esac
+        encoded+="${o}"
+    done
+
+    echo "${encoded}"
+    # This will output the URL-encoded string
+}
+
+# Function to perform a search query and process JSON response
+zrep_search() {
+    local searchTerm="${@}"
+
+    local encodedSearch=$(zrep_search_url_encode "${searchTerm}")
+
+    # Use the global_repo_url from the config associative array
+    local response=$(curl -s -A "${ZSH_SCRIPT:t} ${VERSION} (curl)" "${config[global_repo_url]}/find.php?s=${encodedSearch}")
+
+    # Determine if the JSON response is an object indicating "No scripts found"
+    local jsonType=$(echo "$response" | jq -r 'type')
+
+    zrep_msg std "\nSearch results:"
+    if [[ "$jsonType" == "object" ]]; then
+        # Assuming an object type indicates a message field exists
+        local message=$(echo "$response" | jq -r '.message')
+        echo "$message"
+        return 0
+    elif [[ "$jsonType" == "array" ]]; then
+        # It's an array, process each item
+        echo "$response" | jq -c '.[]' | while IFS= read -r line; do
+            local script=$(echo "$line" | jq -r '.script')
+            local description=$(echo "$line" | jq -r '.description')
+            local url=$(echo "$line" | jq -r '.url')
+
+            # You can process these variables further as needed
+            zrep_msg other " * $script"
+            zrep_msg sub " - Description: $description"
+            zrep_msg sub " - $url"
+            # echo "-------------------------------------"
+        done
+    else
+        echo "Unexpected JSON format."
+        return 1
+    fi
+}
+
+############################################################################################
+
 # Function to check if a given string exists in ~/.zshrc
 function zrep_find_string() {
   local searchString="$1"
@@ -155,7 +234,7 @@ function zrep_init() {
     if [[ ! -f ${ZREP_CONFIG} ]]; then
         echo "${ZREP_CONFIG} not found. Creating it..."
         # Prompt user for install directory
-        read "install_dir?Enter zrep installation directory [${HOME}/.zrep]: "
+        read "install_dir?Enter zpi installation directory [${HOME}/.zrep]: "
         install_dir=${install_dir:-"${HOME}/.zrep"}
         mkdir -p ${install_dir}
         read "downloader?Choose command to download packages [curl, wget, wget2]: "
@@ -218,7 +297,7 @@ if [[ -n \${addons[@]} ]]; then
     autoload -Uz \$(basename \${addon})
     done
 else
-    echo "zrep: No addons enabled."
+    echo "zpi: No addons enabled."
 fi
 EOF
         echo "File .zrep_addons created and configured."
@@ -229,12 +308,12 @@ EOF
     if [[ ! -d ${install_dir}/themes ]]; then
         echo "Installing the Classic theme to ${install_dir}/themes"
         mkdir -p ${install_dir}/themes
-        zrep_global_downloader https://git.kekepower.com/kekePower/zrep/raw/branch/main/themes/classic -o ${install_dir}/themes/classic
+        zrep_global_downloader https://git.kekepower.com/kekePower/zpi/raw/branch/main/themes/classic -o ${install_dir}/themes/classic
     fi
-    echo "zrep initialization complete."
+    echo "zpi initialization complete."
-    echo "You should copy 'zrep' to a path in you 'PATH' so that it's accessible."
+    echo "You should copy 'zpi' to a path in you 'PATH' so that it's accessible."
     echo "For example '${HOME}/bin'"
-    echo "Remember to 'source ${zshrc_file}' to load the 'zrep' settings."
+    echo "Remember to 'source ${zshrc_file}' to load the 'zpi' settings."
 }
 
 function zrep_installed_json() {
@@ -264,17 +343,15 @@ function zrep_parse_remote() {
     json_data=$(zrep_global_downloader "${url}")
 
     # Directly extract the details based on author_name and script_name
-    dlurl=$(echo "${json_data}" | jq -r --arg author_name "$author_name" --arg script_name "$script_name" '.authors[] | select(.name==$author_name) | .scripts[] | select(.name==$script_name) | .dlurl')
     version=$(echo "${json_data}" | jq -r --arg author_name "$author_name" --arg script_name "$script_name" '.authors[] | select(.name==$author_name) | .scripts[] | select(.name==$script_name) | .version')
 
     # Check if the dlurl and version are found
-    if [[ -n "$dlurl" && -n "$version" ]]; then
+    if [[ -n "$version" ]]; then
         # Set the details as global
-        export author="$author_name"
+        #export author="$author_name"
-        export script="$script_name"
+        #export script="$script_name"
         export version
-        export dlurl
+        #export dlurl
-
     else
         zrep_msg debug "\nPackage ${package} not found.\n"
         exit 1
@@ -302,7 +379,7 @@ else
     .[$author] = [{"script": $script, "version": $version}]
 end' "$installed_json" > "$installed_json.tmp" && mv "$installed_json.tmp" "$installed_json"
 
-    zrep_msg info " - Package '$script' by '$author' version $version installed/updated successfully."
+    zrep_msg info "\n - Package '$author/$script' version $version installed/updated successfully."
 }
 
 # Function to list installed packages from installed.json
@@ -356,40 +433,19 @@ function zrep_list_package() {
     fi
 }
 
-# Function to load configuration
 function zrep_load_config() {
 
-    # Check if jq is available
+    if [[ ! -x $(which jq) ]]; then
-    if ! command -v jq &> /dev/null; then
         echo "Error: 'jq' is not installed. Please install jq to continue."
         exit 1
     fi
 
     if [[ -f "${ZREP_CONFIG}" ]]; then
         zini "${ZREP_CONFIG}"
-        zrep_fpath ${config[main_zrep_install_dir]}
+        zrep_fpath ${config[main_zrep_install_dir]} zrep_load
     else
-        if [[ "${1}" == "init" ]]; then
+        echo "${ZREP_CONFIG} not found. Run 'zpi init' to set up."
-            echo "\nWelcome to zrep. Looks like this is the first time you are"
+        exit 1
-            echo "running me."
-            read "response?Are you ready to set up zrep? (y/n): "
-            if [[ "${response}" =~ ^[Yy]$ ]]; then
-                zrep_init
-            else
-                echo "Setup aborted. Try again later."
-            fi
-        else
-            # echo "${ZREP_CONFIG} not found."
-            # Ask the user if they want to run 'zrep init'
-            echo "\nWelcome to zrep. I was unable to find the config file."
-            read "response?Would you like to run 'zrep init' to set up? (y/n): "
-            if [[ "${response}" =~ ^[Yy]$ ]]; then
-                zrep_init
-            else
-                echo "Initialization canceled. Please run 'zrep init' manually to set up."
-                exit 1
-            fi
-        fi
     fi
 
 }
@@ -407,17 +463,18 @@ function zrep_remove_package() {
 
     if [[ -z "$installed_version" || "$installed_version" == "null" ]]; then
         zrep_msg debug "\nError: Package '${package_name}' is not installed."
-        zrep_msg info "Please see 'zrep list' for installed packages."
+        zrep_msg info "Please see 'zpi list' for installed packages."
         return 1
     fi
 
     local first_letter="${author:0:1:l}"
     local package_dir="${config[main_zrep_install_dir]}/${first_letter}/${author}/${script}"
 
-    zrep_msg info "\nFound installed package: $package_name, version: $installed_version"
+    zrep_msg std "\nFound installed package: $package_name, version: $installed_version"
 
     # Ask user for confirmation with default response "Y"
-    read "REPLY?Are you sure you want to remove this package? (y/n) [Y]: "
+    zrep_msg info "Are you sure you want to remove this package? (y/n) [Y]: \c"
+    read REPLY
     REPLY=${REPLY:-Y}
     echo
 
@@ -425,7 +482,6 @@ function zrep_remove_package() {
         # Remove the package directory from disk
         if [[ -d "${package_dir}" ]]; then
             rm -rf "${package_dir}"
-            zrep_msg sub "Package directory '${package_dir}' removed successfully."
         else
             zrep_msg debug "Warning: Package directory '${package_dir}' not found."
         fi
@@ -436,7 +492,7 @@ function zrep_remove_package() {
            if .[$author] == [] then del(.[$author]) else . end' \
           "$installed_json" > "$installed_json.tmp" && mv "$installed_json.tmp" "$installed_json"
 
-        zrep_msg sub "Package '${package_name}' removed successfully from installed.json."
+        zrep_msg sub "Package '${package_name}' successfully removed."
     else
         zrep_msg info "Removal canceled."
     fi
@@ -458,10 +514,8 @@ function zrep_check_if_installed() {
 
     if [[ -n "${installed_version}" && "${installed_version}" != "null" ]]; then
         # Package is installed, and version is stored in installed_version
-        # echo "Package $package is installed with version $installed_version."
         return 0  # Package is installed
     else
-        # echo "Package $package is not installed."
         return 1  # Package is not installed
     fi
 }
@@ -469,26 +523,40 @@ function zrep_check_if_installed() {
 function zrep_global_downloader() {
     case ${config[global_downloader]} in
         curl)
-            dloader="curl -s -A \"zrep ${VERSION} (curl)\""
+            dloader="curl -s -A \"${ZSH_SCRIPT} ${VERSION} (curl)\""
             ;;
         wget)
-            dloader="wget -q -U \"zrep ${VERSION} (wget)\""
+            dloader="wget -q -U \"${ZSH_SCRIPT} ${VERSION} (wget)\""
             ;;
         wget2)
-            dloader="wget2 -q -U \"zrep ${VERSION} (wget2)\""
+            dloader="wget2 -q -U \"${ZSH_SCRIPT} ${VERSION} (wget2)\""
             ;;
         *)
             echo "Invalid Downloader."
             exit
             ;;
     esac
+
     eval ${dloader} "${1}"
 }
 
+function zrep_process_updates() {
+    for package in ${(k)updatesAvailable}; do
+        local updateDetails=(${(s/|/)updatesAvailable[${package}]})
+        local author=${updateDetails[1]}
+        local script=${updateDetails[2]}
+        local version=${updateDetails[3]}
+        echo "Updating ${author}/${script} to version ${version}..."
+        zrep_install_package u "${author}/${script}" "${version}"
+    done
+}
+
 typeset -A updatesAvailable
 function zrep_check_for_updates() {
 
-    local remoteFile="${config[global_repo_url]}/packages.json\?$(date +%s)"
+    # Now using a zrep API to fetch the JSON for checking for updates. This _may_ change in the
+    # future if the load on the DB gets too high.
+    local remoteFile="${config[global_repo_url]}/getver.php"
     # local localFile="${config[main_zrep_install_dir]}/installed.json"
     zrep_installed_json
     local remotePackages=$(zrep_global_downloader "${remoteFile}")
@@ -510,7 +578,9 @@ function zrep_check_for_updates() {
                                '.authors[] | select(.name==$author) | .scripts[] | select(.name==$script) | .version' <<<"$remotePackages")
 
         if [[ "${remote_version}" > "${installed_version}" ]]; then
-            updatesAvailable[${author}/${script}]="${remote_version}"
+            # updatesAvailable[${author}/${script}]="${remote_version}"
+            # Store author, script, and version in a single string, separated by "|"
+            updatesAvailable[${author}/${script}]="${author}|${script}|${remote_version}"
             zrep_msg info "\n${author}/${script} can be updated from ${installed_version} to ${remote_version}"
             updates=true # Mark that updates are available
         fi
@@ -533,8 +603,6 @@ function zrep_update_package() {
         if [[ -n "$version" ]]; then
             local author="${specificPackage%%/*}"
             local script="${specificPackage#*/}"
-            # local dlurl="${config[global_repo_url]}/download.php?a=${author}&s=${script}&v=${version}"
-            # echo "Updating $specificPackage to version $version..."
             local install_pkg="${author}/${script}"
             zrep_install_package u ${install_pkg}
         else
@@ -543,8 +611,8 @@ function zrep_update_package() {
     else
         if [[ ${updates} == "true" ]]; then
             # Prompt the user only if updates are available
-            echo "New updates are available. Do you want to proceed with updating? (Y/n): "
+            zrep_msg sub "New updates are available. Do you want to proceed with updating? (Y/n): \c"
-            read -q "response?"
+            read "response"
             echo # Move to a new line
 
             # Set the default response to 'Y' if no input is entered
@@ -552,17 +620,8 @@ function zrep_update_package() {
 
             # Proceed with update if the response is 'Y' or 'y'
             if [[ $response =~ ^[Yy]$ ]]; then
-                # General update mode: update all packages listed in updatesAvailable
+                # Call zrep_process_updates to handle all updates.
-                for package in ${(k)updatesAvailable}; do
+                zrep_process_updates
-                    local author=${package%%/*}
-                    local script=${package#*/}
-                    local version=${updatesAvailable[${package}]}
-                    # local dlurl="${config[global_repo_url]}/download.php?a=${author}&s=${script}&v=${version}"
-
-                    # echo "Preparing to update $package to version $version..."
-                    local install_pkg="${author}/${script}"
-                    zrep_install_package u ${install_pkg}
-                done
             else
                 zrep_msg info "Update canceled."
             fi
@@ -594,15 +653,15 @@ function zrep_download_package() {
   case "${config[global_downloader]}" in
     curl)
       downloader="curl"
-      cmd="curl -L -A \"zrep ${VERSION} (curl)\" -s -o \"$ZipFile\" \"$DownloadURL\" -w \"%{http_code}\""
+      cmd="curl -L -A \"${ZSH_SCRIPT} ${VERSION} (curl)\" -s -o \"$ZipFile\" \"$DownloadURL\" -w \"%{http_code}\""
       ;;
     wget)
       downloader="wget"
-      cmd="wget -L -U \"zrep ${VERSION} (wget)\" -q -O \"$ZipFile\" \"$DownloadURL\""
+      cmd="wget -L -U \"${ZSH_SCRIPT} ${VERSION} (wget)\" -q -O \"$ZipFile\" \"$DownloadURL\""
       ;;
     wget2)
       downloader="wget2"
-      cmd="wget2 -L -U \"zrep ${VERSION} (wget2)\" -q -O \"$ZipFile\" \"$DownloadURL\""
+      cmd="wget2 -L -U \"${ZSH_SCRIPT} ${VERSION} (wget2)\" -q -O \"$ZipFile\" \"$DownloadURL\""
       ;;
     *)
       zrep_msg debug "Unsupported or unspecified downloader: '${config[global_downloader]}'."
@@ -656,19 +715,23 @@ function zrep_install_package() {
         # Call zrep_check_if_installed to check if the package is already installed
         if zrep_check_if_installed "${package}"; then
             zrep_msg debug "\nPackage ${package} is already installed."
-            zrep_msg info "Use 'zrep list' to see installed packages."
+            zrep_msg info "Use 'zpi list' to see installed packages."
             return 0
         fi
+
+	zrep_parse_remote "${config[global_repo_url]}/getver.php\?p\=${package}" ${package}
     fi
 
-    # If not installed, proceed with fetching the package information
-    zrep_parse_remote "${config[global_repo_url]}/packages.json\?$(date +%s)" "${package}"
 
     local tmpDir="${config[main_zrep_install_dir]}/tmp"
 
     mkdir -p "${tmpDir}"
 
+    author="${package%/*}"
+    script="${package#*/}"
+
     local zipFile="${tmpDir}/${author}-${script}-${version}.zip"
+    dlurl="${config[global_repo_url]}/download/${package}/${version}"
     zrep_download_package "${zipFile}" "${dlurl}"
 
     unzip -q -o "${zipFile}" -d "${config[main_zrep_install_dir]}"
@@ -789,26 +852,27 @@ function zrep_disable() {
         echo ")"
     } > ${config[main_zrep_install_dir]}/.addons
 
-    zrep_msg info "\nPackage '${package_name} (${script})' has been disabled and removed from fpath."
+    zrep_msg info "\nPackage '${package_name}' has been disabled and removed from fpath."
     zrep_msg info "You may have to run 'source ~/.zrep_addons' to remove it from your shell."
 }
 
 # Help function to display available options
 function zrep_help() {
 
-  zrep_msg sub "\nUsage: zrep <command> [arguments]"
+  zrep_msg sub "\nUsage: ${ZSH_SCRIPT:t} <command> [arguments]"
   zrep_msg info "Available commands:"
-    if [[ ! -f ${ZREP_CONFIG} ]]; then
+  if [[ ! -f ${ZREP_CONFIG} ]]; then
-        zrep_msg info "  init: Initialize zrep"
+    zrep_msg info "  init: Initialize zpi"
-    fi
+  fi
   zrep_msg info "  install (i) <author/package>:\t\t\tInstall a package"
   zrep_msg info "  remove (rm, delete, del) <author/package>:\tRemove a package"
-  zrep_msg info "  update (u) <author/package>:\t\t\tUpdate zrep package"
+  zrep_msg info "  update (u) <author/package>:\t\t\tUpdate zpi package"
-  zrep_msg info "  enable <author/package>:\t\t\tEnable zrep package"
+  zrep_msg info "  enable <author/package>:\t\t\tEnable zpi package"
-  zrep_msg info "  disable <author/package>:\t\t\tDisable zrep package"
+  zrep_msg info "  disable <author/package>:\t\t\tDisable zpi package"
-  zrep_msg info "  version:\t\t\t\t\tDisplay zrep version"
+  zrep_msg info "  search 'search term':\t\t\t\tSearch for authors, packages or description"
+  zrep_msg info "  version:\t\t\t\t\tDisplay zpi version"
   zrep_msg info "  list:\t\t\t\t\t\tList installed packages"
-  zrep_msg info "  <author/package> help:\t\t\tDisplay help for pacakage (if available)"
+  zrep_msg info "  <author/package> help:\t\t\tDisplay help for package (if available)"
 
 }
 
@@ -861,6 +925,7 @@ function zrep_read_usage() {
 function main() {
 
     zrep_main_version_string
+
     if [[ ${1} != "init" ]]; then
         zrep_load_config ${1}
         zrep_load_theme ${config[global_theme]}
@@ -879,6 +944,9 @@ function main() {
             zrep_check_for_deps
     	    exit
             ;;
+        search | s | find)
+            zrep_search "${@:2}"
+            ;;
         install | i)
             zrep_install_package ${2}
             ;;
@@ -886,7 +954,7 @@ function main() {
             # Parse the command argument to extract the package name
             zrep_remove_package_name="${2:-}"
             if [[ -z "${zrep_remove_package_name}" ]]; then
-                zrep_msg info "\nUsage: zrep ${1} author/package"
+                zrep_msg info "\nUsage: zpi ${1} author/package"
             else
                 zrep_remove_package "${zrep_remove_package_name}"
             fi