starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

lots of small tweaks

Browse Source
This commit is contained in:
jonnyboy
2012-12-31 19:15:59 -05:00
parent 601adf550f
commit a2eccdc41b
11 changed files with 153 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -5
View File
@@ -39,15 +39,15 @@
* update_cleanup needs to be uncommented to actually do something, and update_parsing is good for fixing a few releases everytime it runs, not a silver bullet though
* If you notice that the pane middle right is empty, that is intentional. I have bwm-ng ready to go into that spot, if you have it installed. Once it is installed run these commands as root from the nix_scripts/tmux folder:
`sed -i -e "s/$TMUX splitw -h -p 50 '$BWMNG'/$TMUX splitw -h -p 50 '$BWMNG'/" start.sh`
`sed -i -e 's/#command/command/' edit_these.sh`
* You have two choices for monitoring activity. Mytop monitors the sctivity of you mysql database and bwm-ng monitors your current traffic. Theses are selected in the edit_these.sh file. Only one can be selected at a time.
* If you are running this on an OVH or kimsufi server, you may need to run sudo ./start.sh because they built grsecurity into the kernel.
* Now all panes should be running smoothly.
<hr>
<a href='http://www.pledgie.com/campaigns/18980'><img alt='Click here to lend your support to: Newznab-tmux and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/18980.png?skin_name=chrome' border='0' /></a>
bin/innodb_import_full_threaded.sh
-34
View File
@@ -1,34 +0,0 @@
#!/bin/bash
set -e
source ../edit_these.sh
eval $( sed -n "/^define/ { s/.*('\([^']*\)', '*\([^']*\)'*);/export \1=\"\2\"/; p }" ../../../../www/config.php )
export MYSQL_CMD="UPDATE groups set backfill_target=backfill_target+1 where active=1 and backfill_target<$MAXDAYS;"
while :
do
#import nzb's
cd $INNODB_PATH
[ -f $INNODB_PATH/nzb-import.php ] && $PHP $INNODB_PATH/nzb-import.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries_threaded.php ] && $PHP $NEWZNAB_PATH/update_binaries_threaded.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill_threaded.php ] && $PHP $NEWZNAB_PATH/backfill_threaded.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
bin/innodb_import_threaded.sh
-34
View File
@@ -1,34 +0,0 @@
#!/bin/bash
set -e
source ../edit_these.sh
eval $( sed -n "/^define/ { s/.*('\([^']*\)', '*\([^']*\)'*);/export \1=\"\2\"/; p }" ../../../../www/config.php )
export MYSQL_CMD="UPDATE groups set backfill_target=backfill_target+1 where active=1 and backfill_target<$MAXDAYS;"
while :
do
#import nzb's
cd $INNODB_PATH
[ -f $INNODB_PATH/nzb-import.php ] && $PHP $INNODB_PATH/nzb-import.php ${NZBS} &
#make active groups current
cd $INNODB_PATH
[ -f $INNODB_PATH/update_binaries.php ] && $PHP $INNODB_PATH/update_binaries.php &
#get backfill for all active groups
cd $INNODB_PATH
[ -f $INNODB_PATH/backfill.php ] && $PHP $INNODB_PATH/backfill.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
bin/monitor.php
+8 -2
View File
@@ -19,10 +19,14 @@ while ($row = mysql_fetch_assoc($result_begin)) {
}
$i=1;
while($i=1)
while($i>0)
{
$result_inner_loop = mysql_query($query);
sleep(60);
if ($i>1) {
sleep(60);
}
$result_loop = mysql_query($query);
if (!$result_inner_loop) {
@@ -54,6 +58,8 @@ while($i=1)
printf("$count_loop releases currently in your database\n\n");
printf("***Info***\n");
printf("Above left shows the current NFO's being analyzed. Above middle shows the the processing for. Above right show the lookups for TVRage, music, etc. Below left shows the activity of imports - it is looping nzb import, backfill and current fill. Below right shows the activity of applying regex's and creating releases.\n");
$i++;
}
mysql_free_result($result_begin);
bin/myisam_import_full_threaded.sh
-34
View File
@@ -1,34 +0,0 @@
#!/bin/bash
set -e
source ../edit_these.sh
eval $( sed -n "/^define/ { s/.*('\([^']*\)', '*\([^']*\)'*);/export \1=\"\2\"/; p }" ../../../../www/config.php )
export MYSQL_CMD="UPDATE groups set backfill_target=backfill_target+1 where active=1 and backfill_target<$MAXDAYS;"
while :
do
#import nzb's
cd $ADMIN_PATH
[ -f $ADMIN_PATH/nzb-importmodified.php ] && $PHP $ADMIN_PATH/nzb-importmodified.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries_threaded.php ] && $PHP $NEWZNAB_PATH/update_binaries_threaded.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill_threaded.php ] && $PHP $NEWZNAB_PATH/backfill_threaded.php &
wait
#increment backfill days
#$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
bin/myisam_import_threaded.sh
-34
View File
@@ -1,34 +0,0 @@
#!/bin/bash
set -e
source ../edit_these.sh
eval $( sed -n "/^define/ { s/.*('\([^']*\)', '*\([^']*\)'*);/export \1=\"\2\"/; p }" ../../../../www/config.php )
export MYSQL_CMD="UPDATE groups set backfill_target=backfill_target+1 where active=1 and backfill_target<$MAXDAYS;"
while :
do
#import nzb's
cd $ADMIN_PATH
[ -f $ADMIN_PATH/nzb-importmodified.php ] && $PHP $ADMIN_PATH/nzb-importmodified.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries.php ] && $PHP $NEWZNAB_PATH/update_binaries.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill.php ] && $PHP $NEWZNAB_PATH/backfill.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
bin/workhorse.sh
Executable
+114
View File
@@ -0,0 +1,114 @@
#!/bin/bash
set -e
source ../edit_these.sh
eval $( sed -n "/^define/ { s/.*('\([^']*\)', '*\([^']*\)'*);/export \1=\"\2\"/; p }" ../../../../../www/config.php )
export MYSQL_CMD="UPDATE groups set backfill_target=backfill_target+1 where active=1 and backfill_target<$MAXDAYS;"
if [ "$THREADS" == "true" -a "$INNODB" == "true" ]; then
while :
do
#import nzb's
cd $INNODB_PATH
[ -f $INNODB_PATH/nzb-import.php ] && $PHP $INNODB_PATH/nzb-import.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries_threaded.php ] && $PHP $NEWZNAB_PATH/update_binaries_threaded.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill_threaded.php ] && $PHP $NEWZNAB_PATH/backfill_threaded.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
elif [ "$THREADS" != "true" -a "$INNODB" == "true" ]; then
while :
do
#import nzb's
cd $INNODB_PATH
[ -f $INNODB_PATH/nzb-import.php ] && $PHP $INNODB_PATH/nzb-import.php ${NZBS} &
#make active groups current
cd $INNODB_PATH
[ -f $INNODB_PATH/update_binaries.php ] && $PHP $INNODB_PATH/update_binaries.php &
#get backfill for all active groups
cd $INNODB_PATH
[ -f $INNODB_PATH/backfill.php ] && $PHP $INNODB_PATH/backfill.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
elif [ "$THREADS" == "true" -a "$INNODB" != "true" ]; then
while :
do
#import nzb's
cd $ADMIN_PATH
[ -f $ADMIN_PATH/nzb-importmodified.php ] && $PHP $ADMIN_PATH/nzb-importmodified.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries_threaded.php ] && $PHP $NEWZNAB_PATH/update_binaries_threaded.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill_threaded.php ] && $PHP $NEWZNAB_PATH/backfill_threaded.php &
wait
#increment backfill days
#$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
else
while :
do
#import nzb's
cd $ADMIN_PATH
[ -f $ADMIN_PATH/nzb-importmodified.php ] && $PHP $ADMIN_PATH/nzb-importmodified.php ${NZBS} &
#make active groups current
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/update_binaries.php ] && $PHP $NEWZNAB_PATH/update_binaries.php &
#get backfill for all active groups
cd $NEWZNAB_PATH
[ -f $NEWZNAB_PATH/backfill.php ] && $PHP $NEWZNAB_PATH/backfill.php &
wait
#increment backfill days
$MYSQL -u$DB_USER -h $DB_HOST --password=$DB_PASSWORD $DB_NAME -e "${MYSQL_CMD}"
echo "imports waiting $NEWZNAB_IMPORT_SLEEP_TIME seconds..."
sleep $NEWZNAB_IMPORT_SLEEP_TIME
done
fi
conf/.tmux.conf
+8 -1
View File
@@ -32,7 +32,14 @@ set-option -g status-interval 10
# Example of using a shell command in the status line
#set -g status-right "#[fg=yellow]#(uptime | cut -d ',' -f 2-)"
set -g status-right "#[fg=red]#(ls -1 changeme | wc -l) NZB's left to process #[fg=yellow]#(uptime | cut -d ',' -f 2-)"
#set -g status-right "#[fg=red]#(ls -1 changeme | wc -l) NZB's left to process #[fg=yellow]#(uptime | cut -d ',' -f 2-)"
set -g status-right \
"#[fg=red]#(ls -1 /home/jonnyboy/nzbs/batch | wc -l) NZB's left to process \
#[fg=yellow]#(free -m | grep 'Mem' | awk '{ print \"Ram Used: \"$3\" MB\";}') \
#[fg=yellow]#(free -m | grep 'Mem' | awk '{ print \"Ram Free: \"$4\" MB\";}') \
#[fg=yellow]#(free -m | grep 'Swap' | awk '{ print \"Swap Used: \"$3\" MB\";}') \
#[fg=yellow]#(uptime | cut -d ',' -f 2-)"
set-option -g status-right-length 200
#set -g status-right '#[fg=green][#[fg=blue]%Y-%m-%d #[fg=white]%H:%M#[default] #($HOME/bin/battery)#[fg=green]]'
edit_these.sh
+9 -3
View File
@@ -22,6 +22,12 @@ export THREADS='true'
#Choose your database, comment the one true/false
export INNODB='true'
#Choose which app to run in the middle right pane, of course it must be installed. Your choices are mytop and bwm-ng.
#Only have 1 uncommented at a time.
export CHOICE_APP='bwm-ng'
#export CHOICE_APP='mytop'
#By using this script you understand that the programmer is not responsible for any loss of data, users, or sanity.
#You also agree that you were smart enough to make a backup of your database and files. Do you agree? yes/no
@@ -33,6 +39,6 @@ export AGREED='no'
export MYSQL=`which mysql`
export SED=`which sed`
command -v php5 >/dev/null && export PHP=`which php5` || { export PHP=`which php`; }
command -v tmux >/dev/null && export TMUX=`which tmux` || { echo tmux command not found.\n apt-get install tmux\n or if on a real server yum install tmux; exit 1; }
#command -v bwm-ng >/dev/null && export BWMNG=`which bwm-ng` || { echo bwm-ng command not found.\n apt-get install bwm-ng; exit 1; }
command -v tmux >/dev/null && export TMUX=`which tmux`
command -v bwm-ng >/dev/null && export BWMNG=`which bwm-ng`
command -v mytop >/dev/null && export MYTOP=`which mytop`
set_perms.sh
-1
View File
@@ -30,5 +30,4 @@ chmod -R 777 $NEWZPATH/www/covers
chmod 777 $NEWZPATH/www
chmod 777 $NEWZPATH/www/install
chmod -R 777 $NEWZPATH/nzbfiles
#chown -R www-data:www-data /var/www/
chmod 777 $NEWZPATH/nzbfiles/tmpunrar/
start.sh
+9 -16
View File
@@ -7,26 +7,19 @@ if [[ $AGREED == "no" ]]; then
exit
fi
$TMUX new-session -d -s NewzNab -n NewzNab 'echo "processNfos Working......" && sleep 30 && $PHP bin/postprocess_nfo.php'
$TMUX new-session -d -s NewzNab -n NewzNab 'echo "processNfos Working......" && $PHP bin/postprocess_nfo.php'
$TMUX selectp -t 0
$TMUX splitw -v -p 82 'echo "monitor Working......" && $PHP bin/monitor.php'
if [ "$THREADS" == "true" -a "$INNODB" == "true" ]; then
$TMUX splitw -v -p 66 'cd bin && echo "imports Working......" && sleep 45 && ./innodb_import_full_threaded.sh'
elif [ "$THREADS" != "true" -a "$INNODB" == "true" ]; then
$TMUX splitw -v -p 66 'cd bin && echo "imports Working......" && sleep 45 && ./innodb_import_threaded.sh'
elif [ "$THREADS" == "true" -a "$INNODB" != "true" ]; then
$TMUX splitw -v -p 66 'cd bin && echo "imports Working......" && sleep 45 && ./myisam_import_full_threaded.sh'
else
$TMUX splitw -v -p 66 'cd bin && echo "imports Working......" && sleep 45 && ./myisam_import_threaded.sh'
fi
$TMUX splitw -v -p 66 'cd bin && echo "imports Working......" && ./workhorse.sh'
$TMUX selectp -t 0
$TMUX splitw -h -p 66 'echo "processAdditional Working......" && sleep 35 && $PHP bin/processAlternate.php'
$TMUX splitw -h -p 50 'echo "postProcessing Working......" && sleep 40 && $PHP bin/postprocessing.php'
$TMUX splitw -h -p 66 'echo "processAdditional Working......" && $PHP bin/processAlternate.php'
$TMUX splitw -h -p 50 'echo "postProcessing Working......" && $PHP bin/postprocessing.php'
$TMUX selectp -t 3
$TMUX splitw -h -p 50 #'$BWMNG'
if [[ $CHOICE_APP == "mytop" ]]; then
$TMUX splitw -h -p 50 '$MYTOP -u $DB_USER -p $DB_PASSWORD -d $DB_NAME -h $DB_HOST'
else
$TMUX splitw -h -p 50 '$BWMNG'
fi
$TMUX selectp -t 5
$TMUX splitw -h -p 50 'cd bin && echo "create Releases Working......" && ./cleanup_scripts.sh'