From 0efc304550d4177da0e7481e861c2ef4fb1863dd Mon Sep 17 00:00:00 2001 From: jonnyboy Date: Sat, 2 Feb 2013 23:25:58 +0100 Subject: [PATCH] added sudo to commands that require it --- bin/monitor.php | 33 +++++++++++++++++++++------------ bin/nzb-import-sub.php | 2 +- bin/nzbcount.php | 4 ++-- scripts/revert.sh | 4 +--- start.sh | 41 ++++++++++++++++++++--------------------- 5 files changed, 45 insertions(+), 39 deletions(-) diff --git a/bin/monitor.php b/bin/monitor.php index eff4afc8c..c1b545ed2 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -119,6 +119,15 @@ while($i>0) $work_since_start = $work_remaining_now - $work_start; $total_work_now = $work_remaining_now + $tvrage_releases_proc + $music_releases_proc + $movie_releases_proc + $console_releases_proc + $book_releases_proc; + $nfo_percent = floor(( $nfo_now / $releases_now) * 100 ); + $console_percent = floor(( $console_releases_now / $releases_now) * 100 ); + $movie_percent = floor(( $movie_releases_now / $releases_now) * 100 ); + $music_percent = floor(( $music_releases_now / $releases_now) * 100 ); + $pc_percent = floor(( $pc_releases_now / $releases_now) * 100 ); + $tvrage_percent = floor(( $tvrage_releases_now / $releases_now) * 100 ); + $book_percent = floor(( $book_releases_now / $releases_now) * 100 ); + $misc_percent = floor(( $misc_releases_now / $releases_now) * 100 ); + //get microtime at end of queries $query_timer = microtime_float()-$query_timer_start; @@ -155,25 +164,25 @@ while($i>0) printf("\033[1;31m $releases_now($signed$releases_since_start)\033[0m releases in your database.\n"); printf("\033[1;31m $total_work_now($signed1$work_since_start)\033[0m releases left to postprocess.\033[1;33m\n"); - $mask = "%20s %10s %10s \n"; + $mask = "%20s %10s %13s \n"; printf($mask, "Category", "In Process", "In Database"); - printf($mask, "===============", "==========", "==========\033[0m"); - printf($mask, "NFO's","$nfo_remaining_now","$nfo_now"); - printf($mask, "Console(1000)","$console_releases_proc","$console_releases_now"); - printf($mask, "Movie(2000)","$movie_releases_proc","$movie_releases_now"); - printf($mask, "Audio(3000)","$music_releases_proc","$music_releases_now"); - printf($mask, "PC(4000)","$pc_releases_proc","$pc_releases_now"); - printf($mask, "TVShows(5000)","$tvrage_releases_proc","$tvrage_releases_now"); - printf($mask, "Books(7000)","$book_releases_proc","$book_releases_now"); - printf($mask, "Misc(8000)","$work_remaining_now","$misc_releases_now"); + printf($mask, "===============", "==========", "=============\033[0m"); + printf($mask, "NFO's","$nfo_remaining_now","$nfo_now($nfo_percent%)"); + printf($mask, "Console(1000)","$console_releases_proc","$console_releases_now($console_percent%)"); + printf($mask, "Movie(2000)","$movie_releases_proc","$movie_releases_now($movie_percent%)"); + printf($mask, "Audio(3000)","$music_releases_proc","$music_releases_now($music_percent%)"); + printf($mask, "PC(4000)","$pc_releases_proc","$pc_releases_now($pc_percent%)"); + printf($mask, "TVShows(5000)","$tvrage_releases_proc","$tvrage_releases_now($tvrage_percent%)"); + printf($mask, "Books(7000)","$book_releases_proc","$book_releases_now($book_percent%)"); + printf($mask, "Misc(8000)","$work_remaining_now","$misc_releases_now($misc_percent%)"); $NNPATH="{$array['NEWZPATH']}{$array['NEWZNAB_PATH']}"; $TESTING="{$array['NEWZPATH']}{$array['TESTING_PATH']}"; - $mask = "%20s %10.10s %10s \n"; + $mask = "%20s %10.10s %13s \n"; printf("\n\033[1;33m"); printf($mask, "Category", "Time", "Status"); - printf($mask, "===============", "==========", "==========\033[0m"); + printf($mask, "===============", "==========", "=============\033[0m"); printf($mask, "Queries","$query_timer","queried"); //get microtime for timing script check diff --git a/bin/nzb-import-sub.php b/bin/nzb-import-sub.php index 0b5676f82..1c2323e72 100644 --- a/bin/nzb-import-sub.php +++ b/bin/nzb-import-sub.php @@ -20,7 +20,7 @@ if($subdir_count == 0){ $ps = new PowerProcess; $ps->RegisterCallback('psUpdateComplete'); -$ps->maxThreads = 20; +$ps->maxThreads = 30; $ps->threadTimeLimit = 0; $selected = $subdir_count - 1; diff --git a/bin/nzbcount.php b/bin/nzbcount.php index a888e4fb9..2c4d3f6fc 100644 --- a/bin/nzbcount.php +++ b/bin/nzbcount.php @@ -15,9 +15,9 @@ $i=0; while ($i==0) { system('clear'); printf("\n\033[1;33m"); - $mask = "%20s %10.10s %10s \n"; + $mask = "%20s %10.10s %13s \n"; printf($mask, "Folder Name", "In Folder", "Imported"); - printf($mask, "===============", "==========", "==========\033[0m"); + printf($mask, "===============", "==========", "=============\033[0m"); $subdir_count = 0; $path = $array['NZBS']; diff --git a/scripts/revert.sh b/scripts/revert.sh index a9f2e4285..2967b7db1 100755 --- a/scripts/revert.sh +++ b/scripts/revert.sh @@ -13,9 +13,7 @@ source ../defaults.sh -if [ -f $NEWZPATH/www/lib/postprocess.php.orig ]; then - mv $NEWZPATH/www/lib/postprocess.php.orig $NEWZPATH/www/lib/postprocess.php -else +if [ -f $NEWZPATH/www/lib/postprocess.php ]; then $SED -i -e 's/\/\/$this->processAdditional();/$this->processAdditional();/' $NEWZPATH/www/lib/postprocess.php $SED -i -e 's/\/\/$this->processNfos();/$this->processNfos();/' $NEWZPATH/www/lib/postprocess.php $SED -i -e 's/\/\/$this->processUnwanted();/$this->processUnwanted();/' $NEWZPATH/www/lib/postprocess.php diff --git a/start.sh b/start.sh index f3bc36915..163761e1e 100755 --- a/start.sh +++ b/start.sh @@ -25,40 +25,40 @@ if [[ $AGREED == "no" ]]; then fi if [ ! -f $NEWZPATH/www/lib/postprocess.php.orig ]; then - cp $NEWZPATH/www/lib/postprocess.php $NEWZPATH/www/lib/postprocess.php.orig + sudo cp $NEWZPATH/www/lib/postprocess.php $NEWZPATH/www/lib/postprocess.php.orig fi if ! grep -q '//$this->processAdditional();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processAdditional();/\/\/$this->processAdditional();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processAdditional();/\/\/$this->processAdditional();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processNfos();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processNfos();/\/\/$this->processNfos();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processNfos();/\/\/$this->processNfos();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processUnwanted();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processUnwanted();/\/\/$this->processUnwanted();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processUnwanted();/\/\/$this->processUnwanted();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processMovies();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processMovies();/\/\/$this->processMovies();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processMovies();/\/\/$this->processMovies();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processMusic();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processMusic();/\/\/$this->processMusic();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processMusic();/\/\/$this->processMusic();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processBooks();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processBooks();/\/\/$this->processBooks();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processBooks();/\/\/$this->processBooks();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processGames();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processGames();/\/\/$this->processGames();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processGames();/\/\/$this->processGames();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processTv();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processTv();/\/\/$this->processTv();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processTv();/\/\/$this->processTv();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processMusicFromMediaInfo();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processMusicFromMediaInfo();/\/\/$this->processMusicFromMediaInfo();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processMusicFromMediaInfo();/\/\/$this->processMusicFromMediaInfo();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processOtherMiscCategory();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processOtherMiscCategory();/\/\/$this->processOtherMiscCategory();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processOtherMiscCategory();/\/\/$this->processOtherMiscCategory();/' $NEWZPATH/www/lib/postprocess.php fi if ! grep -q '//$this->processUnknownCategory();' "$NEWZPATH/www/lib/postprocess.php" ; then - $SED -i -e 's/$this->processUnknownCategory();/\/\/$this->processUnknownCategory();/' $NEWZPATH/www/lib/postprocess.php + sudo $SED -i -e 's/$this->processUnknownCategory();/\/\/$this->processUnknownCategory();/' $NEWZPATH/www/lib/postprocess.php fi #create mysql my.conf @@ -70,21 +70,20 @@ chmod 600 ./conf/my.cnf if [ ! -f "powerline/powerline/themes/default.sh" ]; then cp powerline/powerline/themes/default.start.sh powerline/powerline/themes/default.sh fi + #Get the path to tmpunrar -TMPUNRAR_QUERY="SELECT value from site where ID = 66;" +TMPUNRAR_QUERY="SELECT value from site where setting = \"tmpunrarpath\";" TMPUNRAR_PATH=`$MYSQL --defaults-extra-file=conf/my.cnf -u$DB_USER -h$DB_HOST $DB_NAME -s -N -e "${TMPUNRAR_QUERY}"` TMPUNRAR_PATH=$TMPUNRAR_PATH"1" +sudo mkdir -p $TMPUNRAR_PATH +#create a ramdisk if [[ $RAMDISK == "true" ]]; then - umount $TMPUNRAR_PATH &> /dev/null - mkdir -p $TMPUNRAR_PATH - chmod 777 $TMPUNRAR_PATH - mount -t tmpfs -o size=256M tmpfs $TMPUNRAR_PATH 2>&1 > /dev/null -else - mkdir -p $TMPUNRAR_PATH - chmod 777 $TMPUNRAR_PATH + mountpoint -q $TMPUNRAR_PATH || sudo mount -t tmpfs -o size=32M tmpfs $TMPUNRAR_PATH 2>&1 > /dev/null fi +sudo chmod -R 777 $TMPUNRAR_PATH + #remove postprocessing scripts rm -f bin/lib/post* rm -f bin/processAlternate* @@ -116,7 +115,7 @@ sed -i -e "s/\$tmpPath = \$this->site->tmpunrarpath;/\$tmpPath = \$this->site->t sed -i -e 's/order by r.postdate desc limit %d.*$/order by r.guid desc limit %d ", ($maxattemptstocheckpassworded + 1) * -1, $numtoProcess));/g' bin/lib/postprocess1.php sed -i -e 's/PostPrc : Performing additional post processing.*$/PostPrc : Performing additional post processing by guid on ".$rescount." releases ...";/g' bin/lib/postprocess1.php -chmod -R 777 $TMPUNRAR_PATH +sudo chmod -R 777 $TMPUNRAR_PATH printf "\033]0; $TMUX_SESSION\007\003\n" $TMUXCMD -f $TMUX_CONF new-session -d -s $TMUX_SESSION -n $TMUX_SESSION 'cd bin && echo "Monitor Started" && echo "It might take a minute for everything to spinup......" && $NICE -n 19 $PHP monitor.php'