Many fixes for images-indexer.sh

scripts/shell/images-indexer.sh

@@ -55,7 +55,7 @@ if [ ${#commands_not_found[@]} -ne 0 ]; then
   exit 1
 fi
 
-furry_commission_ideas_path=/mnt/e/home/downloads/furry-downloads-2
+furry_commission_ideas_path=/mnt/e/clouds/nextcloud/furry-downloads
 furry_commission_ideas_urls_filename="urls.txt"
 scripts_path=/home/cloud/repos/personal-devboot/scripts/shell
 
@@ -78,8 +78,8 @@ convert_csv_to_array() {
 read_command() {
   message=$@
 
-  read -p "${message}: " media_url
-  echo $media_url
+  read -p "${message}: " read_response
+  echo $read_response
 }
 
 input_media_url() {
@@ -113,36 +113,30 @@ fill_urls_list_array
 
 cd $furry_commission_ideas_path
 
-input_create_folder() {
-  read -p "[INFO] Please create one: " new_foldername
-  echo "$new_foldername"
-}
-
 input_create_folder() {
   read -p "[INFO] Please inform a name for the new folder: " new_foldername
   echo "$new_foldername"
 }
 
-input_select_folder_read_command() {
-  read -p "[INFO] Please inform the desired option: " selected_option
-  echo "$selected_option"
-}
-
 input_select_folder() {
   read_command_message="Please select a folder"
 
-  selected_folder=$(read_command $read_command_message)
-  while [ -z "$selected_folder" ]; do
-    selected_folder=$(read_command $read_command_message)
+  selected_option=$(read_command $read_command_message)
+  while [ -z "$selected_option" ]; do
+    selected_option=$(read_command $read_command_message)
   done
 
   if [ "$selected_option" == 'n' ]; then
-    selected_folder=$(input_create_folder)
-    while [ -z "$selected_folder" ]; do
-      selected_folder=$(input_create_folder)
+    new_folder_input_message="Please create a new folder"
+
+    new_foldername=$(read_command $new_folder_input_message)
+    while [ -z "$new_foldername" ]; do
+      new_foldername=$(read_command $new_folder_input_message)
     done
 
-    mkdir --parents "$selected_folder"
+    mkdir --parents "$new_foldername"
+
+    selected_folder=$new_foldername
   else
     selected_folder=${existing_folders[$selected_option]}
   fi
@@ -198,7 +192,9 @@ show_folder_selection_list_and_fill_selected_folder_variable() {
   else
     if [ -z "$selected_folder" ]; then
       printf "\n"
+
       echo "[INFO] Folders:"
+
       for ((i = 0; i < ${#existing_folders[@]}; i++)); do
         foldername=${existing_folders[$i]}
         echo "      $i) $foldername"
@@ -421,13 +417,18 @@ image_download_steps() {
   temp_dirpath="/tmp"
   temp_filename=$(generate_random_string_with_suffix "$media_extension")
 
-  gallery-dl --directory ${temp_dirpath} --filename ${temp_filename} $url_to_download
+  echo ""
+  echo "Download starting..."
+
+  gallery-dl --quiet --directory ${temp_dirpath} --filename ${temp_filename} $url_to_download
 
   if [[ $? -ne 0 ]]; then
     unsucessful_downloads+="$url_to_download"
     return
   fi
 
+  echo "Download finished."
+
   final_temp_filepath="${temp_dirpath}/${temp_filename}"
 
   final_temp_filepath_md5=($(md5sum $final_temp_filepath))
@@ -440,7 +441,6 @@ image_download_steps() {
 }
 
 fill_existing_folders_array
-show_folder_selection_list_and_fill_selected_folder_variable
 
 is_url_string() {
   str=$1
@@ -457,10 +457,9 @@ is_url_string() {
 }
 
 if $filter_mode; then
+  show_folder_selection_list_and_fill_selected_folder_variable
   filter_mode_steps
 else
-  flag_first_iteration_occured=false
-
   for url in "${urls_list[@]}"; do
     while [ "$(is_url_string $url)" == "false" ]; do
       echo ""
@@ -470,15 +469,11 @@ else
       url=$(input_media_url)
     done
 
-    if [ $interactive_mode ] && [ $flag_first_iteration_occured ]; then
-      show_folder_selection_list_and_fill_selected_folder_variable
-    fi
+    show_folder_selection_list_and_fill_selected_folder_variable
 
     cd "${furry_commission_ideas_path}/${selected_folder}"
 
     image_download_steps "${url}"
-
-    flag_first_iteration_occured=true
   done
 fi