Zach Isbach 3 лет назад
Родитель
Сommit
595de1ce82
5 измененных файлов с 8 добавлено и 162 удалено
  1. 1 1
      findRecode.sh
  2. 0 5
      folderToMKV.sh
  3. 1 1
      isMediaMounted
  4. 3 25
      mediaPath
  5. 3 130
      mountMedia

+ 1 - 1
findRecode.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Parameters
-FOLDER="`~/bin/video/mediaPath`"
+FOLDER="/Volumes/Shared/TV"
 if [ -z "${MIN_RATE}" ]; then
 	MIN_RATE=20000
 fi

+ 0 - 5
folderToMKV.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
 
-# Bail if media is not available
-if ! ~/bin/video/isMediaMounted; then
-	exit 0
-fi
-
 # Command line
 inFolder="${1}"
 if [ -z "${inFolder}" ] || [ ! -e "${inFolder}" ]; then

+ 1 - 1
isMediaMounted

@@ -1 +1 @@
-mediaPath
+mountMedia

+ 3 - 25
mediaPath

@@ -1,25 +1,3 @@
-#!/bin/bash
-
-# Run silent, run deep
-SILENT=0
-if [ "`basename "${0}"`" == 'isMediaMounted' ]; then
-	SILENT=1
-fi
-
-# Exit cleanly if the TV path exists
-MEDIA="${HOME}/media"
-if [ -d "${MEDIA}/TV" ]; then
-	if [ $SILENT -le 0 ]; then
-		echo -n "${MEDIA}"
-	fi
-	exit 0
-fi
-
-# If we didn't find anything attempt to mount
-MOUNT="${HOME}/bin/video/mountMedia"
-if [ -x "${MOUNT}" ] && [ -z "${MEDIA_MOUNTING}" ]; then
-	"${MOUNT}"
-fi
-
-# Fail even if the mount succeeds, so that children can see the error
-exit 1
+#!/bin/sh
+echo "Someone called: ${0}
+exit 0

+ 3 - 130
mountMedia

@@ -1,130 +1,3 @@
-#!/bin/bash
-
-# Ensure we have a valid TMPDIR
-if [ ! -d "${TMPDIR}" ]; then
-        TMPDIR="`getconf DARWIN_USER_TEMP_DIR 2>/dev/null`"
-        if [ ! -d "${TMPDIR}" ]; then
-                TMPDIR="/var/tmp"
-        fi
-        if [ ! -d "${TMPDIR}" ]; then
-                TMPDIR="/tmp"
-        fi
-fi
-
-# Config
-HOST="vera.uberzach.com"
-TIMEOUT=10
-SHARE="media"
-LOCK="${TMPDIR}/mountMedia.mounting"
-REMOTE_USER="${USER}"
-LOCAL_MEDIA="/Users/Shared/Plex"
-MEDIA_CHECK_DIR="TV/Rick and Morty"
-
-# Globals
-OFFLINE=0
-LOCAL_LINK=0
-MEDIA=""
-
-# Allow forced updates
-if [ -n "${FORCE}" ] && [ "${FORCE}" -ne "0" ]; then
-	FORCE=1
-else
-	FORCE=0
-fi
-
-# Hack for mismatched usernames
-if [ "${USER}" == "tv" ]; then
-	REMOTE_USER="atv"
-fi
-
-function cleanup {
-	rm -f "${LOCK}"
-	exit $1
-}
-
-function findMedia {
-	MEDIA=""
-	
-	# Find media at the root of any mounted volume with a name starting with $SHARE
-	for i in "/Volumes/${SHARE}"*; do
-		if [ -d "${i}" ] && [ -d "${i}/${MEDIA_CHECK_DIR}" ]; then
-			MEDIA="${i}"
-		fi
-	done
-	
-	# Find offline media if we're offline
-	if [ $OFFLINE -gt 0 ]; then
-		if [ -z "${MEDIA}" ] && [ -d "${LOCAL_MEDIA}" ] && [ -d "${LOCAL_MEDIA}/${MEDIA_CHECK_DIR}" ]; then
-			MEDIA="${LOCAL_MEDIA}"
-		fi
-	fi
-}
-
-function writeLinks {
-	DEST="${1}"
-	if [ -e "${HOME}/media" ] || [ -h "${HOME}/media" ]; then
-		rm -f "${HOME}/media"
-		ln -s "${DEST}" "${HOME}/media"
-	else
-		echo "No such path: ${HOME}/media" 1>&2
-		cleanup 1
-	fi
-}
-
-# Lock
-touch "${LOCK}"
-read MOUNT_PID < "${LOCK}"
-if [ -n "${MOUNT_PID}" ]; then
-	if ps -A -o pid | grep -q "${MOUNT_PID}"; then
-		sleep 5
-		exit 1
-	fi
-fi
-echo $$ > "${LOCK}"
-export MEDIA_MOUNTING=$$
-
-# Determine if we have a remote link
-if [ -h "${HOME}/media" ] && readlink "${HOME}/media" | grep -qE "^${LOCAL_MEDIA}"; then
-	LOCAL_LINK=1
-fi
-
-# Skip this whole shebang if we've got a valid, remote link
-if [ $LOCAL_LINK -eq 0 ] && [ $FORCE -eq 0 ] && ~/bin/video/isMediaMounted; then
-	cleanup 0
-fi
-
-# Check for connectivity and server live-ness
-if ! ~/bin/video/timeout -t "${TIMEOUT}" nc -z "${HOST}" 548 >/dev/null 2>&1 || \
-	! ~/bin/video/timeout -t "${TIMEOUT}" nc -z "${HOST}" 139 >/dev/null 2>&1; then
-		echo "`basename "${0}"`: Host not available: ${HOST}" 1>&2
-		OFFLINE=1
-fi
-
-# Drop local links if we're online
-if [ $OFFLINE -eq 0 ] && [ $LOCAL_LINK -ne 0 ]; then
-	writeLinks "/var/empty"
-fi
-
-# At this point any valid link is acceptable
-if [ $FORCE -eq 0 ] && ~/bin/video/isMediaMounted; then
-	cleanup 0
-fi
-
-# Connect if needed and possible
-findMedia
-if [ -z "${MEDIA}" ] && [ $OFFLINE -eq 0 ]; then
-	~/bin/video/timeout -t 30 osascript -e 'tell application "Finder" to mount volume "smb://'"${REMOTE_USER}@${HOST}/${SHARE}"'"'
-	sleep 5
-fi
-
-# Create links to the best media we can find
-findMedia
-if [ -n "${MEDIA}" ]; then
-	writeLinks "${MEDIA}"
-else
-	echo "`basename "${0}"`: Unable to link media volume" 1>&2
-	cleanup 1
-fi
-
-# Exit cleanly
-cleanup 0
+#!/bin/sh
+echo "Someone called: ${0}"
+exit 0