@@ -48,9 +48,10 @@ do | |||||
# rename it to archive-XXXXX and start a new current/ | # rename it to archive-XXXXX and start a new current/ | ||||
if [[ $cur_size -gt $BYTES_PER_CHUNK ]] | if [[ $cur_size -gt $BYTES_PER_CHUNK ]] | ||||
then | then | ||||
uuid=$(cat /proc/sys/kernel/random/uuid) | |||||
echo "Current archive is full, moving to ${uuid}." | |||||
mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${uuid}" | |||||
timestamp=$( date +'%Y%m%d%H%M%S' ) | |||||
uuid=$(cat /proc/sys/kernel/random/uuid | cut -d- -f1) | |||||
echo "Current archive is full, moving to ${timestamp}_${uuid}." | |||||
mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${timestamp}_${uuid}" | |||||
cur_size=0 | cur_size=0 | ||||
sleep 3 | sleep 3 | ||||
fi | fi | ||||
@@ -55,7 +55,7 @@ mayicontinue | |||||
ITEM=none | ITEM=none | ||||
while [[ $ITEM = none ]] | while [[ $ITEM = none ]] | ||||
do | do | ||||
possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep -E '_[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$' | sort | head -n 1 ) | |||||
possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 ) | |||||
if test -n "${possible_item}" | if test -n "${possible_item}" | ||||
then | then | ||||
echo "Trying to grab $possible_item" | echo "Trying to grab $possible_item" | ||||
@@ -40,7 +40,7 @@ mayicontinue | |||||
ITEM=none | ITEM=none | ||||
while [[ $ITEM = none ]] | while [[ $ITEM = none ]] | ||||
do | do | ||||
possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep -E '_[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$' | sort | head -n 1 ) | |||||
possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 ) | |||||
if test -n "${possible_item}" | if test -n "${possible_item}" | ||||
then | then | ||||
echo "Trying to grab $possible_item" | echo "Trying to grab $possible_item" | ||||