diff --git a/bin/backfill_all_quick.php b/bin/backfill_all_quick.php index ef96c4a0a..bad18fb59 100644 --- a/bin/backfill_all_quick.php +++ b/bin/backfill_all_quick.php @@ -2,8 +2,8 @@ require_once(dirname(__FILE__).'/config.php'); require_once(WWW_DIR.'/lib/nntp.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/bin/backfill_interval.php b/bin/backfill_interval.php index ba8c11201..4131e6cc0 100644 --- a/bin/backfill_interval.php +++ b/bin/backfill_interval.php @@ -3,8 +3,8 @@ require_once(dirname(__FILE__).'/config.php'); require_once(WWW_DIR.'/lib/nntp.php'); require_once(WWW_DIR.'/lib/Tmux.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/bin/fixreleasenames.php b/bin/fixreleasenames.php index 3c8244953..0794e8000 100644 --- a/bin/fixreleasenames.php +++ b/bin/fixreleasenames.php @@ -4,9 +4,9 @@ require(dirname(__FILE__)."/config.php"); require_once(WWW_DIR."/lib/framework/db.php"); require_once(WWW_DIR."/lib/groups.php"); require_once(WWW_DIR.'/lib/nntp.php'); -require_once("../test/ColorCLI.php"); -require_once("../test/namefixer.php"); -require_once("../test/functions.php"); +require_once("../lib/ColorCLI.php"); +require_once("../lib/namefixer.php"); +require_once("../lib/functions.php"); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/bin/monitor.php b/bin/monitor.php index d7ac1b366..1041f947d 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -4,12 +4,12 @@ require_once(dirname(__FILE__)."/config.php"); require(WWW_DIR.'/lib/postprocess.php'); require_once (WWW_DIR.'/lib/site.php'); require_once(WWW_DIR.'/lib/Tmux.php'); -require_once(dirname(__FILE__)."/../test/ColorCLI.php"); -require_once(dirname(__FILE__)."/../test/showsleep.php"); -require_once(dirname(__FILE__)."/../test/functions.php"); +require_once(dirname(__FILE__)."/../lib/ColorCLI.php"); +require_once(dirname(__FILE__)."/../lib/showsleep.php"); +require_once(dirname(__FILE__)."/../lib/functions.php"); -$version="0.3r1029"; +$version="0.3r1030"; $db = new DB(); $functions = new Functions(); @@ -161,7 +161,8 @@ $_bin = dirname(__FILE__)."/../bin"; $_conf = dirname(__FILE__)."/../conf"; $_powerline = dirname(__FILE__)."/../powerline"; $_cj = dirname(__FILE__)."/../nnscripts"; -$_test = dirname (__FILE__)."/../test"; +$_lib = dirname (__FILE__)."/../lib"; +$_py = dirname (__FILE__)."/../python"; $_user = dirname(__FILE__)."/../user_scripts"; @@ -1119,7 +1120,7 @@ $_php = $show_time . " nice -n$niceness $PHP"; $_phpn = "nice -n$niceness $PHP"; $_python = $show_time . " nice -n$niceness $PYTHON"; $_pythonn = "nice -n$niceness $PYTHON"; -$_sleep = "$_phpn ${DIR}/../test/showsleep.php"; +$_sleep = "$_phpn ${DIR}/../lib/showsleep.php"; //set command for running update_binaries if ($binaries == 1) { @@ -1127,14 +1128,14 @@ $_sleep = "$_phpn ${DIR}/../test/showsleep.php"; $_update_cmd = "cd $_bin && $_php update_binaries.php 2>&1 $log"; } else if ($binaries == 2) { $log = writelog($panes0[2]); - $_update_cmd = "$_python ${DIR}/../test/binaries_threaded.py 2>&1 $log"; + $_update_cmd = "$_python ${DIR}/../python/binaries_threaded.py 2>&1 $log"; } else if ($binaries == 3) { $log = writelog($panes0[2]); - $_update_cmd = "$_python ${DIR}/../test/binaries_safe_threaded.py 2>&1 $log"; + $_update_cmd = "$_python ${DIR}/../python/binaries_safe_threaded.py 2>&1 $log"; } if ($releases_run != 0) { - $run_releases = "$_python ${DIR}/../test/releases_threaded.py"; + $run_releases = "$_python ${DIR}/../python/releases_threaded.py"; } @@ -1167,15 +1168,15 @@ if ($running == 1){ if (($backfill == 4) && ($kill_pp == "false") && (TIME() - $time6 <= 4800)) { $log = writelog($panes0[3]); shell_exec("tmux respawnp -t${tmux_session}:0.3 ' \ - $_python ${DIR}/../test/backfill_safe_threaded.py $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_safe_threaded.py $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); } else if (($backfill != 0) && ($kill_pp == "false") && (TIME() - $time6 <= 4800)) { $log = writelog($panes0[3]); shell_exec("tmux respawnp -t${tmux_session}:0.3 ' \ - $_python ${DIR}/../test/backfill_threaded.py group $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_threaded.py group $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); } else if (($backfill != 0) && ($kill_pp == "false") && (TIME() - $time6 >= 4800)) { $log = writelog($panes0[3]); shell_exec("tmux respawnp -k -t${tmux_session}:0.3 ' \ - $_python ${DIR}/../test/backfill_threaded.py all $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_threaded.py all $log; date +\"%D %T\"; $_sleep $backsleep' 2>&1 1> /dev/null"); $time6 = TIME(); } else if ($kill_pp == "true") { $color = get_color($colors_start, $colors_end, $colors_exc); @@ -1194,7 +1195,7 @@ if ($running == 1){ if (($import != 0) && ($kill_pp == "false")) { $log = writelog($panes0[2]); shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/import_threaded.py $log; date +\"%D %T\"; $_sleep $import_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/import_threaded.py $log; date +\"%D %T\"; $_sleep $import_timer' 2>&1 1> /dev/null"); } else { $color = get_color($colors_start, $colors_end, $colors_exc); shell_exec("tmux respawnp -k -t${tmux_session}:0.2 'echo \"\033[38;5;${color}m\n${panes0[1]} has been disabled/terminated by Import\"'"); @@ -1207,39 +1208,39 @@ if ($running == 1){ if (($binaries != 0) && ($backfill == 4) && ($releases_run != 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ $_update_cmd $log; \ - $_python ${DIR}/../test/backfill_safe_threaded.py $log; \ + $_python ${DIR}/../python/backfill_safe_threaded.py $log; \ $run_releases $log; date +\"%D %T\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs all less than 4800 else if (($binaries != 0) && ($backfill != 0) && ($releases_run != 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ $_update_cmd $log; \ - $_python ${DIR}/../test/backfill_threaded.py $log; \ + $_python ${DIR}/../python/backfill_threaded.py $log; \ $run_releases $log; date +\"%D %T\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs bin/back/safe less than 4800 else if (($binaries != 0) && ($backfill == 4) && ($releases_run == 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ $_update_cmd $log; \ - $_python ${DIR}/../test/backfill_safe_threaded.py $log; date +\"%D %T\"; \ + $_python ${DIR}/../python/backfill_safe_threaded.py $log; date +\"%D %T\"; \ echo \"\nreleases has been disabled/terminated by Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs bin/back less than 4800 else if (($binaries != 0) && ($backfill != 0) && ($releases_run == 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ $_update_cmd $log; \ - $_python ${DIR}/../test/backfill_threaded.py $log; date +\"%D %T\"; echo \"\nreleases have been disabled/terminated by Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_threaded.py $log; date +\"%D %T\"; echo \"\nreleases have been disabled/terminated by Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs back/safe/rel less than 4800 else if (($binaries == 0) && ($backfill == 4) && ($releases_run != 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/backfill_safe_threaded.py $log; \ + $_python ${DIR}/../python/backfill_safe_threaded.py $log; \ $run_releases $log; date +\"%D %T\"; echo \"\nbinaries has been disabled/terminated by Binaries\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs back/rel less than 4800 else if (($binaries == 0) && ($backfill != 0) && ($releases_run != 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/backfill_threaded.py $log; \ + $_python ${DIR}/../python/backfill_threaded.py $log; \ $run_releases $log; date +\"%D %T\"; echo \"\nbinaries has been disabled/terminated by Binaries\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs bin/rel less than 4800 @@ -1256,12 +1257,12 @@ if ($running == 1){ //runs back/safe less than 4800 else if (($binaries == 0) && ($backfill == 4) && ($releases_run == 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/backfill_safe_threaded.py $log; date +\"%D %T\"; echo \"\nbinaries and releases have been disabled/terminated by Binaries and Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_safe_threaded.py $log; date +\"%D %T\"; echo \"\nbinaries and releases have been disabled/terminated by Binaries and Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs back less than 4800 else if (($binaries == 0) && ($backfill == 4) && ($releases_run == 0)) { shell_exec("tmux respawnp -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/backfill_threaded.py $log; date +\"%D %T\"; echo \"\nbinaries and releases have been disabled/terminated by Binaries and Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_threaded.py $log; date +\"%D %T\"; echo \"\nbinaries and releases have been disabled/terminated by Binaries and Releases\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); } //runs rel less than 4800 else if (($binaries == 0) && ($backfill == 0) && ($releases_run != 0)) { @@ -1275,7 +1276,7 @@ if ($running == 1){ //run backfill all once and resets the timer if ($backfill != 0) { shell_exec("tmux respawnp -k -t${tmux_session}:0.2 ' \ - $_python ${DIR}/../test/backfill_threaded.py all $log; date +\"%D %T\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/backfill_threaded.py all $log; date +\"%D %T\"; $_sleep $seq_timer' 2>&1 1> /dev/null"); $time6 = TIME(); } $time6 = TIME(); @@ -1294,7 +1295,7 @@ if ($running == 1){ if (($import != 0) && ($kill_pp == "false")) { $log = writelog($panes0[4]); shell_exec("tmux respawnp -t${tmux_session}:0.4 ' \ - $_python ${DIR}/../test/import_threaded.py $log; date +\"%D %T\"; $_sleep $import_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/import_threaded.py $log; date +\"%D %T\"; $_sleep $import_timer' 2>&1 1> /dev/null"); } else if (( $import == 1 ) && ( $maxload <= get_load())) { $color = get_color($colors_start, $colors_end, $colors_exc); shell_exec("tmux respawnp -t${tmux_session}:0.4 'echo \"\033[38;5;\"$color\"m\n$panes0[4] Disabled by Max Load\"' 2>&1 1> /dev/null"); @@ -1342,12 +1343,12 @@ if ($running == 1){ $log = writelog($panes0[1]); shell_exec("tmux respawnp -t${tmux_session}:0.1 'echo \"\033[38;5;${color}m\"; \ rm -rf $tmpunrar/*; \ - $_python ${DIR}/../test/postprocess_threaded.py additional $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/postprocess_threaded.py additional $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); } else if (($post == 2) && ($nfo_remaining_now > 0)) { $log = writelog($panes0[1]); shell_exec("tmux respawnp -t${tmux_session}:0.1 ' \ rm -rf $tmpunrar/*; \ - $_python ${DIR}/../test/postprocess_threaded.py nfo $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/postprocess_threaded.py nfo $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); } else if (($post == 3) && (($nfo_remaining_now > 0) || ($work_remaining_now + $pc_releases_proc + $xxx_releases_proc > 0))) { //run postprocess_releases additional $history = str_replace(" ", '', `tmux list-panes -t${tmux_session}:0 | grep 1: | awk '{print $4;}'`); @@ -1369,8 +1370,8 @@ if ($running == 1){ $log = writelog($panes0[1]); shell_exec("tmux respawnp -t${tmux_session}:0.1 ' \ rm -rf $tmpunrar/*; \ - $_python ${DIR}/../test/postprocess_threaded.py additional $log;\ - $_python ${DIR}/../test/postprocess_threaded.py nfo $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/postprocess_threaded.py additional $log;\ + $_python ${DIR}/../python/postprocess_threaded.py nfo $log; date +\"%D %T\"; $_sleep $post_timer' 2>&1 1> /dev/null"); } else if (($post != 0) && ($nfo_remaining_now == 0) && ($work_remaining_now + $pc_releases_proc + $xxx_releases_proc == 0)) { $color = get_color($colors_start, $colors_end, $colors_exc); shell_exec("tmux respawnp -k -t${tmux_session}:0.1 'echo \"\033[38;5;${color}m\n${panes0[1]} has been disabled/terminated by No Misc/Nfo to process\"'"); @@ -1383,7 +1384,7 @@ if ($running == 1){ if (( $maxloadr >= get_load()) && ( $releases_run == 2 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes0[5]); - shell_exec("tmux respawnp -t${tmux_session}:0.5 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_python ${DIR}/../test/releases_threaded.py && 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $rel_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:0.5 'echo \"\033[38;5;\"$color\"m\" && cd $_t && $_python ${DIR}/../python/releases_threaded.py && 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $rel_timer' 2>&1 1> /dev/null"); } elseif (( $maxloadr >= get_load()) && ( $releases_run == 1 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes0[5]); @@ -1391,7 +1392,7 @@ if ($running == 1){ } elseif (( $maxloadr >= get_load()) && ( $releases_run == 2 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes0[5]); - shell_exec("tmux respawnp -t${tmux_session}:0.5 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_python ${DIR}/../test/releases_threaded.py 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $rel_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:0.5 'echo \"\033[38;5;\"$color\"m\" && cd $_py && $_python ${DIR}/../python/releases_threaded.py 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $rel_timer' 2>&1 1> /dev/null"); } elseif (( $maxloadr >= get_load()) && ( $releases_run == 1 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes0[5]); @@ -1512,7 +1513,7 @@ if ($running == 1){ //run postprocess_releases non amazon $log = writelog($panes2[1]); shell_exec("tmux respawnp -t${tmux_session}:2.1 ' \ - $_python ${DIR}/../test/postprocess_threaded.py tv $clean $log; date +\"%D %T\"; $_sleep $post_timer_non' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/postprocess_threaded.py tv $clean $log; date +\"%D %T\"; $_sleep $post_timer_non' 2>&1 1> /dev/null"); } else if (($post_non != 0) && ($tvrage_releases_proc == 0)) { $color = get_color($colors_start, $colors_end, $colors_exc); shell_exec("tmux respawnp -k -t${tmux_session}:2.1 'echo \"\033[38;5;${color}m\n${panes2[1]} has been disabled/terminated by No TV to process\"'"); @@ -1529,7 +1530,7 @@ if ($running == 1){ //run postprocess_releases non amazon $log = writelog($panes2[2]); shell_exec("tmux respawnp -t${tmux_session}:2.2 ' \ - $_python ${DIR}/../test/postprocess_threaded.py movie $clean $log; date +\"%D %T\"; $_sleep $post_timer_non' 2>&1 1> /dev/null"); + $_python ${DIR}/../python/postprocess_threaded.py movie $clean $log; date +\"%D %T\"; $_sleep $post_timer_non' 2>&1 1> /dev/null"); } else if (($maxload >= get_load()) && ($post_non != 0) && ($movie_releases_proc == 0)) { $color = get_color($colors_start, $colors_end, $colors_exc); shell_exec("tmux respawnp -k -t${tmux_session}:2.2 'echo \"\033[38;5;${color}m\n${panes2[2]} has been disabled/terminated by No Movies to process\"'"); @@ -1657,16 +1658,16 @@ if ($running == 1){ $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[0]); shell_exec("tmux respawnp -t${tmux_session}:3.0 ' \ - cd $_test && $_python ${DIR}/../test/fixreleasenames_threaded.py md5 2>&1 $log; \ - $_python ${DIR}/../test/fixreleasenames_threaded.py nfo 2>&1 $log; \ - $_python ${DIR}/../test/fixreleasenames_threaded.py filename 2>&1 $log; \ - $_python ${DIR}/../test/fixreleasenames_threaded.py par2 2>&1 $log; \ + cd $_py && $_python ${DIR}/../python/fixreleasenames_threaded.py md5 2>&1 $log; \ + $_python ${DIR}/../python/fixreleasenames_threaded.py nfo 2>&1 $log; \ + $_python ${DIR}/../python/fixreleasenames_threaded.py filename 2>&1 $log; \ + $_python ${DIR}/../python/fixreleasenames_threaded.py par2 2>&1 $log; \ $_sleep $fix_timer' 2>&1 1> /dev/null"); $time27 = TIME(); } elseif (( $maxload >= get_load()) && ( $fix_names == 1 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[0]); - shell_exec("tmux respawnp -t${tmux_session}:3.0 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_php fixReleaseNames.php 3 true other yes show 2>&1 $log && $_php fixReleaseNames.php 5 true other yes show 2>&1 $log && $_php fixReleaseNames.php 7 true other yes show 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $fix_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:3.0 'echo \"\033[38;5;\"$color\"m\" && cd $_lib && $_php fixReleaseNames.php 3 true other yes show 2>&1 $log && $_php fixReleaseNames.php 5 true other yes show 2>&1 $log && $_php fixReleaseNames.php 7 true other yes show 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $fix_timer' 2>&1 1> /dev/null"); $time27 = TIME(); } elseif ( $fix_names == 0 ) { $color = get_color($colors_start, $colors_end, $colors_exc); @@ -1679,7 +1680,7 @@ if ($running == 1){ if (($maxload >= get_load()) && (($dehash == 1) || ($dehash == 3))) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[1]); - shell_exec("tmux respawnp -t${tmux_session}:3.1 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_php predb_hash_decrypt.php 1000 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $dehash_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:3.1 'echo \"\033[38;5;\"$color\"m\" && cd $_lib && $_php predb_hash_decrypt.php 1000 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $dehash_timer' 2>&1 1> /dev/null"); $time28 = TIME(); } else if ( $maxload <= get_load()) { $color = get_color($colors_start, $colors_end, $colors_exc); @@ -1692,12 +1693,12 @@ if ($running == 1){ if (( $maxload >= get_load()) && ( $lookreqids == 2 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[2]); - shell_exec("tmux respawnp -t${tmux_session}:3.2 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_python ${DIR}/../test/requestid_threaded.py 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $lookreqids_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:3.2 'echo \"\033[38;5;\"$color\"m\" && cd $_py && $_python ${DIR}/../python/requestid_threaded.py 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $lookreqids_timer' 2>&1 1> /dev/null"); $time30 = TIME(); } elseif (( $maxload >= get_load()) && ( $lookreqids == 1 )) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[2]); - shell_exec("tmux respawnp -t${tmux_session}:3.2 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_php requestID.php 1000 true 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $lookreqids_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:3.2 'echo \"\033[38;5;\"$color\"m\" && cd $_lib && $_php requestID.php 1000 true 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $lookreqids_timer' 2>&1 1> /dev/null"); $time30 = TIME(); } else if ( $maxload <= get_load()) { $color = get_color($colors_start, $colors_end, $colors_exc); @@ -1712,7 +1713,7 @@ if ($running == 1){ case 'All': $log = writelog($panes3[3]); shell_exec("tmux respawnp -t${tmux_session}:3.3 ' \ - $_php ${DIR}/../test/removeCrapReleases_new.php true 2 $log; date +\"%D %T\"; $_sleep $crap_timer' 2>&1 1> /dev/null"); + $_php ${DIR}/../lib/removeCrapReleases_new.php true 2 $log; date +\"%D %T\"; $_sleep $crap_timer' 2>&1 1> /dev/null"); break; // The user has specified custom types. case 'Custom': @@ -1736,7 +1737,7 @@ if ($running == 1){ // Run remove crap releases. shell_exec("tmux respawnp -t${tmux_session}:3.3 ' \ echo \"Running removeCrapReleases for $fix_crap[$fcnum]\"; \ - php ${DIR}/../test/removeCrapReleases_new.php true $fctime $fix_crap[$fcnum] $log; date +\"%D %T\"; $_sleep $crap_timer' 2>&1 1> /dev/null"); + php ${DIR}/../lib/removeCrapReleases_new.php true $fctime $fix_crap[$fcnum] $log; date +\"%D %T\"; $_sleep $crap_timer' 2>&1 1> /dev/null"); // Increment so we know which type to run next. $fcnum++; @@ -1762,7 +1763,7 @@ if ($running == 1){ if (($maxload >= get_load()) && (($dehash == 2) || ($dehash == 3))) { $color = get_color($colors_start, $colors_end, $colors_exc); $log = writelog($panes3[4]); - shell_exec("tmux respawnp -t${tmux_session}:3.4 'echo \"\033[38;5;\"$color\"m\" && cd $_test && $_php postprocess_pre.php 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $dehash_timer' 2>&1 1> /dev/null"); + shell_exec("tmux respawnp -t${tmux_session}:3.4 'echo \"\033[38;5;\"$color\"m\" && cd $_lib && $_php postprocess_pre.php 2>&1 $log && echo \" \033[1;0;33m\" && $_sleep $dehash_timer' 2>&1 1> /dev/null"); $time32 = TIME(); } else if ( $maxload <= get_load()) { $color = get_color($colors_start, $colors_end, $colors_exc); diff --git a/bin/nzb-import-new.php b/bin/nzb-import-new.php index 3af63a931..4386d479c 100644 --- a/bin/nzb-import-new.php +++ b/bin/nzb-import-new.php @@ -6,9 +6,9 @@ require_once(WWW_DIR.'/lib/binaries.php'); require_once(WWW_DIR.'/lib/category.php'); require_once(WWW_DIR.'/lib/groups.php'); require_once(WWW_DIR.'/lib/nzb.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/namecleaner.php'); -require_once(dirname(__FILE__).'/../test/consoletools.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/namecleaner.php'); +require_once(dirname(__FILE__).'/../lib/consoletools.php'); $c = new ColorCLI(); diff --git a/bin/postprocess_alpha.php b/bin/postprocess_alpha.php index 3b0cf26e1..d68a8639a 100644 --- a/bin/postprocess_alpha.php +++ b/bin/postprocess_alpha.php @@ -8,8 +8,8 @@ require_once(WWW_DIR.'/lib/tvrage.php'); require_once(WWW_DIR.'/lib/thetvdb.php'); require_once(WWW_DIR.'/lib/nfo.php'); require_once(WWW_DIR.'/lib/Tmux.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/bin/postprocess_new.php b/bin/postprocess_new.php index 471f6abc1..33983a837 100644 --- a/bin/postprocess_new.php +++ b/bin/postprocess_new.php @@ -7,8 +7,8 @@ require_once(WWW_DIR.'/lib/site.php'); require_once(WWW_DIR.'/lib/anidb.php'); require_once(WWW_DIR.'/lib/tvrage.php'); require_once(WWW_DIR.'/lib/thetvdb.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); $c = new ColorCLI(); $s = new Sites(); diff --git a/bin/requestID.php b/bin/requestID.php index 37e13f6f8..9ee5e3854 100644 --- a/bin/requestID.php +++ b/bin/requestID.php @@ -4,8 +4,8 @@ require(dirname(__FILE__)."/config.php"); require_once(WWW_DIR."/lib/framework/db.php"); require_once(WWW_DIR."/lib/groups.php"); require_once(WWW_DIR."/lib/category.php"); -require_once(dirname(__FILE__).'/../test/functions.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/bin/safe_pull.php b/bin/safe_pull.php index 2c55ed058..345c05b40 100644 --- a/bin/safe_pull.php +++ b/bin/safe_pull.php @@ -2,9 +2,9 @@ require_once(dirname(__FILE__).'/config.php'); require_once(WWW_DIR.'/lib/nntp.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/consoletools.php'); -require_once(dirname(__FILE__).'/../test/functions.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/consoletools.php'); +require_once(dirname(__FILE__).'/../lib/functions.php'); $c = new ColorCLI(); diff --git a/bin/update_binaries.php b/bin/update_binaries.php index 1e41e3149..ef90cb9d4 100644 --- a/bin/update_binaries.php +++ b/bin/update_binaries.php @@ -3,7 +3,7 @@ require(dirname(__FILE__)."/config.php"); require_once(WWW_DIR."/lib/groups.php"); require_once(WWW_DIR."/lib/binaries.php"); -require_once(dirname(__FILE__)."/../test/ColorCLI.php"); +require_once(dirname(__FILE__)."/../lib/ColorCLI.php"); $time = TIME(); $c = new ColorCLI(); diff --git a/bin/update_groups.php b/bin/update_groups.php index c0aa51346..520a45bc1 100644 --- a/bin/update_groups.php +++ b/bin/update_groups.php @@ -2,8 +2,8 @@ require_once(dirname(__FILE__).'/config.php'); require_once(WWW_DIR.'/lib/nntp.php'); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); -require_once(dirname(__FILE__).'/../test/consoletools.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/consoletools.php'); $start = TIME(); diff --git a/bin/update_releases_new.php b/bin/update_releases_new.php index 17943acce..0ece3d46f 100644 --- a/bin/update_releases_new.php +++ b/bin/update_releases_new.php @@ -3,7 +3,7 @@ $time = TIME(); require(dirname(__FILE__)."/config.php"); require_once(WWW_DIR."/lib/releases.php"); //require_once(WWW_DIR."/lib/sphinx.php"); -require_once(dirname(__FILE__).'/../test/ColorCLI.php'); +require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/test/ColorCLI.php b/lib/ColorCLI.php similarity index 100% rename from test/ColorCLI.php rename to lib/ColorCLI.php diff --git a/test/DB/db.sql b/lib/DB/db.sql similarity index 100% rename from test/DB/db.sql rename to lib/DB/db.sql diff --git a/test/DB/mysqldump_tables.php b/lib/DB/mysqldump_tables.php similarity index 100% rename from test/DB/mysqldump_tables.php rename to lib/DB/mysqldump_tables.php diff --git a/test/DB/patchDB.php b/lib/DB/patchDB.php similarity index 100% rename from test/DB/patchDB.php rename to lib/DB/patchDB.php diff --git a/test/DB/patches/db_update_14_03_2014.sql b/lib/DB/patches/db_update_14_03_2014.sql similarity index 100% rename from test/DB/patches/db_update_14_03_2014.sql rename to lib/DB/patches/db_update_14_03_2014.sql diff --git a/test/DB/patches/db_update_14_03_2014_02.sql b/lib/DB/patches/db_update_14_03_2014_02.sql similarity index 100% rename from test/DB/patches/db_update_14_03_2014_02.sql rename to lib/DB/patches/db_update_14_03_2014_02.sql diff --git a/test/DB/patches/db_update_16_03_2014.sql b/lib/DB/patches/db_update_16_03_2014.sql similarity index 100% rename from test/DB/patches/db_update_16_03_2014.sql rename to lib/DB/patches/db_update_16_03_2014.sql diff --git a/test/DB/patches/db_update_18_03_2014.sql b/lib/DB/patches/db_update_18_03_2014.sql similarity index 100% rename from test/DB/patches/db_update_18_03_2014.sql rename to lib/DB/patches/db_update_18_03_2014.sql diff --git a/test/DB/patches/db_update_18_03_2014_2.sql b/lib/DB/patches/db_update_18_03_2014_2.sql similarity index 100% rename from test/DB/patches/db_update_18_03_2014_2.sql rename to lib/DB/patches/db_update_18_03_2014_2.sql diff --git a/test/DB/patches/db_update_20_03_2014.sql b/lib/DB/patches/db_update_20_03_2014.sql similarity index 100% rename from test/DB/patches/db_update_20_03_2014.sql rename to lib/DB/patches/db_update_20_03_2014.sql diff --git a/test/DB/patches/db_update_20_03_2014_2.sql b/lib/DB/patches/db_update_20_03_2014_2.sql similarity index 100% rename from test/DB/patches/db_update_20_03_2014_2.sql rename to lib/DB/patches/db_update_20_03_2014_2.sql diff --git a/test/DB/patches/db_update_22_03_2014.sql b/lib/DB/patches/db_update_22_03_2014.sql similarity index 100% rename from test/DB/patches/db_update_22_03_2014.sql rename to lib/DB/patches/db_update_22_03_2014.sql diff --git a/test/DB/patches/old/db_update_01_01_2014.sql b/lib/DB/patches/old/db_update_01_01_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_01_01_2014.sql rename to lib/DB/patches/old/db_update_01_01_2014.sql diff --git a/test/DB/patches/old/db_update_01_01_2014_2.sql b/lib/DB/patches/old/db_update_01_01_2014_2.sql similarity index 100% rename from test/DB/patches/old/db_update_01_01_2014_2.sql rename to lib/DB/patches/old/db_update_01_01_2014_2.sql diff --git a/test/DB/patches/old/db_update_04_03_2014.sql b/lib/DB/patches/old/db_update_04_03_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_04_03_2014.sql rename to lib/DB/patches/old/db_update_04_03_2014.sql diff --git a/test/DB/patches/old/db_update_04_12_2013.sql b/lib/DB/patches/old/db_update_04_12_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_04_12_2013.sql rename to lib/DB/patches/old/db_update_04_12_2013.sql diff --git a/test/DB/patches/old/db_update_08_10_2013.sql b/lib/DB/patches/old/db_update_08_10_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_08_10_2013.sql rename to lib/DB/patches/old/db_update_08_10_2013.sql diff --git a/test/DB/patches/old/db_update_09_12_2013.sql b/lib/DB/patches/old/db_update_09_12_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_09_12_2013.sql rename to lib/DB/patches/old/db_update_09_12_2013.sql diff --git a/test/DB/patches/old/db_update_10_12_2013.sql b/lib/DB/patches/old/db_update_10_12_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_10_12_2013.sql rename to lib/DB/patches/old/db_update_10_12_2013.sql diff --git a/test/DB/patches/old/db_update_11_03_2014.sql b/lib/DB/patches/old/db_update_11_03_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_11_03_2014.sql rename to lib/DB/patches/old/db_update_11_03_2014.sql diff --git a/test/DB/patches/old/db_update_11_12_2013.sql b/lib/DB/patches/old/db_update_11_12_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_11_12_2013.sql rename to lib/DB/patches/old/db_update_11_12_2013.sql diff --git a/test/DB/patches/old/db_update_12_03_2014.sql b/lib/DB/patches/old/db_update_12_03_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_12_03_2014.sql rename to lib/DB/patches/old/db_update_12_03_2014.sql diff --git a/test/DB/patches/old/db_update_13_01_2014.sql b/lib/DB/patches/old/db_update_13_01_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_13_01_2014.sql rename to lib/DB/patches/old/db_update_13_01_2014.sql diff --git a/test/DB/patches/old/db_update_13_01_2014_2.sql b/lib/DB/patches/old/db_update_13_01_2014_2.sql similarity index 100% rename from test/DB/patches/old/db_update_13_01_2014_2.sql rename to lib/DB/patches/old/db_update_13_01_2014_2.sql diff --git a/test/DB/patches/old/db_update_13_02_2014.sql b/lib/DB/patches/old/db_update_13_02_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_13_02_2014.sql rename to lib/DB/patches/old/db_update_13_02_2014.sql diff --git a/test/DB/patches/old/db_update_13_03_2014.sql b/lib/DB/patches/old/db_update_13_03_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_13_03_2014.sql rename to lib/DB/patches/old/db_update_13_03_2014.sql diff --git a/test/DB/patches/old/db_update_13_11_2013.sql b/lib/DB/patches/old/db_update_13_11_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_13_11_2013.sql rename to lib/DB/patches/old/db_update_13_11_2013.sql diff --git a/test/DB/patches/old/db_update_15_10_2013.sql b/lib/DB/patches/old/db_update_15_10_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_15_10_2013.sql rename to lib/DB/patches/old/db_update_15_10_2013.sql diff --git a/test/DB/patches/old/db_update_17_11_2013.sql b/lib/DB/patches/old/db_update_17_11_2013.sql similarity index 100% rename from test/DB/patches/old/db_update_17_11_2013.sql rename to lib/DB/patches/old/db_update_17_11_2013.sql diff --git a/test/DB/patches/old/db_update_18_02_2014.sql b/lib/DB/patches/old/db_update_18_02_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_18_02_2014.sql rename to lib/DB/patches/old/db_update_18_02_2014.sql diff --git a/test/DB/patches/old/db_update_20_02_2014.sql b/lib/DB/patches/old/db_update_20_02_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_20_02_2014.sql rename to lib/DB/patches/old/db_update_20_02_2014.sql diff --git a/test/DB/patches/old/db_update_21_02_2014.sql b/lib/DB/patches/old/db_update_21_02_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_21_02_2014.sql rename to lib/DB/patches/old/db_update_21_02_2014.sql diff --git a/test/DB/patches/old/db_update_28_02_2014.sql b/lib/DB/patches/old/db_update_28_02_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_28_02_2014.sql rename to lib/DB/patches/old/db_update_28_02_2014.sql diff --git a/test/DB/patches/old/db_update_31_01_2014.sql b/lib/DB/patches/old/db_update_31_01_2014.sql similarity index 100% rename from test/DB/patches/old/db_update_31_01_2014.sql rename to lib/DB/patches/old/db_update_31_01_2014.sql diff --git a/test/ReleaseRemover.php b/lib/ReleaseRemover.php similarity index 100% rename from test/ReleaseRemover.php rename to lib/ReleaseRemover.php diff --git a/test/TraktTv.php b/lib/TraktTv.php similarity index 100% rename from test/TraktTv.php rename to lib/TraktTv.php diff --git a/test/consoletools.php b/lib/consoletools.php old mode 100755 new mode 100644 similarity index 100% rename from test/consoletools.php rename to lib/consoletools.php diff --git a/test/convert_mysql_tables.php b/lib/convert_mysql_tables.php old mode 100755 new mode 100644 similarity index 100% rename from test/convert_mysql_tables.php rename to lib/convert_mysql_tables.php diff --git a/test/copy_this/www/admin/tmux-edit.php b/lib/copy_this/www/admin/tmux-edit.php similarity index 100% rename from test/copy_this/www/admin/tmux-edit.php rename to lib/copy_this/www/admin/tmux-edit.php diff --git a/test/copy_this/www/lib/Tmux.php b/lib/copy_this/www/lib/Tmux.php similarity index 100% rename from test/copy_this/www/lib/Tmux.php rename to lib/copy_this/www/lib/Tmux.php diff --git a/test/copy_this/www/pages/ajax_prehashinfo.php b/lib/copy_this/www/pages/ajax_prehashinfo.php similarity index 100% rename from test/copy_this/www/pages/ajax_prehashinfo.php rename to lib/copy_this/www/pages/ajax_prehashinfo.php diff --git a/test/copy_this/www/pages/details.php b/lib/copy_this/www/pages/details.php similarity index 100% rename from test/copy_this/www/pages/details.php rename to lib/copy_this/www/pages/details.php diff --git a/test/copy_this/www/pages/prehash.php b/lib/copy_this/www/pages/prehash.php similarity index 100% rename from test/copy_this/www/pages/prehash.php rename to lib/copy_this/www/pages/prehash.php diff --git a/test/copy_this/www/templates/default/images/icons/binsearch.png b/lib/copy_this/www/templates/default/images/icons/binsearch.png similarity index 100% rename from test/copy_this/www/templates/default/images/icons/binsearch.png rename to lib/copy_this/www/templates/default/images/icons/binsearch.png diff --git a/test/copy_this/www/templates/default/images/icons/nzbindex.png b/lib/copy_this/www/templates/default/images/icons/nzbindex.png similarity index 100% rename from test/copy_this/www/templates/default/images/icons/nzbindex.png rename to lib/copy_this/www/templates/default/images/icons/nzbindex.png diff --git a/test/copy_this/www/templates/default/scripts/utils.js b/lib/copy_this/www/templates/default/scripts/utils.js similarity index 100% rename from test/copy_this/www/templates/default/scripts/utils.js rename to lib/copy_this/www/templates/default/scripts/utils.js diff --git a/test/copy_this/www/templates/default/styles/style.css b/lib/copy_this/www/templates/default/styles/style.css similarity index 100% rename from test/copy_this/www/templates/default/styles/style.css rename to lib/copy_this/www/templates/default/styles/style.css diff --git a/test/copy_this/www/templates/default/views/admin/adminmenu.tpl b/lib/copy_this/www/templates/default/views/admin/adminmenu.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/admin/adminmenu.tpl rename to lib/copy_this/www/templates/default/views/admin/adminmenu.tpl diff --git a/test/copy_this/www/templates/default/views/admin/tmux-edit.tpl b/lib/copy_this/www/templates/default/views/admin/tmux-edit.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/admin/tmux-edit.tpl rename to lib/copy_this/www/templates/default/views/admin/tmux-edit.tpl diff --git a/test/copy_this/www/templates/default/views/frontend/browse.tpl b/lib/copy_this/www/templates/default/views/frontend/browse.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/frontend/browse.tpl rename to lib/copy_this/www/templates/default/views/frontend/browse.tpl diff --git a/test/copy_this/www/templates/default/views/frontend/prehash.tpl b/lib/copy_this/www/templates/default/views/frontend/prehash.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/frontend/prehash.tpl rename to lib/copy_this/www/templates/default/views/frontend/prehash.tpl diff --git a/test/copy_this/www/templates/default/views/frontend/search.tpl b/lib/copy_this/www/templates/default/views/frontend/search.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/frontend/search.tpl rename to lib/copy_this/www/templates/default/views/frontend/search.tpl diff --git a/test/copy_this/www/templates/default/views/frontend/viewnzb.tpl b/lib/copy_this/www/templates/default/views/frontend/viewnzb.tpl similarity index 100% rename from test/copy_this/www/templates/default/views/frontend/viewnzb.tpl rename to lib/copy_this/www/templates/default/views/frontend/viewnzb.tpl diff --git a/test/dump_prehash.php b/lib/dump_prehash.php similarity index 100% rename from test/dump_prehash.php rename to lib/dump_prehash.php diff --git a/test/fixReleaseNames.php b/lib/fixReleaseNames.php old mode 100755 new mode 100644 similarity index 100% rename from test/fixReleaseNames.php rename to lib/fixReleaseNames.php diff --git a/test/functions.php b/lib/functions.php old mode 100755 new mode 100644 similarity index 100% rename from test/functions.php rename to lib/functions.php diff --git a/test/hash_decrypt.php b/lib/hash_decrypt.php old mode 100755 new mode 100644 similarity index 100% rename from test/hash_decrypt.php rename to lib/hash_decrypt.php diff --git a/test/namecleaner.php b/lib/namecleaner.php old mode 100755 new mode 100644 similarity index 100% rename from test/namecleaner.php rename to lib/namecleaner.php diff --git a/test/namefixer.php b/lib/namefixer.php similarity index 100% rename from test/namefixer.php rename to lib/namefixer.php diff --git a/test/nzbcontents.php b/lib/nzbcontents.php similarity index 100% rename from test/nzbcontents.php rename to lib/nzbcontents.php diff --git a/test/postprocess_pre.php b/lib/postprocess_pre.php old mode 100755 new mode 100644 similarity index 100% rename from test/postprocess_pre.php rename to lib/postprocess_pre.php diff --git a/test/predb_hash_decrypt.php b/lib/predb_hash_decrypt.php similarity index 100% rename from test/predb_hash_decrypt.php rename to lib/predb_hash_decrypt.php diff --git a/test/prehash.php b/lib/prehash.php old mode 100755 new mode 100644 similarity index 100% rename from test/prehash.php rename to lib/prehash.php diff --git a/test/removeCrapReleases.php b/lib/removeCrapReleases.php old mode 100755 new mode 100644 similarity index 100% rename from test/removeCrapReleases.php rename to lib/removeCrapReleases.php diff --git a/test/removeCrapReleases_new.php b/lib/removeCrapReleases_new.php similarity index 100% rename from test/removeCrapReleases_new.php rename to lib/removeCrapReleases_new.php diff --git a/test/remove_exact_dupes.php b/lib/remove_exact_dupes.php similarity index 100% rename from test/remove_exact_dupes.php rename to lib/remove_exact_dupes.php diff --git a/test/requestID.php b/lib/requestID.php similarity index 100% rename from test/requestID.php rename to lib/requestID.php diff --git a/test/showsleep.php b/lib/showsleep.php similarity index 100% rename from test/showsleep.php rename to lib/showsleep.php diff --git a/test/simple_html_dom.php b/lib/simple_html_dom.php similarity index 100% rename from test/simple_html_dom.php rename to lib/simple_html_dom.php diff --git a/test/update_prehash_md5.php b/lib/update_prehash_md5.php similarity index 100% rename from test/update_prehash_md5.php rename to lib/update_prehash_md5.php diff --git a/test/backfill_safe_threaded.py b/python/backfill_safe_threaded.py similarity index 100% rename from test/backfill_safe_threaded.py rename to python/backfill_safe_threaded.py diff --git a/test/backfill_threaded.py b/python/backfill_threaded.py similarity index 100% rename from test/backfill_threaded.py rename to python/backfill_threaded.py diff --git a/test/binaries_safe_threaded.py b/python/binaries_safe_threaded.py similarity index 100% rename from test/binaries_safe_threaded.py rename to python/binaries_safe_threaded.py diff --git a/test/binaries_threaded.py b/python/binaries_threaded.py similarity index 100% rename from test/binaries_threaded.py rename to python/binaries_threaded.py diff --git a/test/fixreleasenames_threaded.py b/python/fixreleasenames_threaded.py similarity index 100% rename from test/fixreleasenames_threaded.py rename to python/fixreleasenames_threaded.py diff --git a/test/import_threaded.py b/python/import_threaded.py similarity index 100% rename from test/import_threaded.py rename to python/import_threaded.py diff --git a/test/lib/info.py b/python/lib/info.py similarity index 100% rename from test/lib/info.py rename to python/lib/info.py diff --git a/test/postprocess_threaded.py b/python/postprocess_threaded.py similarity index 100% rename from test/postprocess_threaded.py rename to python/postprocess_threaded.py diff --git a/test/releases_threaded.py b/python/releases_threaded.py similarity index 100% rename from test/releases_threaded.py rename to python/releases_threaded.py diff --git a/test/requestid_threaded.py b/python/requestid_threaded.py similarity index 100% rename from test/requestid_threaded.py rename to python/requestid_threaded.py diff --git a/scripts/check_git.py b/scripts/check_git.py index 26daaa22b..20d130cad 100755 --- a/scripts/check_git.py +++ b/scripts/check_git.py @@ -47,13 +47,13 @@ def gitCurrentVersion(): return current_commit def latestCommit(): - url = 'https://api.github.com/repos/jonnyboy/newznab-tmux/commits/master' + url = 'https://api.github.com/repos/DariusIII/newznab-tmux/commits/master' result = urllib2.urlopen(url).read() git = json.JSONDecoder().decode(result) return git['sha'] def commitsBehind(): - url = 'https://api.github.com/repos/jonnyboy/newznab-tmux/compare/%s...%s' % (gitCurrentVersion(), latestCommit()) + url = 'https://api.github.com/repos/DariusIII/newznab-tmux/compare/%s...%s' % (gitCurrentVersion(), latestCommit()) try: result = urllib2.urlopen(url).read() except urllib2.HTTPError: