From 2ac1782985399a1a930a60fcc703e0ce24cd6f7c Mon Sep 17 00:00:00 2001 From: jonnyboy Date: Fri, 22 Feb 2013 16:48:45 +0100 Subject: [PATCH] removed DELAYED from nzb-import scripts, was creating 0-byte files --- bin/monitor.php | 10 +++--- bin/nzb-import.php | 6 ++-- bin/nzb-importonenzb.php | 48 ++++++++++++++-------------- bin/tmux-mem-cpu-load-x32 | Bin 0 -> 32476 bytes config.sh | 6 ---- powerline/tmux.conf | 4 +-- scripts/check_git.py | 65 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 99 insertions(+), 40 deletions(-) create mode 100755 bin/tmux-mem-cpu-load-x32 create mode 100755 scripts/check_git.py diff --git a/bin/monitor.php b/bin/monitor.php index a02e5d30b..762735d46 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -511,6 +511,11 @@ while( $i > 0 ) printf("\033[38;5;214m"); printf($mask, "Queries","$query_timer","queried"); + //notify monitor that optimize is running + if ( ! shell_exec("$_tmux list-panes -t {$array['TMUX_SESSION']}:1 | grep 4: | grep dead") ) { + echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; + } + //see if tmux.conf needs to be reloaded if ( $_tmux_test != $array['POWERLINE'] ) { if ( $array['POWERLINE'] == "true" ) { @@ -889,11 +894,6 @@ while( $i > 0 ) } } - //notify monitor that optimize is running - if ( ! shell_exec("$_tmux list-panes -t {$array['TMUX_SESSION']}:1 | grep 4: | grep dead") ) { - echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; - } - //check ffmpeg and mediainfo, kill if necessary if ( $array['KILL_PROCESS'] != "0" ) { shell_exec("./check_process.sh mediainfo {$array['KILL_PROCESS']}"); diff --git a/bin/nzb-import.php b/bin/nzb-import.php index 471d56090..5920d35e7 100644 --- a/bin/nzb-import.php +++ b/bin/nzb-import.php @@ -79,7 +79,7 @@ if (!isset($groups) || count($groups) == 0) { if ($usenzbname) { //Use the binary names $usename = str_replace('.nzb', '', basename($nzbFile)); - $binarySql = sprintf("INSERT DELAYED INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname, relname, relpart, reltotalpart, procstat, categoryID, regexID, reqID) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s, replace(%s, '_', ' '), %d, %d, %d, %s, %d, %s);", + $binarySql = sprintf("INSERT INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname, relname, relpart, reltotalpart, procstat, categoryID, regexID, reqID) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s, replace(%s, '_', ' '), %d, %d, %d, %s, %d, %s);", $db->escapeString($name), $db->escapeString($fromname), $db->escapeString($date), $db->escapeString($xref), $db->escapeString($totalParts), $db->escapeString($groupID), $db->escapeString($binaryHash), $db->escapeString($nzbFile), $db->escapeString($usename), 1, 1, 5, "null", "null", "null"); @@ -87,7 +87,7 @@ if (!isset($groups) || count($groups) == 0) { $transaction = $transaction . $binarySql; } else { //Don't use the binary names - $binarySql = sprintf("INSERT DELAYED INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s);", + $binarySql = sprintf("INSERT INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s);", $db->escapeString($name), $db->escapeString($fromname), $db->escapeString($date), $db->escapeString($xref), $db->escapeString($totalParts), $db->escapeString($groupID), $db->escapeString($binaryHash), $db->escapeString($nzbFile)); @@ -99,7 +99,7 @@ if (!isset($groups) || count($groups) == 0) { //segments (i.e. parts) if (count($file->segments->segment) > 0) { - $partsSql = "INSERT DELAYED INTO parts (binaryID, messageID, number, partnumber, size, dateadded) values "; + $partsSql = "INSERT INTO parts (binaryID, messageID, number, partnumber, size, dateadded) values "; foreach ($file->segments->segment as $segment) { $messageId = (string)$segment; $partnumber = $segment->attributes()->number; diff --git a/bin/nzb-importonenzb.php b/bin/nzb-importonenzb.php index 144535a68..467496e95 100644 --- a/bin/nzb-importonenzb.php +++ b/bin/nzb-importonenzb.php @@ -17,7 +17,7 @@ elseif ($argc == 1) { echo "no arguments specified - php nzb-import.php /path/to/nzb bool_use_filenames\n"; return; -} +} else { $using_cli = true; @@ -28,11 +28,11 @@ $browserpostednames = Array(); if ($using_cli || $page->isPostBack() ) { - $retval = ""; + $retval = ""; // // Via browser, build an array of all the nzb files uploaded into php /tmp location - // + // if (isset($_FILES["uploadedfiles"])) { foreach ($_FILES["uploadedfiles"]["error"] as $key => $error) @@ -53,13 +53,13 @@ if ($using_cli || $page->isPostBack() ) $path = $argv[1]; $usenzbname = (isset($argv[2]) && $argv[2] == 'true') ? true : false; } - else + else { $strTerminator = "
"; $path = (isset($_POST["folder"]) ? $_POST["folder"] : ""); $usenzbname = (isset($_POST['usefilename']) && $_POST["usefilename"] == 'on') ? true : false; } - + if (substr($path, strlen($path) - 1) != '/') $path = $path."/"; @@ -75,21 +75,21 @@ if ($using_cli || $page->isPostBack() ) $retval.= "no groups available in the database, add first.".$strTerminator; } else - { + { $nzbCount = 0; - + // // read from the path, if no files submitted via the browser - // + // if (count($filestoprocess) == 0) $filestoprocess = glob($path."*.nzb"); $start=date('Y-m-d H:i:s'); - + foreach($filestoprocess as $nzbFile) { $importfailed = false; $nzb = file_get_contents($nzbFile); - + $xml = @simplexml_load_string($nzb); if (!$xml || strtolower($xml->getName()) != 'nzb') { @@ -105,7 +105,7 @@ if ($using_cli || $page->isPostBack() ) $fromname = (string)$file->attributes()->poster; $unixdate = (string)$file->attributes()->date; $date = date("Y-m-d H:i:s", (string)$file->attributes()->date); - + //groups $groupArr = array(); foreach($file->groups->group as $group) @@ -117,39 +117,39 @@ if ($using_cli || $page->isPostBack() ) } $groupArr[] = $group; } - + if ($groupID != -1) { $xref = implode(': ', $groupArr).':'; - + $totalParts = sizeof($file->segments->segment); - + //insert binary $binaryHash = md5($name.$fromname.$groupID); - $binarySql = sprintf("INSERT DELAYED INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s)", + $binarySql = sprintf("INSERT INTO binaries (name, fromname, date, xref, totalParts, groupID, binaryhash, dateadded, importname) values (%s, %s, %s, %s, %s, %s, %s, NOW(), %s)", $db->escapeString($name), $db->escapeString($fromname), $db->escapeString($date), $db->escapeString($xref), $db->escapeString($totalParts), $db->escapeString($groupID), $db->escapeString($binaryHash), $db->escapeString($nzbFile) ); - + $binaryId = $db->queryInsert($binarySql); - + if ($usenzbname) { $usename = str_replace('.nzb', '', (!$using_cli ? $browserpostednames[$nzbFile] : basename($nzbFile))); - + $db->query(sprintf("update binaries set relname = replace(%s, '_', ' '), relpart = %d, reltotalpart = %d, procstat=%d, categoryID=%s, regexID=%d, reqID=%s where ID = %d", $db->escapeString($usename), 1, 1, 5, "null", "null", "null", $binaryId)); } - + //segments (i.e. parts) if (count($file->segments->segment) > 0) { - $partsSql = "INSERT DELAYED INTO parts (binaryID, messageID, number, partnumber, size, dateadded) values "; + $partsSql = "INSERT INTO parts (binaryID, messageID, number, partnumber, size, dateadded) values "; foreach($file->segments->segment as $segment) { $messageId = (string)$segment; $partnumber = $segment->attributes()->number; $size = $segment->attributes()->bytes; - + $partsSql .= sprintf("(%s, %s, 0, %s, %s, NOW()),", $db->escapeString($binaryId), $db->escapeString($messageId), $db->escapeString($partnumber), $db->escapeString($size)); @@ -173,7 +173,7 @@ if ($using_cli || $page->isPostBack() ) break; } } - + if (!$importfailed) { $nzbCount++; @@ -216,8 +216,8 @@ if ($using_cli || $page->isPostBack() ) echo $retval; die(); } - - $page->smarty->assign('output', $retval); + + $page->smarty->assign('output', $retval); } $page->title = "Import Nzbs"; diff --git a/bin/tmux-mem-cpu-load-x32 b/bin/tmux-mem-cpu-load-x32 new file mode 100755 index 0000000000000000000000000000000000000000..e750ee63f68d7a161e0a2c168bc581382cfae64f GIT binary patch literal 32476 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 literal 0 HcmV?d00001 diff --git a/config.sh b/config.sh index 57d2a0017..3baec6fc6 100644 --- a/config.sh +++ b/config.sh @@ -324,12 +324,6 @@ export WWW_USER="www-data:www-data" ########################################################### -#colors display differently on every monitor, if you are having difficulty seeing a particular -#color, set this to true, get the colors number and report is to me, I will remove it -export SHOW_COLORS="false" - -########################################################### - #if you have a ramdisk and would like to monitor it's use, set path here #this is not the same as RAMDISK above, I keep my parts table on a ramdisk export RAMDISK_PATH="" diff --git a/powerline/tmux.conf b/powerline/tmux.conf index 233714ce5..8e3fc7f7c 100644 --- a/powerline/tmux.conf +++ b/powerline/tmux.conf @@ -16,8 +16,8 @@ set -g status-bg black set -g status-fg white set-option -g status-justify "centre" -set-option -g status-left-length 90 -set-option -g status-right-length 90 +set-option -g status-left-length 110 +set-option -g status-right-length 110 set-option -g status-left "#(powerline/powerline/powerline.sh left)" set-option -g status-right "#(powerline/powerline/powerline.sh right)" diff --git a/scripts/check_git.py b/scripts/check_git.py new file mode 100755 index 000000000..b1df39f28 --- /dev/null +++ b/scripts/check_git.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +# Written by convict +import sys, os, shutil +import platform, subprocess, re, os, json, urllib2 + +def runGit(args): + git_locations = ['git'] + run_dir = os.getcwd() + + if platform.system().lower() == 'darwin': + git_locations.append('/usr/local/git/bin/git') + + output = err = None + for cur_git in git_locations: + cmd = cur_git + ' ' + args + try: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=run_dir) + output, err = p.communicate() + except OSError: + print 'Command "%s" did not work. Could not find git.' % cmd + continue + + if 'not found' in output or 'not recognized as an internal or external command' in output: + print 'Unable to find git with command "%s"' % cmd + output = None + elif 'fatal:' in output or err: + print 'Git returned bad info. Are you sure this is a git installation?' + output = None + elif output: + break + return (output, err) + +def gitCurrentVersion(): + output, err = runGit('rev-parse HEAD') + + if not output: + print 'Could not find latest installed version with git.' + return None + + current_commit = output.strip() + + if not re.match('^[a-z0-9]+$', current_commit): + print 'Git output does not look like a hash, not using it.' + return None + + return current_commit + +def latestCommit(): + url = 'https://api.github.com/repos/jonnyboy/newznab-tmux/commits/dev' + 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()) + try: + result = urllib2.urlopen(url).read() + except urllib2.HTTPError: + return None + git = json.JSONDecoder().decode(result) + return git['total_commits'] + +if __name__ == '__main__': + print 'You are %s commits behind.' % commitsBehind()