renamed/refactored file names

reencode.sh

@@ -38,27 +38,35 @@ echo "Searching for MKVs in $( pwd )"
 # Section: Functions
 # 
 
-getCodec() {
-	ffprobe -v error -select_streams v:0 -show_entries stream=codec_name -of compact=p=0:nk=1 "$1"
+do_ffprobe() {
+	ffprobe -v quiet -select_streams v:0 -show_entries $1 -of csv=p=0:nk=1 "$2"
 }
 
-fileSize() {
+get_codec() {
+	do_ffprobe stream=codec_name "$1"
+}
+
+get_bitrate() {
+	do_ffprobe format=bit_rate "$1"
+}
+
+get_resolution() {
+	do_ffprobe stream=height,width "$1"
+}
+
+file_size() {
 	du -sb "$1" | awk '{print $1}'
 }
 
-getBitrate() {
-	ffprobe -v quiet -select_streams v:0 -show_entries format=bit_rate -of compact=p=0:nk=1 "$1"
-}
-
-formatSize() {
+format_size() {
 	echo "$1" | numfmt --to=iec-i | awk '{print $1"B"}'
 }
 
-formatRate() {
+format_rate() {
 	echo "$1" | numfmt --to=si | awk '{print $1"bps"}'
 } 
 
-encodeFile() {
+encode_file() {
 	process=$( echo $1 | awk -v FPAT="([^' ]+)|'([^']+)'" '{print $1}' )
 	filesize=$( echo $1 | awk -v FPAT="([^' ]+)|'([^']+)'" '{print $2}' )
 	bitrate=$( echo $1 | awk -v FPAT="([^' ]+)|'([^']+)'" '{print $3}' )
@@ -99,32 +107,32 @@ encodeFile() {
 	echo "Output file: $outfile"
 
 	rm "$tmpfile"
-	oldsize=$( formatSize $filesize )
-	oldbitr=$( formatRate $bitrate )
-	newsize=$( formatSize $( fileSize "$outfile" ) )
-	newbitr=$( formatRate $( getBitrate "$outfile" ) )
+	oldsize=$( format_size $filesize )
+	oldbitr=$( format_rate $bitrate )
+	newsize=$( format_size $( file_size "$outfile" ) )
+	newbitr=$( format_rate $( get_bitrate "$outfile" ) )
 	echo "Converted $infile:" >> summary.txt
 	echo "\t$oldsize ($oldbitr) => $newsize ($newbitr)\n" >> summary.txt
 	return 0
 }
 
-getFileInfo() {
+get_file_info() {
 	# Args:
 	# 	$1 - video file name
 	#
 	# Returns a single line:
 	# 	filesize bitrate codec
-	echo "$( fileSize "$1" ) $( getBitrate "$1" ) $( getCodec "$1" )"
+	echo "$( file_size "$1" ) $( get_bitrate "$1" ) $( get_codec "$1" )"
 }
 
-selectFile() {
+select_file() {
 	# Arg: 
 	# 	$1 - filename
 	# 	$2 - filesize
 	# 	$3 - bitrate
 	# 	$4 - codec
 	# 	
-	# Note: args line up with return values from getFileInfo
+	# Note: args line up with return values from get_file_info
 	#
 	# Echo "Ignore" or "Process" with an optional reason
 	file=$1
@@ -144,14 +152,14 @@ selectFile() {
 	fi
 }
 
-simFile() {
+simulate_file() {
 	# Arg:
 	# 	$1 - video file name
 	#
 	# Prints out a line to simulate.txt formatted like so:
 	# 	process filesize bitrate codec infile outfile
-	fileinfo=$( getFileInfo "$1" )
-	selected=$( selectFile "$1" $fileinfo )
+	fileinfo=$( get_file_info "$1" )
+	selected=$( select_file "$1" $fileinfo )
 	outputfile="${1%.*}.mkv"
 
 	reason=${selected#* }
@@ -176,7 +184,7 @@ if [ "$mode" != "run" ]; then
 	rm -f simulation.txt
 
 	find -type f \( -name "*.mkv" -o -name "*.mp4" \) | while read file; do
-		simFile "$file"
+		simulate_file "$file"
 	done
 fi
 
@@ -190,7 +198,7 @@ if [ "$mode" != "sim" ]; then
 	fi
 
 	cat simulation.txt | while read line; do
-		encodeFile "$line"
+		encode_file "$line"
 		if [ $? -eq 2 ]; then
 			exit 2
 		fi