diff --git a/bin/backfill_all_quick.php b/bin/backfill_all_quick.php index 34846bdb8..ec37ec72e 100644 --- a/bin/backfill_all_quick.php +++ b/bin/backfill_all_quick.php @@ -2,7 +2,7 @@ require_once(dirname(__FILE__) . '/config.php'); require_once(WWW_DIR . '/lib/nntp.php'); -require_once(dirname(__FILE__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/functions.php'); $c = new ColorCLI(); diff --git a/bin/backfill_interval.php b/bin/backfill_interval.php index 6a2176da9..76f39c03d 100644 --- a/bin/backfill_interval.php +++ b/bin/backfill_interval.php @@ -3,7 +3,7 @@ require_once(dirname(__FILE__) . '/config.php'); require_once(WWW_DIR . '/lib/nntp.php'); require_once(WWW_DIR . '/lib/Tmux.php'); -require_once(dirname(__FILE__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/functions.php'); $c = new ColorCLI(); diff --git a/bin/fixreleasenames.php b/bin/fixreleasenames.php index 377d34fbe..0aac72906 100644 --- a/bin/fixreleasenames.php +++ b/bin/fixreleasenames.php @@ -4,7 +4,7 @@ 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("../lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once("../lib/namefixer.php"); require_once("../lib/functions.php"); require_once("../lib/Info.php"); diff --git a/bin/groupfixrelnames.php b/bin/groupfixrelnames.php index 77ddb2481..af7548568 100644 --- a/bin/groupfixrelnames.php +++ b/bin/groupfixrelnames.php @@ -2,7 +2,7 @@ require_once(dirname(__FILE__) . "/config.php"); require_once(WWW_DIR . "/lib/framework/db.php"); require_once(WWW_DIR . "/lib/util.php"); -require_once(dirname(__FILE__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/namefixer.php'); require_once(dirname(__FILE__) . '/../lib/functions.php'); require_once(dirname(__FILE__) . '/../lib/Info.php'); diff --git a/bin/monitor.php b/bin/monitor.php index 07d7d2ecf..5580d843f 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -3,8 +3,8 @@ require_once(dirname(__FILE__) . "/config.php"); require_once(WWW_DIR . "lib/framework/db.php"); require_once(WWW_DIR . '/lib/site.php'); require_once(WWW_DIR . '/lib/Tmux.php'); -require_once(dirname(__FILE__) . "/../lib/ColorCLI.php"); -require_once(dirname(__FILE__) . "/../lib/showsleep.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/showsleep.php"); require_once(dirname(__FILE__) . "/../lib/functions.php"); diff --git a/bin/nzb-import-new.php b/bin/nzb-import-new.php index 38a5c4ba2..0d58f25d2 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/Categorize.php'); require_once(WWW_DIR . '/lib/groups.php'); -require_once(dirname(__FILE__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/ReleaseCleaner.php'); -require_once(dirname(__FILE__) . '/../lib/consoletools.php'); +require_once(WWW_DIR . "/lib/ConsoleTools.php"); require_once(dirname(__FILE__) . '/../lib/Enzebe.php'); $c = new ColorCLI(); diff --git a/bin/postprocess_alpha.php b/bin/postprocess_alpha.php index e67eccf2a..7f2bf7b4c 100644 --- a/bin/postprocess_alpha.php +++ b/bin/postprocess_alpha.php @@ -6,7 +6,7 @@ require_once(WWW_DIR.'/lib/anidb.php'); require_once(WWW_DIR.'/lib/tvrage.php'); require_once(WWW_DIR.'/lib/thetvdb.php'); require_once(WWW_DIR.'/lib/Tmux.php'); -require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/Pprocess.php'); diff --git a/bin/postprocess_new.php b/bin/postprocess_new.php index b82945397..cf779ddc0 100644 --- a/bin/postprocess_new.php +++ b/bin/postprocess_new.php @@ -6,7 +6,7 @@ require_once(WWW_DIR . '/lib/nntp.php'); require_once(WWW_DIR . '/lib/site.php'); require_once(WWW_DIR . '/lib/anidb.php'); require_once(WWW_DIR . '/lib/thetvdb.php'); -require_once(dirname(__FILE__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(dirname(__FILE__) . '/../lib/TvAnger.php'); require_once(dirname(__FILE__) . '/../lib/Pprocess.php'); require_once(dirname(__FILE__) . '/../lib/Info.php'); diff --git a/bin/requestID.php b/bin/requestID.php index fb4991a76..857513880 100644 --- a/bin/requestID.php +++ b/bin/requestID.php @@ -5,8 +5,8 @@ require_once(WWW_DIR . "/lib/framework/db.php"); require_once(WWW_DIR . "/lib/groups.php"); require_once(WWW_DIR . "/lib/category.php"); require_once(WWW_DIR . "/lib/Tmux.php"); +require_once(WWW_DIR . "/lib/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 378a494c6..47b1a36b4 100644 --- a/bin/safe_pull.php +++ b/bin/safe_pull.php @@ -2,8 +2,8 @@ require_once(dirname(__FILE__).'/config.php'); require_once(WWW_DIR.'/lib/nntp.php'); -require_once(dirname(__FILE__).'/../lib/ColorCLI.php'); -require_once(dirname(__FILE__) . '/../lib/consoletools.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); +require_once(WWW_DIR . "/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 8b1d6016e..479ec2259 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__) . "/../lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); $time = TIME(); $c = new ColorCLI(); diff --git a/bin/update_groups.php b/bin/update_groups.php index 8a6f90de8..2130a56dc 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__).'/../lib/ColorCLI.php'); -require_once(dirname(__FILE__) . '/../lib/consoletools.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ConsoleTools.php"); $start = TIME(); diff --git a/bin/update_releases_new.php b/bin/update_releases_new.php index 600f5b93d..60d09a21f 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__) . '/../lib/ColorCLI.php'); +require_once(WWW_DIR . "/lib/ColorCLI.php"); $c = new ColorCLI(); if (!isset($argv[1])) { diff --git a/lib/DB/mysqldump_tables.php b/lib/DB/mysqldump_tables.php index bedb334b8..611631d29 100644 --- a/lib/DB/mysqldump_tables.php +++ b/lib/DB/mysqldump_tables.php @@ -1,6 +1,6 @@ lastMessageLength = 0; - $this->c = new ColorCLI(); - } - - function overWriteHeader($message, $reset=False) - { - if ($reset) - $this->lastMessageLength = 0; - - echo str_repeat(chr(8), $this->lastMessageLength); - echo str_repeat(" ", $this->lastMessageLength); - echo str_repeat(chr(8), $this->lastMessageLength); - - $this->lastMessageLength = strlen($message); - echo $this->c->headerOver($message); - } - - function overWritePrimary($message, $reset=False) - { - if ($reset) - $this->lastMessageLength = 0; - - echo str_repeat(chr(8), $this->lastMessageLength); - echo str_repeat(" ", $this->lastMessageLength); - echo str_repeat(chr(8), $this->lastMessageLength); - - $this->lastMessageLength = strlen($message); - echo $this->c->primaryOver($message); - } - - function overWrite($message, $reset=False) - { - if ($reset) - $this->lastMessageLength = 0; - - echo str_repeat(chr(8), $this->lastMessageLength); - echo str_repeat(" ", $this->lastMessageLength); - echo str_repeat(chr(8), $this->lastMessageLength); - - $this->lastMessageLength = strlen($message); - echo $message; - } - - function appendWrite($message) - { - echo $message; - $this->lastMessageLength = $this->lastMessageLength + strlen($message); - } - - function percentString($cur, $total) - { - $percent = 100 * $cur / $total; - $formatString = "% ".strlen($total)."d/%d (% 2d%%)"; - return sprintf($formatString, $cur, $total, $percent); - } - - function percentString2($first, $last, $total) - { - $percent1 = 100 * ($first-1) / $total; - $percent2 = 100 * $last / $total; - $formatString = "% ".strlen($total)."d-% ".strlen($total)."d/%d (% 2d%%-% 3d%%)"; - return sprintf($formatString, $first, $last, $total, $percent1, $percent2); - } - - // - // Convert seconds to minutes or hours. - // Accepts a number of time. - // Returns a string of time + format. - // - public function convertTime($seconds) - { - if ($seconds < 60) - return $seconds." second(s)"; - if ($seconds > 60 && $seconds < 3600) - return round($seconds/60)." minute(s)"; - if ($seconds > 3600) - return round($seconds/3600)." hour(s)"; - } - - // - // Convert seconds to a timer, 00h:00m:00s - // - public function convertTimer($seconds) - { - $s = $seconds%60; - $m = floor(($seconds/60)%60); - $h = floor($seconds/3600); - return " ".sprintf("%02dh:%02dm:%02ds", $h, $m, $s); - } - - public function showSleep($seconds) - { - for ( $i = $seconds; $i >= 0; $i-- ) - { - $this->overWriteHeader("Sleeping for ".$i." seconds."); - usleep(1000000); - } - echo "\n"; - } - -} \ No newline at end of file diff --git a/lib/ColorCLI.php b/lib/copy_this/www/lib/ColorCLI.php similarity index 100% rename from lib/ColorCLI.php rename to lib/copy_this/www/lib/ColorCLI.php diff --git a/lib/copy_this/www/lib/Games.php b/lib/copy_this/www/lib/Games.php index 1c3cb5e7f..8c9464740 100644 --- a/lib/copy_this/www/lib/Games.php +++ b/lib/copy_this/www/lib/Games.php @@ -7,7 +7,7 @@ require_once(WWW_DIR . "lib/category.php"); require_once(WWW_DIR . "lib/genres.php"); require_once(WWW_DIR . "lib/releaseimage.php"); require_once(WWW_DIR . "lib/Steam.php"); -require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/functions.php"); diff --git a/lib/copy_this/www/lib/XXX.php b/lib/copy_this/www/lib/XXX.php index 4f591773f..1aaff6cee 100644 --- a/lib/copy_this/www/lib/XXX.php +++ b/lib/copy_this/www/lib/XXX.php @@ -7,7 +7,7 @@ require_once(WWW_DIR . "/lib/AEBN.php"); require_once(WWW_DIR . "/lib/Hotmovies.php"); require_once(WWW_DIR . "/lib/Popporn.php"); require_once(WWW_DIR . "/lib/category.php"); -require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); /** diff --git a/lib/copy_this/www/lib/anidb.php b/lib/copy_this/www/lib/anidb.php index 2ee50b409..8c5b754c7 100644 --- a/lib/copy_this/www/lib/anidb.php +++ b/lib/copy_this/www/lib/anidb.php @@ -5,7 +5,7 @@ require_once(WWW_DIR . "/lib/category.php"); require_once(WWW_DIR . "/lib/releaseimage.php"); require_once(WWW_DIR . "/lib/site.php"); require_once(WWW_DIR . "/lib/Tmux.php"); -require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); class AniDB { diff --git a/lib/copy_this/www/lib/framework/db.php b/lib/copy_this/www/lib/framework/db.php index 2d1d28dfd..3b2c051b1 100644 --- a/lib/copy_this/www/lib/framework/db.php +++ b/lib/copy_this/www/lib/framework/db.php @@ -1,8 +1,8 @@ doConnect() === false) { diff --git a/lib/prehash.php b/lib/prehash.php index 5ed1dc6ee..c50756959 100644 --- a/lib/prehash.php +++ b/lib/prehash.php @@ -4,8 +4,8 @@ require_once(WWW_DIR."lib/groups.php"); require_once(WWW_DIR."lib/nfo.php"); require_once(WWW_DIR."lib/site.php"); require_once("functions.php"); -require_once("consoletools.php"); -require_once("ColorCLI.php"); +require_once(WWW_DIR . "/lib/ConsoleTools.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once("nzbcontents.php"); require_once("simple_html_dom.php"); require_once("IRCScraper.php"); diff --git a/lib/removeCrapReleases.php b/lib/removeCrapReleases.php index acab50b0f..417e75c57 100644 --- a/lib/removeCrapReleases.php +++ b/lib/removeCrapReleases.php @@ -9,7 +9,7 @@ require_once(WWW_DIR."/lib/framework/db.php"); require_once(WWW_DIR."/lib/releases.php"); require_once(WWW_DIR."/lib/site.php"); require_once("functions.php"); -require_once ("ColorCLI.php"); +require_once(WWW_DIR . "/lib/ColorCLI.php"); require_once("ReleaseRemover.php"); $cli = new ColorCLI(); diff --git a/lib/testing/DB/reset_postprocessing.php b/lib/testing/DB/reset_postprocessing.php index 2140062f3..77cae2fcc 100644 --- a/lib/testing/DB/reset_postprocessing.php +++ b/lib/testing/DB/reset_postprocessing.php @@ -1,8 +1,8 @@