Merge branch 'master' of github.com:profplump/UberZach-Video

encode.pl

@@ -64,7 +64,6 @@ if ($ENV{'MOBILE'}) {
 	$ENV{'WIDTH'}         = 1280;
 	$ENV{'AUDIO_BITRATE'} = 128;
 	$ENV{'STEREO_ONLY'}   = 1;
-	$ENV{'ENCODER'}       = 'x264';
 }
 
 # Allow overrides for audio languages

folderFixup.sh

@@ -29,8 +29,22 @@ if [ ! -d "${TMPDIR}" ]; then
         fi
 fi
 
+# Bail if the media share isn't available
+if ! ~/bin/video/isMediaMounted; then
+	echo 'Media not mounted' 1>&2
+	exit 1
+fi
+
+# Bail if the load is high
+if ! ~/bin/video/checkLoad.sh; then
+	if [ -n "${DEBUG}" ] && [ $DEBUG -gt 0 ]; then
+		echo 'Load too high' 1>&2
+	fi
+	exit 0
+fi
+
 # Bail if we're already running
-LOCK="${TMPDIR}/folderFixup.run"
+LOCK="${TMPDIR}/folderFixup.`basename "${inFolder}"`.run"
 touch "${LOCK}"
 read MOUNT_PID < "${LOCK}"
 if [ -n "${MOUNT_PID}" ]; then
@@ -43,20 +57,6 @@ if [ -n "${MOUNT_PID}" ]; then
 fi
 echo $$ > "${LOCK}"
 
-# Bail if the load is high
-if ! ~/bin/video/checkLoad.sh; then
-	if [ -n "${DEBUG}" ] && [ $DEBUG -gt 0 ]; then
-		echo 'Load too high' 1>&2
-	fi
-	exit 0
-fi
-
-# Bail if the media share isn't available
-if ! ~/bin/video/isMediaMounted; then
-	echo 'Media not mounted' 1>&2
-	exit 1
-fi
-
 # Cache output
 tmp="`mktemp -t 'folderFixup.XXXXXXXX'`"
 

mountMedia

@@ -18,7 +18,7 @@ SHARE="media"
 LOCK="${TMPDIR}/mountMedia.mounting"
 REMOTE_USER="${USER}"
 LOCAL_MEDIA="/Users/Shared/Plex"
-MEDIA_CHECK_DIR="TV/John Plays FIFA"
+MEDIA_CHECK_DIR="TV/Rick and Morty"
 
 # Globals
 OFFLINE=0

sync/syncUnwatched.sh

@@ -67,7 +67,7 @@ DEST_DIR="${BASE_DIR}/${DIR}"
 FILES="`~/bin/video/sync/recentlyUnwatched.sh "${1}"`"
 
 # Ensure the input is sane
-if [ `echo "${FILES}" | wc -l` -lt 5 ]; then
+if [ `echo "${FILES}" | wc -l` -lt 1 ]; then
 	echo -e "Invalid sync file list:\n${FILE}" 1>&2
 	exit -2
 fi