move works now

Author: skrupler

README.md

@@ -39,6 +39,13 @@ Operation completed 40 scans.
 35 intact releases.
 ```
 
+### Anti-features
+So this script assumes some things, for example does it assume that you store files in 
+a flat style - ie: `/path/to/$(movie_storage)/$(movie)` or for music `/path/to/$(music_storage)/$(album)`.
+
+* file storage layout
+* movie/music directories containing sub folders like DISK1 and DISK2 is currently being blacklisted aswell.
+
 ### TODOs
 
 - [ ] show percentage completion in margin #progressbar

ideal.sh

@@ -16,32 +16,35 @@ source lib/helper.sh
 menu(){
 
 	target=""
-	move="~/"
-	write=false
+	__move=""
+	__write=false
 	verbose=false
 
-	while getopts ":t:r:mwvh" opt; do
+	while getopts ":t:r:m:wivh" opt; do
 		case $opt in
 		t)
-			target=$OPTARG
+			target="$OPTARG"
 			;;
 		r)
-			rlstype=$OPTARG
+			rlstype="$OPTARG"
 			;;
 		m)
-			if [[ -d $OPTARG ]] && [[ ! -z $OPTARG ]];then
-				move=$OPTARG
-			else
-				move=$move
-			fi
+			__move="$OPTARG"
 			;;
 		w)
 			if $OPT;then
-				write=true
+				__write=true
+				printf '%s\n' "Write mode: $__write"
 			else
-				write=false
+				__write=false
+			fi
+			;;
+		i)
+			if ! [[ $OPT ]];then
+				__interactive=true
+			elif [[ $OPT ]];then
+				__interactive=false
 			fi
-			printf "Write mode: $write\n"
 			;;
 		h)
 			helpmsg
@@ -72,13 +75,13 @@ helpmsg(){
 	# just a simple help screen
 	# not valid anymore anyways
 
-	echo -e "\n"
 	echo -e "\tideal.sh\n"
 	echo -e "\tUsage:"
 	echo -e "\t$0 -t /path/to/target -v\n"
 
 	echo -e "\t-m" "\t"		"Directory to move broken releases into."
 	echo -e "\t-w" "\t" 	"Writable mode, default doesnt touch anything."
+	echo -e "\t-i" "\t"		"When flag is passed interactive mode will be disabled."
 	echo -e "\t-v" "\t"		"Toggles verbose output aka also printing successful."
 	echo -e "\t-r" "\t"		"Specify type of release. ie: mp3 or movie."
 	echo -e "\t-h" "\t"		"Prints this message.\n"
@@ -100,6 +103,8 @@ make_list_of_failed(){
 			rm $LOGPATH
 			touch $LOGPATH
 		fi
+		
+		printf '%s\n' "--------------------------------[ CORRUPT ]--------------------------------"
 		for BROKEN in ${failed[@]};do
 			if [ -d $BROKEN ];then
 				echo -en "$BROKEN" "\n" >> $LOGPATH
@@ -109,6 +114,7 @@ make_list_of_failed(){
 			fi
 		done
 
+		printf '%s\n' "-------------------------------[ INCOMPLETE ]------------------------------"
 		for INCOMPLETE in ${incomplete[@]};do
 			if [ -d $INCOMPLETE ];then
 				echo -en "$INCOMPLETE" "\n" >> $LOGPATH
@@ -157,6 +163,88 @@ listfiles() {
 }
 
 
+create_temp_dir(){
+
+	# takes $1 param as output directory
+	# creates two sub dirs within that.
+
+	printf '%s\n' "$1"
+
+	if [[ ! -d "$1" ]];then
+		mkdir -p "$1"
+	fi
+
+	if [[ ! -z "$1" ]] && [[ -d $1 ]];then
+		output="$1"
+	else
+		printf '%s\n' "Something wrong with output directory. Quitting."
+		exit 1
+	fi
+
+	if [[ ! -z $2 ]];then
+		new="$output/$2"
+	else
+		printf '%s\n' "Seems to be missing an argument. Quitting."
+		exit 1
+	fi
+
+
+	if [[ ! -d "$new" ]];then
+		printf '%s\n' "$new does not exist, creating it."
+		mkdir -p "$new"
+	fi
+	
+
+}
+
+move_broken(){
+
+	OLDIFS=$IFS
+	IFS=$(echo -en "\n\b")
+
+
+	#mv_opt="-r"
+
+	#if [[ "$3" == true ]];then
+	#	mv_opt="-ri"
+	#elif [[ "$3" == false ]];then
+	#	mv_opt="-r"
+	#fi
+
+	# for all the corrupt releases
+	if [[ ${#failed[@]} == 0 ]];then
+		printf '%s\n' "broken rls: ${#failed[@]}"
+	else
+		for crpt in "${failed[@]}"; do	
+			if [[ -d  "${crpt}" ]];then
+				printf '%s\n' "Moved $crpt to $__move/broken/"
+				mv "$crpt" "$__move/broken/"
+			else
+				printf '%s\n' "Failed to remove: $crpt"
+				printf '%s\n' "Did the folder move?"
+			fi
+		done
+	fi
+
+	# for all the incomplete releases
+	if [[ ${#incomplete[@]} == 0 ]];then
+		printf '%s\n' "incomplete rls: ${#incomplete[@]}"	
+	else
+		for inco in "${incomplete[@]}"; do	
+			if [[ -d  "${inco}" ]];then
+				printf '%s%s\n' "Moved $inco to $__move/incomplete"
+				mv "$inco" "$__move/incomplete/"
+			else
+				printf '%s\n' "Failed to remove: $inco"
+				printf '%s\n' "Did the folder move?"
+			fi
+		done
+	fi
+
+
+	IFS=${OLDIFS}
+}
+
 runnable(){
 
 	OLDIFS=$IFS
@@ -207,3 +295,18 @@ runnable(){
 
 menu "$@"
 runnable "$target" "$rlstype"
+if [[ ! -z "$__move" ]] && [[ "$__write" == true ]];then
+	printf '%s\n' "BEFORE $__move"
+
+	if [[ ! ${#broken[@]} == 0 ]];then
+		create_temp_dir "$__move" "broken"
+	fi
+
+	if [[ ! ${#incomplete[@]} == 0 ]];then
+		create_temp_dir "$__move" "incomplete"
+	fi
+
+	move_broken "${failed[@]}" "${incomplete[@]}" "$__move"
+else
+	printf '%s\n' "Requirements not met."
+fi

lib/helper.sh

@@ -33,7 +33,7 @@ make_lists() {
 					# m3u
 					if [ "${xy##*.}" = "m3u" ];then
 						if [[ $__m3u == true ]];then
-							printf '%s\n' "Already got a M3U file."
+							#printf '%s\n' "Already got a M3U file."
 							continue
 						else
 							#printf '%s\n' "M3U = TRUE"
@@ -44,7 +44,7 @@ make_lists() {
 					# nfo
 					if [ ${xy##*.} = "nfo" ];then
 						if [[ $__nfo == true ]];then
-							printf '%s\n' "Already got a NFO file."
+							#printf '%s\n' "Already got a NFO file."
 							continue
 						else
 							__nfo=true
@@ -55,7 +55,7 @@ make_lists() {
 					# sfv
 					if [ "${xy##*.}" = "sfv" ];then
 						if [[ $__sfv == true ]];then
-							printf '%s\n' "Already got a SFV file."
+							#printf '%s\n' "Already got a SFV file."
 							continue
 						else
 							#printf '%s\n' "SFV = TRUE"
@@ -66,7 +66,7 @@ make_lists() {
 					# mp3
 					if [ "${xy##*.}" = "mp3" ];then
 						if [[ $__mp3 == true ]];then
-							printf '%s\n' "Already got a mp3 file."
+							#printf '%s\n' "Already got a mp3 file."
 							continue
 						else
 							__mp3=true
@@ -91,11 +91,6 @@ make_lists() {
 				files_found=("$directory"/*.''@(sfv|nfo|rar)'')
 				shopt -u nullglob extglob nocaseglob
 
-				#for a in $directory_list;do
-				#	printf '%s\n' "$a"
-				#done
-
-
 				for xy in "${files_found[@]}";do
 
 					# nfo