Update image_Studio.sh

image_Studio.sh

@@ -55,45 +55,49 @@ DOWNLOAD_FILES=(
 
 # Custom nodes
 CUSTOM_NODES=(
-  "https://github.com/adbrasi/huggpackreator"
-  "https://github.com/adbrasi/packreator_processor"
-  "https://github.com/adbrasi/Packreator_manager"
-  "https://github.com/adbrasi/cezarsave34"
-  "https://github.com/adbrasi/pageonetor"
-  "https://github.com/adbrasi/pakreatorio"
-  "https://github.com/adbrasi/WaterMark_bumbumzin"
-  "https://github.com/adbrasi/marcadaguita"
-  "https://github.com/adbrasi/randomico"
-  "https://github.com/adbrasi/groqrouter"
-  "https://github.com/adbrasi/find_charakito"
-  "https://github.com/adbrasi/randomsizito"
-  "https://github.com/adbrasi/importex"
-  "https://github.com/adbrasi/storitadifusita"
-  "https://github.com/adbrasi/attentionPPM"
-  "https://github.com/ClownsharkBatwing/RES4LYF"
-  "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes"
-  "https://github.com/sipherxyz/comfyui-art-venture"
-  "https://github.com/pamparamm/sd-perturbed-attention"
-  "https://github.com/KoreTeknology/ComfyUI-Universal-Styler"
-  "https://github.com/WASasquatch/was-node-suite-comfyui"
-  "https://github.com/chflame163/ComfyUI_LayerStyle"
-  "https://github.com/ltdrdata/ComfyUI-Impact-Pack"
-  "https://github.com/pythongosssss/ComfyUI-Custom-Scripts"
-  "https://github.com/rgthree/rgthree-comfy"
-  "https://github.com/ssitu/ComfyUI_UltimateSDUpscale"
-  "https://github.com/adbrasi/Importador"
-  "https://github.com/adbrasi/GetFirstTag"
-  "https://github.com/adbrasi/comfydodi"
-  "https://github.com/omar92/ComfyUI-QualityOfLifeSuit_Omar92"
-  "https://github.com/Cezarsaint/blacklisto"
-  "https://github.com/TinyTerra/ComfyUI_tinyterraNodes"
-  "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
-  "https://github.com/Cezarsaint/rand0micoUploaderLoven"
-  "https://github.com/adbrasi/pixivmosaic"
-  "https://github.com/adbrasi/futfilter"
-  "https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"
-  "https://github.com/shiimizu/ComfyUI_smZNodes"
-  "https://github.com/CoreyCorza/ComfyUI-CRZnodes"
+    "https://github.com/adbrasi/huggpackreator"
+    "https://github.com/adbrasi/packreator_processor"
+    "https://github.com/adbrasi/Packreator_manager"
+    "https://github.com/adbrasi/cezarsave34"
+    "https://github.com/adbrasi/pageonetor"
+    "https://github.com/adbrasi/pakreatorio"
+    "https://github.com/adbrasi/WaterMark_bumbumzin"
+    "https://github.com/adbrasi/marcadaguita"
+    "https://github.com/adbrasi/randomico"
+    "https://github.com/adbrasi/groqrouter"
+    "https://github.com/adbrasi/find_charakito"
+    "https://github.com/adbrasi/randomsizito"
+    "https://github.com/adbrasi/importex"
+    "https://github.com/adbrasi/storitadifusita"
+    "https://github.com/adbrasi/attentionPPM"
+    "https://github.com/ClownsharkBatwing/RES4LYF"
+    "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes"
+    "https://github.com/sipherxyz/comfyui-art-venture"
+    "https://github.com/pamparamm/sd-perturbed-attention"
+    "https://github.com/KoreTeknology/ComfyUI-Universal-Styler"
+    "https://github.com/WASasquatch/was-node-suite-comfyui"
+    "https://github.com/chflame163/ComfyUI_LayerStyle"
+    "https://github.com/ltdrdata/ComfyUI-Impact-Pack"
+    "https://github.com/pythongosssss/ComfyUI-Custom-Scripts"
+    "https://github.com/rgthree/rgthree-comfy"
+    "https://github.com/ssitu/ComfyUI_UltimateSDUpscale"
+    "https://github.com/adbrasi/Importador"
+    "https://github.com/adbrasi/GetFirstTag"
+    "https://github.com/adbrasi/comfydodi"
+    "https://github.com/omar92/ComfyUI-QualityOfLifeSuit_Omar92"
+    "https://github.com/Cezarsaint/blacklisto"
+    "https://github.com/TinyTerra/ComfyUI_tinyterraNodes"
+    "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
+    "https://github.com/Cezarsaint/rand0micoUploaderLoven"
+    "https://github.com/adbrasi/pixivmosaic"
+    "https://github.com/adbrasi/futfilter"
+    "https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"
+    "https://github.com/shiimizu/ComfyUI_smZNodes"
+    "https://github.com/CoreyCorza/ComfyUI-CRZnodes"
+    "https://github.com/ClownsharkBatwing/RES4LYF"
+    "https://github.com/ltdrdata/ComfyUI-Impact-Pack"
+    "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
+    "https://github.com/rgthree/rgthree-comfy"
 )
 
 # Download HuggingFace
@@ -112,9 +116,12 @@ download_hf() {
     if command -v hf >/dev/null 2>&1; then
         cd "$target_dir"
         hf download "$(dirname "$url")" "$(basename "$url")" --local-dir . 2>/dev/null
+        local result=$?
         cd - >/dev/null
+        return $result
     else
-        wget -q --show-progress -c -O "$target_dir/$filename" "https://huggingface.co/$url"
+        wget -q --show-progress -c -O "$target_dir/$filename" "https://huggingface.co/$url" 2>/dev/null
+        return $?
     fi
 }
 
@@ -132,10 +139,13 @@ download_mega() {
     # Usar megadl simples sem forçar nome
     if megadl "$url" 2>/dev/null; then
         log_success "Mega download OK"
+        cd - >/dev/null
+        return 0
     else
         log_warn "Mega download falhou"
+        cd - >/dev/null
+        return 1
     fi
-    cd - >/dev/null
 }
 
 # Download normal
@@ -145,7 +155,7 @@ download_file() {
     local filename="$3"
     
     # Adicionar token Civitai se necessário
-    if [[ "$url" == *"civitai.com"* ]]; then
+    if [[ "$url" == *"civitai.com"* ]] && [[ "$url" != *"token="* ]]; then
         url="${url}&token=${CIVITAI_TOKEN}"
     fi
     
@@ -156,20 +166,48 @@ download_file() {
     
     log_info "Baixando: ${filename:-arquivo}"
     
+    # Tentar com aria2c primeiro
     if command -v aria2c >/dev/null 2>&1; then
-        aria2c -c -x 4 -s 4 --console-log-level=warn --dir="$target_dir" --out="$filename" "$url"
-    elif [ -n "$filename" ]; then
-        wget -q --show-progress -c -O "$target_dir/$filename" "$url"
+        if [ -n "$filename" ]; then
+            aria2c -c -x 4 -s 4 --console-log-level=warn --dir="$target_dir" --out="$filename" "$url" 2>/dev/null
+        else
+            aria2c -c -x 4 -s 4 --console-log-level=warn --dir="$target_dir" "$url" 2>/dev/null
+        fi
+        
+        # Se aria2c funcionou, retornar sucesso
+        if [ $? -eq 0 ]; then
+            return 0
+        else
+            log_warn "aria2c falhou, tentando wget..."
+        fi
+    fi
+    
+    # Fallback para wget
+    if [ -n "$filename" ]; then
+        wget -q --show-progress -c -O "$target_dir/$filename" "$url" 2>/dev/null
     else
         cd "$target_dir"
-        wget -q --show-progress -c "$url"
+        wget -q --show-progress -c "$url" 2>/dev/null
         cd - >/dev/null
     fi
+    
+    # Verificar resultado do wget
+    if [ $? -eq 0 ]; then
+        log_success "Download OK com wget"
+        return 0
+    else
+        log_error "Download falhou com aria2c e wget: ${filename:-$url}"
+        return 1
+    fi
 }
 
 # Processar downloads
 process_downloads() {
+    local total=0
+    local failed=0
+    
     for entry in "${DOWNLOAD_FILES[@]}"; do
+        ((total++))
         IFS='|' read -r url type filename <<< "$entry"
         
         # Criar diretório
@@ -178,14 +216,21 @@ process_downloads() {
         
         # Baixar arquivo
         if [[ "$url" == mega://* ]]; then
-            download_mega "$url" "$target_dir"
+            download_mega "$url" "$target_dir" || ((failed++))
         elif [[ "$url" == *.huggingface.co/* ]]; then
             local hf_path="${url#*huggingface.co/}"
-            download_hf "$hf_path" "$target_dir" "$filename"
+            download_hf "$hf_path" "$target_dir" "$filename" || ((failed++))
         else
-            download_file "$url" "$target_dir" "$filename"
+            download_file "$url" "$target_dir" "$filename" || ((failed++))
         fi
     done
+    
+    # Reportar resultado
+    if [ $failed -gt 0 ]; then
+        log_warn "Downloads: $((total-failed))/$total OK ($failed falharam)"
+    else
+        log_success "Todos os $total downloads completados!"
+    fi
 }
 
 # Clone git repo