mxmehl/split-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing several logic errors

Browse Source
This commit is contained in:
mxmehl
2015-06-16 16:57:41 +03:00
parent c613d45c22
commit b7e461d2c0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
split-dl.sh
View File

@@ -2,7 +2,7 @@
FILE="$1" FILE="$1"
TYPE="$2" TYPE="$2"
SPLITSIZE="10M" SPLITSIZE="100M"
INFO="info.cfg" INFO="info.cfg"
# Check if 2 params are given # Check if 2 params are given
@@ -121,7 +121,8 @@ FOLDER="dl-$FILE"
checkfolder $FOLDER checkfolder $FOLDER
INFO="$FOLDER/$INFO" INFONAME=$INFO
INFO="$FOLDER/$INFONAME"
echo "[INFO] Calculating size and MD5 sum..." echo "[INFO] Calculating size and MD5 sum..."
BIGNAME=$(basename $FILE) BIGNAME=$(basename $FILE)
@@ -138,10 +139,10 @@ split --verbose -a 4 -b $SPLITSIZE $FILE $FOLDER/dl-
# List all splitted files, measure size and md5sum # List all splitted files, measure size and md5sum
echo "[INFO] Creating info document with necessary specs..." echo "[INFO] Creating info document with necessary specs..."
SMALLNO=$(ls $FOLDER | grep -v $INFO | wc -l) SMALLNO=$(ls $FOLDER | grep -v $INFONAME | wc -l)
echo "SMALLNO=$SMALLNO" >> $INFO echo "SMALLNO=$SMALLNO" >> $INFO
NO=0 NO=0
ls $FOLDER | grep -v $INFO | while read -r line; do ls $FOLDER | grep -v $INFONAME | while read -r line; do
SMALLNAME=$line SMALLNAME=$line
SMALLSIZE=$(getdu $FOLDER/$SMALLNAME) SMALLSIZE=$(getdu $FOLDER/$SMALLNAME)
@@ -254,6 +255,7 @@ until [ "$STATUS" == "F" ]; do
# File already exists, has correct size, and has correct MD5 # File already exists, has correct size, and has correct MD5
elif [ -e $SMALLPATH ] && $(compdu $SMALLPATH $SMALLSIZE) && $(compmd5 $SMALLPATH $SMALLMD5); then elif [ -e $SMALLPATH ] && $(compdu $SMALLPATH $SMALLSIZE) && $(compmd5 $SMALLPATH $SMALLMD5); then
echo "[SUCCESS] File already exists and is valid." echo "[SUCCESS] File already exists and is valid."
STATUS="C"
# This shouldn't happen... # This shouldn't happen...
else else
@@ -265,7 +267,7 @@ until [ "$STATUS" == "F" ]; do
if [ $NO -lt $SMALLNO ]; then if [ $NO -lt $SMALLNO ]; then
echo "[INFO] Starting next download." echo "[INFO] Starting next download."
STATUS="C" STATUS="C"
elif [ $NO -lt $SMALLNO ] && [ "$STATUS" == "C" ]; then elif [ $NO -ge $SMALLNO ] && [ "$STATUS" == "C" ]; then
echo "[SUCCESS] Downloading finished." echo "[SUCCESS] Downloading finished."
STATUS="F" STATUS="F"
else else