mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 21:33:13 -07:00
Merge 954149b551 into 28845ad358
This commit is contained in:
schumi2004
commit
31c7e781cf
5 changed files with 174 additions and 176 deletions
|
|
@ -41,13 +41,7 @@ class AuthURLOpener(urllib.FancyURLopener):
|
|||
return urllib.FancyURLopener.open(self, url)
|
||||
|
||||
|
||||
def processEpisode(dirName, nzbName=None, status=0):
|
||||
|
||||
status = int(status)
|
||||
if status > 0:
|
||||
print "the download failed. nothing to process"
|
||||
sys.exit()
|
||||
|
||||
def processEpisode(dirName, nzbName=None, failed=False):
|
||||
config = ConfigParser.ConfigParser()
|
||||
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessTV.cfg")
|
||||
print "Loading config from", configFilename
|
||||
|
|
@ -82,10 +76,12 @@ def processEpisode(dirName, nzbName=None, status=0):
|
|||
|
||||
params['quiet'] = 1
|
||||
|
||||
params['dir'] = dirName
|
||||
params['dirName'] = dirName
|
||||
if nzbName != None:
|
||||
params['nzbName'] = nzbName
|
||||
|
||||
params['failed'] = failed
|
||||
|
||||
myOpener = AuthURLOpener(username, password)
|
||||
|
||||
if ssl:
|
||||
|
|
|
|||
|
|
@ -3,9 +3,14 @@
|
|||
import sys
|
||||
import autoProcessMovie
|
||||
|
||||
# SABnzbd
|
||||
if len(sys.argv) == 8:
|
||||
# SABnzbd argv:
|
||||
if len(sys.argv) < 8:
|
||||
print "Invalid number of arguments received from client. Please update it."
|
||||
sys.exit()
|
||||
else:
|
||||
print "Script triggered from client, starting autoProcessMovie..."
|
||||
autoProcessMovie.process(sys.argv[1], sys.argv[2], sys.argv[7])
|
||||
|
||||
# sys.argv:
|
||||
# 1 The final directory of the job (full path)
|
||||
# 2 The original name of the NZB file
|
||||
# 3 Clean version of the job name (no path info and ".nzb" removed)
|
||||
|
|
@ -13,20 +18,3 @@ if len(sys.argv) == 8:
|
|||
# 5 User-defined category
|
||||
# 6 Group that the NZB was posted in e.g. alt.binaries.x
|
||||
# 7 Status of post processing. 0 = OK, 1=failed verification, 2=failed unpack, 3=1+2
|
||||
print "Script triggered from SABnzbd, starting autoProcessMovie..."
|
||||
autoProcessMovie.process(sys.argv[1], sys.argv[2], sys.argv[7])
|
||||
|
||||
# NZBGet
|
||||
elif len(sys.argv) == 3:
|
||||
# NZBGet argv:
|
||||
# 1 The final directory of the job (full path)
|
||||
# 2 The original name of the NZB file
|
||||
# From NZBGet only successful downloads are triggered so status is set to "0"
|
||||
print "Script triggered from NZBGet, starting autoProcessMovie..."
|
||||
|
||||
autoProcessMovie.process(sys.argv[1], sys.argv[2], 0)
|
||||
|
||||
else:
|
||||
print "Invalid number of arguments received from client."
|
||||
print "Running autoProcessMovie as a manual run..."
|
||||
autoProcessMovie.process('Manual Run', 'Manual Run', 0)
|
||||
|
|
|
|||
|
|
@ -21,13 +21,17 @@
|
|||
# Edited by Clinton Hall to prevent processing of failed downloads.
|
||||
# Also added suppot for NZBGet. With help from thorli
|
||||
|
||||
|
||||
import sys
|
||||
import autoProcessTV
|
||||
|
||||
# SABnzbd
|
||||
if len(sys.argv) == 8:
|
||||
# SABnzbd argv:
|
||||
if len(sys.argv) < 8:
|
||||
print "Invalid number of arguments received from client. Please update it."
|
||||
sys.exit()
|
||||
else:
|
||||
print "Script triggered from client, starting autoProcessTV..."
|
||||
autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[7])
|
||||
|
||||
# sys.argv:
|
||||
# 1 The final directory of the job (full path)
|
||||
# 2 The original name of the NZB file
|
||||
# 3 Clean version of the job name (no path info and ".nzb" removed)
|
||||
|
|
@ -35,19 +39,3 @@ if len(sys.argv) == 8:
|
|||
# 5 User-defined category
|
||||
# 6 Group that the NZB was posted in e.g. alt.binaries.x
|
||||
# 7 Status of post processing. 0 = OK, 1=failed verification, 2=failed unpack, 3=1+2
|
||||
print "Script triggered from SABnzbd, starting autoProcessTV..."
|
||||
autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[7])
|
||||
|
||||
# NZBGet
|
||||
elif len(sys.argv) == 3:
|
||||
# NZBGet argv:
|
||||
# 1 The final directory of the job (full path)
|
||||
# 2 The original name of the NZB file
|
||||
# From NZBGet only successful downloads are triggered so status is set to "0"
|
||||
print "Script triggered from NZBGet, starting autoProcessTV..."
|
||||
|
||||
autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], 0)
|
||||
|
||||
else:
|
||||
print "Invalid number of arguments received from client."
|
||||
sys.exit()
|
||||
|
|
|
|||
|
|
@ -164,6 +164,18 @@ if [ "$NZBPP_PARSTATUS" -eq 1 -o "$NZBPP_PARSTATUS" -eq 3 -o "$NZBPP_PARFAILED"
|
|||
echo "[WARNING] Post-Process: Par-check successful, but Par-repair disabled, exiting"
|
||||
else
|
||||
echo "[WARNING] Post-Process: Par-check failed, exiting"
|
||||
# Send notifications to SickBeard or CouchPotato that Par-check failed
|
||||
# Uncomment if SickBeard Branch is fixed
|
||||
#if [ "$SickBeard" = "yes" -a "$NZBPP_CATEGORY" = "$SickBeardCategory" -a -e "$SabToSickBeard" ]; then
|
||||
# # Call SickBeard's postprocessing script
|
||||
# echo "[INFO] Post-Process: Running SickBeard's postprocessing script to notify Par-check failed"
|
||||
#$PythonCmd $SabToSickBeard "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "1" >/dev/null 2>&1
|
||||
#fi
|
||||
if [ "$CouchPotato" = "yes" -a "$NZBPP_CATEGORY" = "$CouchPotatoCategory" -a -e "$nzbToCouchPotato" ]; then
|
||||
# Call CouchPotato's postprocessing script
|
||||
echo "[INFO] Post-Process: Running CouchPotato's postprocessing script to notify Par-check failed"
|
||||
$PythonCmd $nzbToCouchPotato "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "1" >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
exit $POSTPROCESS_ERROR
|
||||
fi
|
||||
|
|
@ -226,6 +238,18 @@ if (ls *.rar >/dev/null 2>&1); then
|
|||
if (ls *.[pP][aA][rR]2 >/dev/null 2>&1); then
|
||||
echo "[INFO] Post-Process: Requesting par-repair"
|
||||
exit $POSTPROCESS_PARCHECK_ALL
|
||||
# Send notifications to SickBeard or CouchPotato that unrar (second pass) failed
|
||||
# Uncomment if SickBeard Branch is fixed
|
||||
#if [ "$SickBeard" = "yes" -a "$NZBPP_CATEGORY" = "$SickBeardCategory" -a -e "$SabToSickBeard" ]; then
|
||||
# # Call SickBeard's postprocessing script
|
||||
# echo "[INFO] Post-Process: Running SickBeard's postprocessing script to notify unrar (second pass) failed"
|
||||
# $PythonCmd $SabToSickBeard "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "1">/dev/null 2>&1
|
||||
#fi
|
||||
if [ "$CouchPotato" = "yes" -a "$NZBPP_CATEGORY" = "$CouchPotatoCategory" -a -e "$nzbToCouchPotato" ]; then
|
||||
# Call CouchPotato's postprocessing script
|
||||
echo "[INFO] Post-Process: Running CouchPotato's postprocessing script to notify unrar (second pass) failed"
|
||||
$PythonCmd $nzbToCouchPotato "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "1">/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
exit $POSTPROCESS_ERROR
|
||||
fi
|
||||
|
|
@ -282,9 +306,9 @@ fi
|
|||
# Clean up
|
||||
echo "[INFO] Post-Process: Cleaning up"
|
||||
chmod -R a+rw .
|
||||
rm *.nzb >/dev/null 2>&1
|
||||
rm *.sfv >/dev/null 2>&1
|
||||
rm *.1 >/dev/null 2>&1
|
||||
# Clean up list, space seperated from GUI
|
||||
rm $FileCleanUp >/dev/null 2>&1
|
||||
# Removed by default
|
||||
rm _brokenlog.txt >/dev/null 2>&1
|
||||
if [ "$Unrared" -eq 1 ]; then
|
||||
# Delete par2-file only if there were files for unpacking.
|
||||
|
|
@ -321,30 +345,30 @@ fi
|
|||
|
||||
# Move categories to /share/yourdirectory and remove download destination directory
|
||||
if [ "$NZBPP_CATEGORY" = "$SickBeardCategory" ]; then
|
||||
echo "[INFO] Post-Process: Moving TV shows to $TV_DL_DIR"
|
||||
cp -R "$NZBPP_DIRECTORY" "$TV_DL_DIR" >/dev/null 2>&1
|
||||
echo "[INFO] Post-Process: Moving TV shows to $TvDownloadDir"
|
||||
cp -R "$NZBPP_DIRECTORY" "$TvDownloadDir" >/dev/null 2>&1
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "[ERROR] Post-Process: Moving to $TV_DL_DIR"
|
||||
echo "[ERROR] Post-Process: Moving to $TvDownloadDir"
|
||||
exit $POSTPROCESS_ERROR
|
||||
else
|
||||
rm -fr *
|
||||
cd ..
|
||||
rmdir "$NZBPP_DIRECTORY"
|
||||
NZBPP_DIRECTORY="$TV_DL_DIR"
|
||||
NZBPP_DIRECTORY="$TvDownloadDir"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$NZBPP_CATEGORY" = "$CouchPotatoCategory" ]; then
|
||||
echo "[INFO] Post-Process: Moving Movies to $MOVIES_DL_DIR"
|
||||
cp -R "$NZBPP_DIRECTORY" "$MOVIES_DL_DIR" >/dev/null 2>&1
|
||||
echo "[INFO] Post-Process: Moving Movies to $MoviesDownloadDir"
|
||||
cp -R "$NZBPP_DIRECTORY" "$MoviesDownloadDir" >/dev/null 2>&1
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "[ERROR] Post-Process: Moving to $MOVIES_DL_DIR"
|
||||
echo "[ERROR] Post-Process: Moving to $MoviesDownloadDir"
|
||||
exit $POSTPROCESS_ERROR
|
||||
else
|
||||
rm -fr *
|
||||
cd ..
|
||||
rmdir "$NZBPP_DIRECTORY"
|
||||
NZBPP_DIRECTORY="$MOVIES_DL_DIR"
|
||||
NZBPP_DIRECTORY="$MoviesDownloadDir"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -355,13 +379,13 @@ fi
|
|||
if [ "$SickBeard" = "yes" -a "$NZBPP_CATEGORY" = "$SickBeardCategory" -a -e "$NzbToSickBeard" ]; then
|
||||
# Call SickBeard's postprocessing script
|
||||
echo "[INFO] Post-Process: Running SickBeard's postprocessing script"
|
||||
$PythonCmd $NzbToSickBeard "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" >/dev/null 2>&1
|
||||
$PythonCmd $NzbToSickBeard "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "0" >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ "$CouchPotato" = "yes" -a "$NZBPP_CATEGORY" = "$CouchPotatoCategory" -a -e "$NzbToCouchPotato" ]; then
|
||||
# Call CouchPotato's postprocessing script
|
||||
echo "[INFO] Post-Process: Running CouchPotato's postprocessing script"
|
||||
$PythonCmd $NzbToCouchPotato "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" >/dev/null 2>&1
|
||||
$PythonCmd $NzbToCouchPotato "$NZBPP_DIRECTORY" "$NZBPP_NZBFILENAME" "" "" "" "" "0" >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
# Check if destination directory was set in postprocessing parameters
|
||||
|
|
|
|||
|
|
@ -36,15 +36,15 @@ PythonCmd=/usr/local/python/bin/python
|
|||
NzbToSickBeard=/usr/local/nzbget/var/nzbToSickBeard.py
|
||||
|
||||
# Set the full path where completed movies should be placed
|
||||
# before CouchPotato's Renamer is called
|
||||
TV_DL_DIR=/usr/local/nzbget/complete/tv
|
||||
# before SickBeard's Renamer is called
|
||||
TvDownloadDir=/usr/local/nzbget/complete/tv
|
||||
|
||||
# Set the full path to nzbToCouchpotato.py for Couchpotato's postprocessing
|
||||
NzbToCouchPotato=/usr/local/nzbget/var/nzbToCouchPotato.py
|
||||
|
||||
# Set the full path where completed movies should be placed
|
||||
# before CouchPotato's Renamer is called
|
||||
MOVIES_DL_DIR=/usr/local/nzbget/complete/movies
|
||||
MoviesDownloadDir=/usr/local/nzbget/complete/movies
|
||||
|
||||
##############################################################################
|
||||
### OPTIONS ###
|
||||
|
|
@ -70,6 +70,8 @@ CouchPotato=yes
|
|||
# Category for Couchpotato's postprocessing.
|
||||
CouchPotatoCategory=movies
|
||||
|
||||
# Clean up list. (space seperated, default *.nzb *.sfv *.1)
|
||||
FileCleanUp=*.nzb *.sfv *.1
|
||||
##############################################################################
|
||||
### POSTPROCESSING-PARAMETERS ###
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue