From 80f6ed1bf48b5ee8ed6dd1e49ceb64b4ce905eae Mon Sep 17 00:00:00 2001
From: q3aql <q3aql@protonmail.ch>
Date: Mon, 29 Mar 2021 18:08:57 +0200
Subject: [PATCH] Fix retry & checksum on cygwin (ks-upv/upa/upr)

---
 src/ks-upa | 66 +++++++++++++++++++++++++++++++++---------------------
 src/ks-upf | 66 +++++++++++++++++++++++++++++++++---------------------
 src/ks-upv | 64 +++++++++++++++++++++++++++++++---------------------
 3 files changed, 119 insertions(+), 77 deletions(-)

diff --git a/src/ks-upa b/src/ks-upa
index 5117442..7a9017d 100755
--- a/src/ks-upa
+++ b/src/ks-upa
@@ -20,7 +20,10 @@ ksToolsTempFolder="/tmp/ks-tools"
 # Check cygwin alias (for Windows)
 if [ -f "/usr/bin/cygwin-alias.sh" ] ; then
   shopt -s expand_aliases
+  cygwin="yes"
   source "/usr/bin/cygwin-alias.sh"
+else
+  cygwin="no"
 fi
 
 # Function to remove spaces and symbols
@@ -54,7 +57,7 @@ function convertText() {
 # Syntax: listArchives <directory>
 function listArchives() {
   fail=1
-  formatFiles="mp3 wma ogg wav flac midi acc oga opus mp2 ra m4a mka"
+  formatFiles="mp3 wma ogg wav flac midi acc oga opus mp2 ra m4a mka ac3"
   # Rename files
   cd "${1}"
   mkdir -p ${ksToolsTempFolder}
@@ -138,17 +141,22 @@ function sendFile() {
     ${comandOne} "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" ${comandTwo} 2> /dev/null
     sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
     OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failure to send ${2}"
-      echo "Retrying..."
-      sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
-      sleep 5
-      countSend=$(expr ${countSend} + 1)
-      if [ ${countSend} -eq 5 ] ; then
+    if [ "${cygwin}" == "yes" ] ; then
+      echo "retry_disabled" > /dev/null
+      correct=1
+    else
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failure to send ${2}"
+        echo "Retrying..."
+        sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
+        sleep 5
+        countSend=$(expr ${countSend} + 1)
+        if [ ${countSend} -eq 5 ] ; then
+          correct=1
+        fi
+      else
         correct=1
       fi
-    else
-      correct=1
     fi
   done
 }
@@ -160,24 +168,30 @@ function checkChecksum() {
   countChecksum=0
   echo -n "Checking checksum... " && sleep 4
   echo ""
-  while [ ${correct} -eq 0 ] ; do
-    checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
-    OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failed to get checksum for ${5}"
-      echo "Retrying..."
-      sleep 5
-      countChecksum=$(expr ${countChecksum} + 1)
-      if [ ${countChecksum} -eq 5 ] ; then
+  if [ "${cygwin}" == "yes" ] ; then
+    checksumLocal=$(md5sum ${2})
+    echo "Local checksum: ${checksumLocal}"
+    echo "Server checksum: checksum_disabled"
+  else
+    while [ ${correct} -eq 0 ] ; do
+      checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
+      OUTPUT=$?
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failed to get checksum for ${5}"
+        echo "Retrying..."
+        sleep 5
+        countChecksum=$(expr ${countChecksum} + 1)
+        if [ ${countChecksum} -eq 5 ] ; then
+          correct=1
+        fi
+      else
+        checksumLocal=$(md5sum ${2})
+        echo "Local checksum: ${checksumLocal}"
+        echo "Server checksum: ${checksumServer}"
         correct=1
       fi
-    else
-      checksumLocal=$(md5sum ${2})
-      echo "Local checksum: $checksumLocal"
-      echo "Server checksum: $checksumServer"
-      correct=1
-    fi
-  done
+    done
+  fi
 }
 
 # Function to show config
diff --git a/src/ks-upf b/src/ks-upf
index 5efe6bc..c501f65 100755
--- a/src/ks-upf
+++ b/src/ks-upf
@@ -20,7 +20,10 @@ ksToolsTempFolder="/tmp/ks-tools"
 # Check cygwin alias (for Windows)
 if [ -f "/usr/bin/cygwin-alias.sh" ] ; then
   shopt -s expand_aliases
+  cygwin="yes"
   source "/usr/bin/cygwin-alias.sh"
+else
+  cygwin="no"
 fi
 
 # Function to remove spaces and symbols
@@ -57,7 +60,7 @@ function listArchives() {
   formatFiles=""
   videoFiles="mp4 avi mpg mpeg mov wmv mkv ogv webm rm flv vob ts"
   formatFiles="${formatFiles} ${videoFiles}"
-  audioFiles="mp3 wma ogg wav flac midi acc oga opus mp2 ra m4a mka"
+  audioFiles="mp3 wma ogg wav flac midi acc oga opus mp2 ra m4a mka ac3"
   formatFiles="${formatFiles} ${audioFiles}"
   compressFiles="zip rar 7z bz2 gz xz tar bzip2 gzip"
   formatFiles="${formatFiles} ${compressFiles}"
@@ -156,17 +159,22 @@ function sendFile() {
     ${comandOne} "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" ${comandTwo} 2> /dev/null
     sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
     OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failure to send ${2}"
-      echo "Retrying..."
-      sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
-      sleep 5
-      countSend=$(expr ${countSend} + 1)
-      if [ ${countSend} -eq 5 ] ; then
+    if [ "${cygwin}" == "yes" ] ; then
+      echo "retry_disabled" > /dev/null
+      correct=1
+    else
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failure to send ${2}"
+        echo "Retrying..."
+        sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
+        sleep 5
+        countSend=$(expr ${countSend} + 1)
+        if [ ${countSend} -eq 5 ] ; then
+          correct=1
+        fi
+      else
         correct=1
       fi
-    else
-      correct=1
     fi
   done
 }
@@ -178,24 +186,30 @@ function checkChecksum() {
   countChecksum=0
   echo -n "Checking checksum... " && sleep 4
   echo ""
-  while [ ${correct} -eq 0 ] ; do
-    checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
-    OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failed to get checksum for ${5}"
-      echo "Retrying..."
-      sleep 5
-      countChecksum=$(expr ${countChecksum} + 1)
-      if [ ${countChecksum} -eq 5 ] ; then
+  if [ "${cygwin}" == "yes" ] ; then
+    checksumLocal=$(md5sum ${2})
+    echo "Local checksum: ${checksumLocal}"
+    echo "Server checksum: checksum_disabled"
+  else
+    while [ ${correct} -eq 0 ] ; do
+      checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
+      OUTPUT=$?
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failed to get checksum for ${5}"
+        echo "Retrying..."
+        sleep 5
+        countChecksum=$(expr ${countChecksum} + 1)
+        if [ ${countChecksum} -eq 5 ] ; then
+          correct=1
+        fi
+      else
+        checksumLocal=$(md5sum ${2})
+        echo "Local checksum: ${checksumLocal}"
+        echo "Server checksum: ${checksumServer}"
         correct=1
       fi
-    else
-      checksumLocal=$(md5sum ${2})
-      echo "Local checksum: $checksumLocal"
-      echo "Server checksum: $checksumServer"
-      correct=1
-    fi
-  done
+    done
+  fi
 }
 
 # Function to show config
diff --git a/src/ks-upv b/src/ks-upv
index 3b5cbea..8a8901d 100755
--- a/src/ks-upv
+++ b/src/ks-upv
@@ -20,7 +20,10 @@ ksToolsTempFolder="/tmp/ks-tools"
 # Check cygwin alias (for Windows)
 if [ -f "/usr/bin/cygwin-alias.sh" ] ; then
   shopt -s expand_aliases
+  cygwin="yes"
   source "/usr/bin/cygwin-alias.sh"
+else
+  cygwin="no"
 fi
 
 # Function to remove spaces and symbols
@@ -138,17 +141,22 @@ function sendFile() {
     ${comandOne} "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" ${comandTwo} 2> /dev/null
     sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
     OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failure to send ${2}"
-      echo "Retrying..."
-      sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
-      sleep 5
-      countSend=$(expr ${countSend} + 1)
-      if [ ${countSend} -eq 5 ] ; then
+    if [ "${cygwin}" == "yes" ] ; then
+      echo "retry_disabled" > /dev/null
+      correct=1
+    else
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failure to send ${2}"
+        echo "Retrying..."
+        sshpass -p ${1} ssh ${3}@${4} rm -rf ${5}/.${6}.* &> /dev/null
+        sleep 5
+        countSend=$(expr ${countSend} + 1)
+        if [ ${countSend} -eq 5 ] ; then
+          correct=1
+        fi
+      else
         correct=1
       fi
-    else
-      correct=1
     fi
   done
 }
@@ -160,24 +168,30 @@ function checkChecksum() {
   countChecksum=0
   echo -n "Checking checksum... " && sleep 4
   echo ""
-  while [ ${correct} -eq 0 ] ; do
-    checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
-    OUTPUT=$?
-    if [ ${OUTPUT} -ne 0 ] ; then
-      echo "Failed to get checksum for ${5}"
-      echo "Retrying..."
-      sleep 5
-      countChecksum=$(expr ${countChecksum} + 1)
-      if [ ${countChecksum} -eq 5 ] ; then
+  if [ "${cygwin}" == "yes" ] ; then
+    checksumLocal=$(md5sum ${2})
+    echo "Local checksum: ${checksumLocal}"
+    echo "Server checksum: checksum_disabled"
+  else
+    while [ ${correct} -eq 0 ] ; do
+      checksumServer=$(sshpass -p ${1} ssh ${3}@${4} md5sum ${5} 2> /dev/null)
+      OUTPUT=$?
+      if [ ${OUTPUT} -ne 0 ] ; then
+        echo "Failed to get checksum for ${5}"
+        echo "Retrying..."
+        sleep 5
+        countChecksum=$(expr ${countChecksum} + 1)
+        if [ ${countChecksum} -eq 5 ] ; then
+          correct=1
+        fi
+      else
+        checksumLocal=$(md5sum ${2})
+        echo "Local checksum: ${checksumLocal}"
+        echo "Server checksum: ${checksumServer}"
         correct=1
       fi
-    else
-      checksumLocal=$(md5sum ${2})
-      echo "Local checksum: $checksumLocal"
-      echo "Server checksum: $checksumServer"
-      correct=1
-    fi
-  done
+    done
+  fi
 }
 
 # Function to show config