github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 21:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from schumi2004/master

Browse source 
CPS failed downloading nzbget 9.0
This commit is contained in:
clinton-hall 2012-12-08 16:40:53 -08:00
commit 37b1bd1fd2
3 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autoProcessMovie.py
View file

@ -122,7 +122,7 @@ def process(dirName, nzbName=None, status=0):
break
if n == 0:
print "cound not find a mvie in the database for release", nzbName1
print "cound not find a movie in the database for release", nzbName1
print "please manually ignore this release and refresh the wanted movie"
print "exiting postprocessing script"
sys.exit(1)

50
nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
View file

@ -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

8
nzbget-postprocessing-files/9.0/webui/nzbget-postprocess.conf
View file

@ -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 ###