]"; break;
+ }
+ $short = ($short) ? '-'.$short : '';
+ $long = ($long) ? '--'.$long : '';
+ if ($short && $long) {
+ $options = $short.', '.$long;
+ } else if ($short) {
+ $options = $short;
+ } else {
+ $options = $long;
+ }
+ $padded = str_pad(sprintf(" %s %s", $options, $arg), $padding);
+ $help_text .= sprintf("%s %s\n", $padded, $description);
+ }
+ return $help_text;
+ }
+
+
+ /**
+ * Return the list of operands. Must be invoked after parse().
+ *
+ * @return array
+ */
+ public function getOperands() {
+ return $this->operands;
+ }
+
+ /**
+ * Parse an option string.
+ *
+ * @param string $string the option string
+ *
+ * @throws \InvalidArgumentException
+ * @return array
+ * @internal
+ */
+ protected function parseOptionString($string) {
+ if (!mb_strlen($string)) {
+ throw new \InvalidArgumentException('Option string must not be empty');
+ }
+ $option_list = array();
+ $eol = mb_strlen($string) - 1;
+ $next_can_be_colon = false;
+ for ($i = 0; $i <= $eol; ++$i) {
+ $ch = $string[$i];
+ if (!preg_match('/^[A-Za-z]$/', $ch)) {
+ $colon = $next_can_be_colon ? " or ':'" : '';
+ throw new \InvalidArgumentException("Option string is not well formed: "
+ . "expected a letter$colon, found '$ch' at position " . ($i + 1));
+ }
+ if ($i == $eol || $string[$i + 1] != ':') {
+ $option_list[] = array($ch, null, self::NO_ARGUMENT);
+ $next_can_be_colon = true;
+ } elseif ($i < $eol - 1 && $string[$i + 2] == ':') {
+ $option_list[] = array($ch, null, self::OPTIONAL_ARGUMENT);
+ $i += 2;
+ $next_can_be_colon = false;
+ } else {
+ $option_list[] = array($ch, null, self::REQUIRED_ARGUMENT);
+ ++$i;
+ $next_can_be_colon = true;
+ }
+ }
+ return $option_list;
+ }
+
+ /**
+ * Check that the argument conforms to Getopt.PHP's option array rules.
+ * Throws an exception on failure.
+ *
+ * @param array $options the option list
+ *
+ * @throws \InvalidArgumentException
+ * @return array the validated options array
+ * @internal
+ */
+ protected function validateOptions(array $options) {
+ $valid_argument_specs = array(
+ self::NO_ARGUMENT, self::OPTIONAL_ARGUMENT, self::REQUIRED_ARGUMENT
+ );
+ if (empty($options)) {
+ throw new \InvalidArgumentException('No options given');
+ }
+ foreach ($options as $option) {
+ if (!is_array($option) || count($option) < 3) {
+ throw new \InvalidArgumentException("Too few fields in argument, must be 3 (short/long/type)");
+ }
+ if (!(is_null($option[0]) || preg_match("/^[a-zA-Z]$/", $option[0]))) {
+ throw new \InvalidArgumentException("First component of option must be "
+ . "null or a letter, found '" . $option[0] . "'");
+ }
+ if (!(is_null($option[1]) || preg_match("/^[a-zA-Z0-9_-]*$/", $option[1]))) {
+ throw new \InvalidArgumentException("Second component of option must be "
+ . "null or an alphanumeric string, found '" . $option[1] . "'");
+ }
+ if (!mb_strlen($option[0]) && !mb_strlen($option[1])) {
+ throw new \InvalidArgumentException("The short and long name of an option must not both be empty");
+ }
+ if (!in_array($option[2], $valid_argument_specs, true)) {
+ throw new \InvalidArgumentException("Third component of option must be one of "
+ . "Getopt::NO_ARGUMENT, Getopt::OPTIONAL_ARGUMENT and Getopt::REQUIRED_ARGUMENT");
+ }
+ if (!isset($option[3])) {
+ $option[3] = ""; // description
+ }
+ }
+ return $options;
+ }
+
+ /**
+ * Add an option to the list of known options.
+ *
+ * @param string $option the option's name
+ * @param string $value the option's value (or null)
+ * @param boolean $is_long whether the option name is long or short
+ *
+ * @throws \UnexpectedValueException
+ * @return void
+ * @internal
+ */
+ protected function addOption($option, $value, $is_long) {
+ foreach ($this->optionList as $opt) {
+ if (($is_long && $opt[1] == $option) || (!$is_long && $opt[0] == $option)) {
+ if ($opt[2] == self::REQUIRED_ARGUMENT && !mb_strlen($value)) {
+ throw new \UnexpectedValueException("Option '$option' must have a value");
+ }
+ // for no-argument options, check if they are duplicate
+ if ($opt[2] == self::NO_ARGUMENT) {
+ $old_value = $this->getOption($option);
+ $value = is_null($old_value) ? 1 : $old_value + 1;
+ }
+ // for optional-argument options, set value to 1 if none was given
+ if (!mb_strlen($value)) {
+ $value = 1;
+ }
+ // add both long and short names (if they exist) to the option array to facilitate lookup
+ if (mb_strlen($opt[0]) > 0) {
+ $this->options[$opt[0]] = $value;
+ }
+ if (mb_strlen($opt[1]) > 0) {
+ $this->options[$opt[1]] = $value;
+ }
+ return;
+ }
+ }
+ throw new \UnexpectedValueException("Option '$option' is unknown");
+ }
+
+ /**
+ * Return true if the given option can take an argument, false if it can't or is unknown.
+ *
+ * @param string $name the option's name
+ * @param boolean $is_long whether it is a long option
+ *
+ * @return boolean
+ * @internal
+ */
+ protected function optionHasArgument($name, $is_long) {
+ foreach ($this->optionList as $option) {
+ if ((!$is_long && $option[0] == $name)
+ || ($is_long && $option[1] == $name)) {
+ return $option[2] != self::NO_ARGUMENT;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Return the option list used by this Getopt.
+ *
+ * This function is used for testing. It is not meant for production use.
+ *
+ * @return array
+ * @internal
+ */
+ public function getOptionList() {
+ return $this->optionList;
+ }
+
+ /**
+ * Parses and Adds options
+ * The argument $options can be either a string in the format accepted by the PHP library
+ * function getopt() or an array
+ *
+ * @param mixed $options Array of options, a String, or null
+ * @throws \InvalidArgumentException
+ * @return array
+ */
+ public function addOptions($options)
+ {
+ if (is_string($options)) {
+ return $this->addParsedOptions($this->parseOptionString($options));
+ }
+
+ if (is_array($options)) {
+ return $this->addParsedOptions($this->validateOptions($options));
+ }
+
+ throw new \InvalidArgumentException("Getopt(): argument must be string or array");
+ }
+
+ /**
+ * Merges new options with the ones already in the Getopt optionList.
+ *
+ * @param array $options The array from parsing from parseOptionString() or validateOptions()
+ *
+ * @return array
+ * @internal
+ */
+ protected function addParsedOptions (array $options)
+ {
+ return $this->optionList = array_merge($this->optionList, $options);
+ }
+
+ /**
+ * @param string $str string to split
+ * @param int $l
+ *
+ * @return string
+ * @internal
+ */
+ protected function mb_str_split($str, $l = 0)
+ {
+ if ($l > 0) {
+ $ret = array();
+ $len = mb_strlen($str, "UTF-8");
+ for ($i = 0; $i < $len; $i += $l) {
+ $ret[] = mb_substr($str, $i, $l, "UTF-8");
+ }
+
+ return $ret;
+ }
+
+ return preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY);
+ }
+}
+
diff --git a/nnscripts/lib/nnscripts.php b/nnscripts/lib/nnscripts.php
new file mode 100644
index 000000000..66d048e76
--- /dev/null
+++ b/nnscripts/lib/nnscripts.php
@@ -0,0 +1,591 @@
+checkPHPVersion();
+
+ // Build the site variable
+ $site = new Sites();
+ $this->site = $site->get();
+
+ // Initiate the database connection
+ $this->db = new DB();
+
+ // Read the settings from the ini file
+ $this->readSettings();
+
+ // Set the limit
+ $this->setLimit();
+
+ // Add the "now" date
+ $date = new DateTime();
+ $this->settings['now'] = $date->format('Y-m-d H:i:s');
+ }
+
+
+ /**
+ * Destructor
+ *
+ */
+ public function __destruct()
+ {
+ if( isset( $_SERVER["HTTP_HOST"] ) && true === $this->settings['display'] )
+ {
+ echo '';
+ }
+ }
+
+
+ /**
+ * Check php version to be 5.3.10 or greater
+ *
+ * @throws Exception
+ * @return void
+ */
+ protected function checkPHPVersion()
+ {
+ // Init
+ $current = ( false === strpos( phpversion(), '-' ) ? phpversion() : substr( phpversion(), 0, strpos( phpversion(), '-' ) ) );
+ $required = '5.3.10';
+
+ if( 0 > strnatcmp( $current, $required ) )
+ {
+ throw new Exception( sprintf( 'NNScripts'. PHP_EOL .'Error: PHP version %s is required but version %s is found.', $required, $current ) );
+ }
+ }
+
+
+ /**
+ * Set the limit in the settings
+ * The limit is read from the site setting "rawretentiondays"
+ *
+ * @return void
+ */
+ protected function setLimit()
+ {
+ $limit = ( isset( $this->settings['limit'] ) ? $this->settings['limit'] : null );
+ if( null === $limit && in_array( 'limit', $this->allowedSettings ) )
+ {
+ // Not set by settings.ini
+ if( isset( $this->site ) && isset( $this->site->rawretentiondays ) && ( !isset($this->nolimit) || true !== $this->nolimit ) )
+ {
+ // Get the limit and convert to hours
+ $limit = (float)str_replace( ',', '.', $this->site->rawretentiondays ) * 24;
+ }
+
+ // Set the new limit
+ $this->settings['limit'] = $limit;
+ }
+ }
+
+
+ /**
+ * Read the settings from the config.ini fille
+ *
+ * @return void
+ */
+ protected function readSettings()
+ {
+ // The default settings
+ $settings = array(
+ 'display' => true, // Display output
+ 'remove' => null, // Remove or keep releases/data
+ 'limit' => null, // Limit
+ 'full' => null, // Full database
+ 'debug' => null, // Debug mode
+ 'querylimit' => 10000 // Query limit (used in remove_parts_without_releases)
+ );
+
+ // Try to read the ini file
+ $settingsFile = "settings.ini";
+ $iniArray = $this->parseIniFile( $settingsFile, true );
+
+ // Parse the "global" settings
+ $this->parseIniSettings( $settings, $iniArray, 'global' );
+
+ // Parse the class settings
+ $this->parseIniSettings( $settings, $iniArray, get_class( $this ) );
+
+ // Remove all the not used settings
+ if( is_array( $this->allowedSettings ) && 0 < count( $this->allowedSettings ) )
+ {
+ $allowed = $this->allowedSettings;
+ array_map( function( $key ) use ( &$settings, $allowed ) {
+ if( !in_array( $key, $allowed ) )
+ {
+ unset( $settings[ $key ] );
+ }
+ }, array_keys( $settings ) );
+ }
+
+ // Return
+ $this->settings = $settings;
+ }
+
+
+ /**
+ * Parse ini settings
+ *
+ * @param array $settings
+ * @param array $iniArray
+ * @param string $key
+ * @return void
+ */
+ protected function parseIniSettings( array &$settings, array $iniArray, $key )
+ {
+ // Parse the global settings
+ if( array_key_exists( $key, $iniArray ) && is_array( $iniArray[ $key ] ) )
+ {
+ foreach( array_keys( $settings ) AS $settingKey )
+ {
+ if( array_key_exists( $settingKey, $iniArray[ $key ] ) )
+ {
+ $value = $iniArray[ $key ][ $settingKey ];
+ if( is_numeric( $value ) )
+ {
+ $value = ( preg_match('/^[0-9]+$/', $value ) ? (int)$value : (float)$value );
+ }
+ $settings[ $settingKey ] = $value;
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Parse the ini file
+ *
+ * @param string $settingsFile
+ * @return array
+ */
+ protected function parseIniFile( $settingsFile )
+ {
+ // Init
+ $ret = array();
+
+ if( file_exists( $settingsFile ) && is_readable( $settingsFile ) )
+ {
+ $ini = file( $settingsFile );
+
+ if ( 0 === count( $ini ) )
+ return $ret;
+
+ $sections = $values = $globals = array();
+ $i = 0;
+
+ foreach( $ini as $line )
+ {
+ $line = trim( $line );
+
+ // Comments
+ if ( '' === $line || ';' === $line{0} )
+ continue;
+
+ // Sections
+ if ( '[' === $line{0} )
+ {
+ $sections[] = substr( $line, 1, -1 );
+ $i++;
+ continue;
+ }
+
+ // Key-value pair
+ list( $key, $value ) = explode( '=', $line, 2 );
+ $key = trim( $key );
+ $value = trim( $value );
+
+ // True / Fasle
+ if( "true" === $value )
+ $value = true;
+ if( "false" === $value )
+ $value = false;
+
+ if ( 0 === $i )
+ {
+ // Array values
+ if ( '[]' === substr( $line, -1, 2 ) )
+ $globals[ $key ][] = $value;
+ else
+ $globals[ $key ] = $value;
+ }
+ else
+ {
+ // Array values
+ if ( '[]' === substr( $line, -1, 2 ) )
+ $values[ $i - 1 ][ $key ][] = $value;
+ else
+ $values[ $i - 1 ][ $key ] = $value;
+ }
+ }
+
+ for( $j=0; $j<$i; $j++ )
+ {
+ if( array_key_exists( $j, $sections ) && array_key_exists( $j, $values ) )
+ {
+ $ret[ $sections[ $j ] ] = $values[ $j ];
+ }
+ }
+
+ return $ret + $globals;
+ }
+
+ // Return
+ return $ret;
+ }
+
+
+ /**
+ * Process the cli options
+ *
+ * @param array $options
+ * @param bool $addLimit
+ * @param bool $addRemove
+ * @param bool $addDebug
+ * @param bool $addHelp
+ * @internal param bool $addNoLimit
+ * @return void
+ */
+ protected function setCliOptions( array $options, array $basics=array('limit', 'remove') )
+ {
+ // Add a PHP_EOL to the last option
+ if( 0 < count( $options ) )
+ {
+ $last = array_keys( $options );
+ $last = end( $last );
+ if( isset( $options[ $last ][3] ) )
+ $options[ $last ][3] = $options[ $last ][3] . PHP_EOL;
+ }
+
+ // Add the quiet option
+ if( in_array( 'display', $basics ) )
+ {
+ $o1 = ( true === $this->settings['display'] ? ' (settings default)' : '' );
+ $options[] = array( 'd', 'display', Ulrichsg\Getopt::NO_ARGUMENT, sprintf( 'Enable output%s', $o1 ) );
+
+ $o2 = ( false === $this->settings['display'] ? ' (settings default)' : '' );
+ $options[] = array( 'q', 'quiet', Ulrichsg\Getopt::NO_ARGUMENT, sprintf( 'Disable output%s'. PHP_EOL, $o2 ) );
+ }
+
+ // Add the nolimit option
+ if( in_array( 'limit', $basics ) )
+ {
+ $options[] = array( 'l', 'limit', Ulrichsg\Getopt::REQUIRED_ARGUMENT, sprintf('The limit in hours (default limit is %d hour%s)', $this->settings['limit'], (1 === $this->settings['limit'] ? '' : 's') ) );
+ $options[] = array( 'n', 'nolimit', Ulrichsg\Getopt::NO_ARGUMENT, 'Disable the limit' . PHP_EOL );
+ }
+
+ // Remove options
+ if( in_array( 'remove', $basics ) )
+ {
+ $o1 = ( true === $this->settings['remove'] ? ' (settings default)' : '' );
+ $options[] = array( 'r', 'remove', Ulrichsg\Getopt::NO_ARGUMENT, sprintf( 'Enable the removal of releases%s', $o1 ) );
+
+ $o2 = ( false === $this->settings['remove'] ? ' (settings default)' : '' );
+ $options[] = array( 'k', 'keep', Ulrichsg\Getopt::NO_ARGUMENT, sprintf( 'Disable the removal of releases%s'. PHP_EOL, $o2 ) );
+ }
+
+ // Add the debug option
+ if( in_array( 'debug', $basics ) )
+ {
+ $o1 = ( true === $this->settings['debug'] ? ' (settings default)' : '' );
+ $options[] = array( null, 'debug', Ulrichsg\Getopt::NO_ARGUMENT, sprintf( 'Enable debug mode%s'. PHP_EOL, $o1 ) );
+ }
+
+ // Add the help option
+ if( in_array( 'help', $basics ) )
+ {
+ $options[] = array( 'h', 'help', Ulrichsg\Getopt::NO_ARGUMENT, 'Shows this help'. PHP_EOL );
+ }
+
+ // Set the command line options
+ $this->options = new Ulrichsg\Getopt( $options );
+ $this->options->parse();
+
+ // Check for the help
+ if( $this->options->getOption('help') )
+ {
+ $this->displayHeader();
+ $this->options->showHelp();
+ die();
+ }
+
+ // Merge the cli options with the settings
+ $this->mergeSettings();
+ }
+
+
+ /**
+ * Merge the commandline options with the settings
+ *
+ * @return void
+ */
+ protected function mergeSettings()
+ {
+ if( null !== $this->options && $this->options instanceof Ulrichsg\Getopt )
+ {
+ // Check for limit settings
+ if( $this->options->getOption('nolimit') )
+ {
+ $this->settings['limit'] = false;
+ }
+ if( $this->options->getOption('limit') )
+ {
+ if( !is_numeric( $this->options->getOption('limit') ) )
+ {
+ throw new Exception( 'Option \'limit\' must be numeric' );
+ }
+
+ $this->settings['limit'] = false;
+ if( 0 < (float)$this->options->getOption('limit') )
+ {
+ $this->settings['limit'] = (float)$this->options->getOption('limit');
+ }
+ }
+
+ // Full database
+ if( $this->options->getOption('full') )
+ $this->settings['full'] = true;
+
+ // Check for remove setting
+ if( $this->options->getOption('remove') )
+ $this->settings['remove'] = true;
+ if( $this->options->getOption('keep') )
+ $this->settings['remove'] = false;
+
+ // Check for display options
+ if( $this->options->getOption('quiet') )
+ $this->settings['display'] = false;
+ if( $this->options->getOption('display') )
+ $this->settings['display'] = true;
+
+ // Debug?
+ if( $this->options->getOption('debug') )
+ $this->settings['debug'] = true;
+
+ // Query limit
+ if( $this->options->getOption('querylimit') )
+ if( is_numeric( $this->options->getOption('querylimit') ) )
+ $this->settings['querylimit'] = (int)$this->options->getOption('querylimit');
+ }
+ }
+
+
+ /**
+ * Display a message
+ *
+ * The function will also try to detect a browser call and convert
+ * new-lines to
's
+ *
+ * @param string $message
+ * @return void
+ */
+ protected function display( $message )
+ {
+ if( true === $this->settings['display'] )
+ {
+ // Convert for webbrowser?
+ if( isset( $_SERVER["HTTP_HOST"] ) )
+ {
+ $message = nl2br( $message );
+ }
+
+ // Display
+ echo $message;
+ }
+ }
+
+
+ /**
+ * Display a page start
+ * Only usefull when viewing with a webbrowser
+ *
+ * @return void
+ */
+ protected function displayPageStart()
+ {
+ if( isset( $_SERVER["HTTP_HOST"] ) && true === $this->display )
+ {
+ echo '';
+ }
+ }
+
+ /**
+ * Display the title
+ *
+ * @return void
+ */
+ protected function displayTitle()
+ {
+ // Display the script header line
+ $this->display( sprintf( "%s - version %s". PHP_EOL, $this->scriptName, $this->scriptVersion ) );
+ }
+
+
+ /**
+ * Display the header line and settings info
+ *
+ * @return void
+ */
+ protected function displayHeader()
+ {
+ // Display the page start in case of an html page
+ $this->displayPageStart();
+
+ // Show the title
+ $this->displayTitle();
+ $this->display( PHP_EOL );
+ }
+
+ /**
+ * Display app settings
+ * @return void
+ */
+ protected function displaySettings()
+ {
+ $show = false;
+ // Display settings?
+ if( ( isset( $this->settings['remove'] ) && null !== $this->settings['remove'] ) ||
+ ( isset( $this->settings['debug'] ) && null !== $this->settings['debug'] ) ||
+ ( isset( $this->settings['limit'] ) && null !== $this->settings['limit'] ) ||
+ ( isset( $this->settings['querylimit'] ) && null !== $this->settings['querylimit'] ) )
+ {
+ $show = true;
+ $this->display( 'Settings:' );
+
+ // "debug" setting
+ if( isset( $this->settings['debug'] ) && is_bool( $this->settings['debug'] ) )
+ {
+ $this->display( PHP_EOL . sprintf( "- debug : %sabled", ( true === $this->settings['debug'] ? 'En' : 'Dis' ) ) );
+ }
+
+ // "limit" setting
+ if( isset( $this->settings['limit'] ) && null !== $this->settings['limit'] )
+ {
+ $line = 'no limit';
+ if( is_float( $this->settings['limit'] ) )
+ {
+ $line = sprintf( "%s hour%s", $this->settings['limit'], ( 1.0 !== $this->settings['limit'] ? 's' : '' ) );
+ }
+ $this->display( PHP_EOL . sprintf( "- limit : %s", $line ) );
+ }
+
+ // "remove" setting
+ if( isset( $this->settings['remove'] ) && null !== $this->settings['remove'] )
+ {
+ $line = "Data will be removed.";
+ if( true !== $this->settings['remove'] )
+ {
+ $line = 'No data is removed from the database!'. PHP_EOL .' Use the --remove option or change the settings.ini file if you want to remove releases or parts';
+ }
+ $this->display( PHP_EOL . sprintf( "- remove: %s", $line ) );
+ }
+
+ // "update" setting
+ if( isset( $this->settings['update'] ) && null !== $this->settings['update'] )
+ {
+ $line = "Data will be updated.";
+ if( true !== $this->settings['update'] )
+ {
+ $line = 'No data is updated in the database!'. PHP_EOL .' Change the "UPDATE" setting if you want to enable update';
+ }
+ $this->display( PHP_EOL . sprintf( "- update: %s", $line ) );
+ }
+
+ // querylimit
+ if( isset( $this->settings['querylimit'] ) && null !== $this->settings['querylimit'] )
+ {
+ $this->display( PHP_EOL . sprintf( "- querylimit: %s", $this->settings['querylimit'] ) );
+ }
+
+ // Spacer
+ $this->display( PHP_EOL );
+ }
+
+ // End spacer
+ if( true === $show )
+ $this->display( PHP_EOL );
+ }
+}
diff --git a/nnscripts/nnscripts.php b/nnscripts/nnscripts.php
deleted file mode 100644
index b29f22312..000000000
--- a/nnscripts/nnscripts.php
+++ /dev/null
@@ -1,239 +0,0 @@
-checkPHPVersion();
-
- // Set the script name and version
- $this->scriptName = $scriptName;
- $this->version = $version;
-
- // Set the display setting
- $this->display = ( !defined('DISPLAY') || true === DISPLAY ? true : false );
-
- // Query Limit
- if( defined('LIMIT') )
- {
- $this->limit = ( ( is_int(LIMIT) && 0 < LIMIT ) ? LIMIT : false );
- }
-
- // Should data be removed?
- if( defined('REMOVE') )
- {
- $this->remove = ( ( true === REMOVE ) ? true : false );
- }
-
- // Should data be updated?
- if( defined('UPDATE') )
- {
- $this->update = ( ( true === UPDATE ) ? true : false );
- }
-
- // Debug mode?
- if( defined('DEBUG') )
- {
- $this->debug = ( ( true === DEBUG ) ? true : false );
- }
- }
-
-
- /**
- * Destructor
- *
- */
- public function __destruct()
- {
- if( isset( $_SERVER["HTTP_HOST"] ) && true === $this->display )
- {
- echo '';
- }
- }
-
-
- /**
- * Check php version to be 5.4 or greater
- *
- * @throws Exception
- * @return void
- */
- protected function checkPHPVersion()
- {
- // Init
- $current = ( false === strpos( phpversion(), '-' ) ? phpversion() : substr( phpversion(), 0, strpos( phpversion(), '-' ) ) );
- $required = '5.3.10';
-
- if( 0 > strnatcmp( $current, $required ) )
- {
- throw new Exception( sprintf( 'NNScripts'. PHP_EOL .'Error: PHP version %s is required but version %s is found.', $required, $current ) );
- }
- }
-
-
- /**
- * Display a message
- *
- * The function will also try to detect a browser call and convert
- * new-lines to
's
- *
- * @param string $message
- * @return void
- */
- public function display( $message )
- {
- if( true === $this->display )
- {
- // Convert for webbrowser?
- if( isset( $_SERVER["HTTP_HOST"] ) )
- {
- $message = nl2br( $message );
- }
-
- // Display
- echo $message;
- }
- }
-
-
- /**
- * Display a page start
- * Only usefull when viewing with a webbrowser
- *
- * @return void
- */
- public function displayPageStart()
- {
- if( isset( $_SERVER["HTTP_HOST"] ) && true === $this->display )
- {
- echo '';
- }
- }
-
-
- /**
- * Display the header line and settings info
- *
- * @return void
- */
- public function displayHeader()
- {
- // Display the page start in case of an html page
- $this->displayPageStart();
-
- // Display the script header line
- $this->display( sprintf( "%s - version %s". PHP_EOL, $this->scriptName, $this->version ) );
-
- // Display settings?
- if( null !== $this->limit || null !== $this->remove || null !== $this->update )
- {
- $this->display( PHP_EOL .'Settings:' );
-
- // Display the "debug" setting
- if( true === $this->debug )
- {
- $this->display( PHP_EOL . "- debug mode enabled" );
- }
-
- // Display the "limit" setting
- if( null !== $this->limit )
- {
- $line = 'no limit';
- if( is_int($this->limit) )
- {
- $line = sprintf( "%d hour%s", $this->limit, ( 1 < $this->limit ? 's' : '' ) );
- }
- $this->display( PHP_EOL . sprintf( "- limit : %s", $line ) );
- }
-
- // Display the "remove" setting
- if( null !== $this->remove )
- {
- $line = "Data will be removed.";
- if( true !== $this->remove )
- {
- $line = 'No data is removed from the database!'. PHP_EOL .' Change the "REMOVE" setting if you want to remove releases or parts';
- }
- $this->display( PHP_EOL . sprintf( "- remove: %s", $line ) );
- }
-
- // Display the "update" setting
- if( null !== $this->update )
- {
- $line = "Data will be updated.";
- if( true !== $this->update )
- {
- $line = 'No data is updated in the database!'. PHP_EOL .' Change the "UPDATE" setting if you want to enable update';
- }
- $this->display( PHP_EOL . sprintf( "- update: %s", $line ) );
- }
-
- // Spacer
- $this->display( PHP_EOL );
- }
-
- // End spacer
- $this->display( PHP_EOL );
- }
-}
diff --git a/nnscripts/remove_parts_without_releases.php b/nnscripts/remove_parts_without_releases.php
index d4bd28561..8f0eed0fa 100644
--- a/nnscripts/remove_parts_without_releases.php
+++ b/nnscripts/remove_parts_without_releases.php
@@ -1,87 +1,76 @@
nnscripts = $nnscripts;
+ // Call the parent constructor
+ parent::__construct();
- // Set the database variable
- $this->db = $db;
+ // Set the commandline options
+ $options = array(
+ array( null, 'querylimit', Ulrichsg\Getopt::REQUIRED_ARGUMENT, 'The query limit (default 10000)' ),
+ );
+ $this->setCliOptions( $options, array('display', 'limit', 'help') );
+
+ // Show the header
+ $this->displayHeader();
- // Add the "now" date
- $this->now = new DateTime();
- if( defined('LIMIT') && is_int(LIMIT) && 0 < LIMIT )
- {
- // substract the limit hours
- $this->now->sub( new DateInterval('PT'. LIMIT .'H') );
- }
+ // Show the settings
+ $this->displaySettings();
}
@@ -97,9 +86,12 @@ class removeParts
// Remove parts where the binary is missing
$this->removePartsWithMissingBinary();
+
+ // Remove binaries without parts
+ $this->removeBinariesWithoutParts();
}
-
-
+
+
/**
* Remove parts without a binary linked
*
@@ -107,48 +99,21 @@ class removeParts
*/
private function removePartsWithoutBinary()
{
- $this->nnscripts->display( "Removing old part records which are not linked to a binary: " );
+ $this->display( "Removing old part records which are not linked to a binary: " );
// Build the sql
- $sql = sprintf(
- "DELETE FROM parts
- WHERE parts.binaryID = 0
- %s",
- ( ( defined('LIMIT') && is_int(LIMIT) && 0 < LIMIT ) ? sprintf("AND parts.dateadded < '%s'", $this->now->format('Y-m-d H:i:s')) : '' )
- );
- $result = $this->db->queryDirect( $sql );
- $this->nnscripts->display( ( $result ? "Done" : "Error" ) . PHP_EOL );
- }
-
-
- /**
- * Get the total count of parts to remove
- *
- * @return int
- */
- protected function getTotalPartsToRemove()
- {
- // Init
- $ret = 0;
-
- // Get the total to remove
- $sql = sprintf("SELECT count(*) AS total
- FROM parts AS p
- LEFT JOIN binaries AS b ON (b.ID = p.binaryID)
- WHERE b.ID IS NULL
- %s",
- ( ( defined('LIMIT') && is_int(LIMIT) && 0 < LIMIT ) ? sprintf("AND p.dateadded < '%s'", $this->now->format('Y-m-d H:i:s')) : '' ) );
- $result = $this->db->query( $sql );
- if( is_array($result) && 1 === count($result) )
+ $sql = "DELETE FROM parts
+ WHERE binaryID = 0";
+ if( is_numeric( $this->settings['limit'] ) && 0 < $this->settings['limit'] )
{
- $ret = $result[0]['total'];
+ $sql .= sprintf( ' AND dateadded < "%s" - INTERVAL %s HOUR', $this->settings['now'], $this->settings['limit'] );
}
-
- // Return
- return $ret;
+ $result = $this->db->queryDirect( $sql );
+
+ $this->display( ( $result ? "Done" : "Error" ) . PHP_EOL );
}
-
+
/**
* Remove parts where the binary is missing
*
@@ -156,18 +121,17 @@ class removeParts
*/
private function removePartsWithMissingBinary()
{
- // The query limit
- $queryLimit = ( defined('QUERYLIMIT') && is_int(QUERYLIMIT) && 0 < QUERYLIMIT ? QUERYLIMIT : 10000 );
-
// Get the total parts to remove
$total = $this->getTotalPartsToRemove();
if( 0 < $total )
{
$line = sprintf( "Removing %s parts with missing binaries", number_format($total, 0, '.', '') );
- if( $total > $queryLimit )
- $line .= sprintf( ' (in groups of %d parts)', $queryLimit );
+ if( $total > $this->settings['querylimit'] )
+ {
+ $line .= sprintf( ' (in groups of %d parts)', $this->settings['querylimit'] );
+ }
$line .= ': ';
- $this->nnscripts->display( $line );
+ $this->display( $line );
// Set the lastID
$lastId = null;
@@ -186,8 +150,12 @@ class removeParts
ORDER BY p.ID ASC
LIMIT %d",
( null !== $lastId ? sprintf('AND p.ID > %d', $lastId) : '' ),
- ( ( defined('LIMIT') && is_int(LIMIT) && 0 < LIMIT ) ? sprintf("AND p.dateadded < '%s'", $this->now->format('Y-m-d H:i:s')) : '' ),
- $queryLimit
+ (
+ ( is_numeric( $this->settings['limit'] ) && 0 < $this->settings['limit'] )
+ ? sprintf( ' AND p.dateadded < "%s" - INTERVAL %s HOUR', $this->settings['now'], $this->settings['limit'] )
+ : ''
+ ),
+ $this->settings['querylimit']
);
$result = $this->db->query( $sql );
if( is_array( $result ) && 0 < count( $result ) )
@@ -199,9 +167,9 @@ class removeParts
{
$ids[] = $lastId = $row['ID'];
$counter++;
- if( $queryLimit === $counter )
+ if( $this->settings['querylimit'] === $counter )
{
- $this->nnscripts->display( "." );
+ $this->display( "." );
$sql = sprintf( "DELETE FROM parts WHERE ID IN (%s)", implode(',', $ids) );
$this->db->queryDirect( $sql );
$ids = array();
@@ -213,7 +181,7 @@ class removeParts
unset( $result );
// Lower the total
- $total -= $queryLimit;
+ $total -= $this->settings['querylimit'];
}
else
{
@@ -223,43 +191,81 @@ class removeParts
}
// And remove the rest
- if( 0 < count($ids) )
+ if( is_array($ids) && 0 < count($ids) )
{
- $this->nnscripts->display( "." );
+ $this->display( "." );
$sql = sprintf( "DELETE FROM parts WHERE ID IN (%s)", implode(',', $ids) );
$this->db->queryDirect( $sql );
}
- $this->nnscripts->display( PHP_EOL );
+ $this->display( PHP_EOL );
}
else
{
- $this->nnscripts->display( 'No parts with missing binaries to remove.'. PHP_EOL );
+ $this->display( 'No parts with missing binaries to remove.'. PHP_EOL );
}
}
+
+
+ /**
+ * Get the total count of parts to remove
+ *
+ * @return int
+ */
+ protected function getTotalPartsToRemove()
+ {
+ // Init
+ $ret = 0;
+
+ // Get the total to remove
+ $sql = "SELECT count(*) AS total
+ FROM parts AS p
+ LEFT JOIN binaries AS b ON (b.ID = p.binaryID)
+ WHERE b.ID IS NULL";
+ if( is_numeric( $this->settings['limit'] ) && 0 < $this->settings['limit'] )
+ {
+ $sql .= sprintf( ' AND p.dateadded < "%s" - INTERVAL %s HOUR', $this->settings['now'], $this->settings['limit'] );
+ }
+
+ $result = $this->db->queryOneRow( $sql );
+ if( is_array($result) && array_key_exists('total', $result) )
+ {
+ $ret = (int)$result['total'];
+ }
+
+ // Return
+ return $ret;
+ }
+
+
+ /**
+ * Remove orhpan binary records
+ *
+ * @return void
+ */
+ protected function removeBinariesWithoutParts()
+ {
+ $this->display( "Removing old binary records which do not have parts: " );
+
+ $sql = "DELETE binaries FROM binaries
+ LEFT JOIN parts ON (parts.binaryID = binaries.ID)
+ WHERE parts.ID IS NULL";
+ if( is_numeric( $this->settings['limit'] ) && 0 < $this->settings['limit'] )
+ {
+ $sql .= sprintf( ' AND binaries.dateadded < "%s" - INTERVAL %s HOUR', $this->settings['now'], $this->settings['limit'] );
+ }
+ $result = $this->db->queryDirect( $sql );
+
+ $this->display( ( $result ? "Done" : "Error" ) . PHP_EOL );
+ }
}
+// Main application
try
{
- // Init
- $scriptName = 'Remove parts which are not linked to a binary';
- $scriptVersion = '0.2';
-
- // Load the NNscript class
- $nnscripts = new NNScripts( $scriptName, $scriptVersion );
-
- // Display the header
- $nnscripts->displayHeader();
-
- // Load the application part
- $db = new DB;
- if( !$db )
- throw new Exception("Error loading database library");
-
- // Load the categoryReleases class
- $cr = new removeParts( $nnscripts, $db );
- $cr->cleanup();
+ // Load the remove_parts_without_releases class
+ $rpwr = new remove_parts_without_releases();
+ $rpwr->cleanup();
} catch( Exception $e ) {
echo $e->getMessage() . PHP_EOL;
}
-
diff --git a/nnscripts/settings.ini b/nnscripts/settings.ini
new file mode 100644
index 000000000..fe91baee5
--- /dev/null
+++ b/nnscripts/settings.ini
@@ -0,0 +1,35 @@
+[global]
+display = true
+
+[check_database]
+;display = false
+
+[fix_android_releases]
+;display = false
+;limit = 36
+
+[remove_blacklist_releases]
+;display = false
+;limit = 36
+;limit = false
+;full = true
+;debug = true
+remove = false
+
+[remove_category_releases]
+;display = false
+;limit = 36
+
+[remove_parts_without_releases]
+;display = false
+;limit = 36
+querylimit = 10000
+
+[remove_unwanted_releases]
+;display = false
+;limit = 36
+remove = false
+
+[update_missing_movie_info]
+;display = false
+
diff --git a/nnscripts/update_missing_movie_info.php b/nnscripts/update_missing_movie_info.php
index c7bd15dfb..a57c51922 100644
--- a/nnscripts/update_missing_movie_info.php
+++ b/nnscripts/update_missing_movie_info.php
@@ -4,52 +4,50 @@
*
* Releases may be added/eddited with an imdb-id that does not exists
* in the movieinfo table. This script will fetch all the missing imdb
- * id's from the releases table.
- *
- * The location of the script needs to be "misc/custom" or the
- * "misc/testing" directory. if used from another location,
- * change lines 32 to 35 to require the correct files.
+ * id's from the releases table and updates the movie info.
*
* @author NN Scripts
* @license http://opensource.org/licenses/MIT MIT License
* @copyright (c) 2013 - NN Scripts
*
* Changelog:
- * 0.1 - Initial version
+ * 0.2 - Added settings.ini
+ * Start using nnscript library
+ *
+ * 0.1 - Initial version
*/
-
-//----------------------------------------------------------------------
-// Settings
-
-// Display settings
-define('DISPLAY', true);
-
-// Should the move info be updated?
-define('UPDATE', true);
-//----------------------------------------------------------------------
-
// Load the application
-require(dirname(__FILE__)."/../bin/config.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."lib/movie.php");
-require_once('nnscripts.php');
+require_once(dirname(__FILE__)."/../bin/config.php");
+
+// nnscripts includes
+require_once("lib/nnscripts.php");
+
+// newznab includes
+require_once(WWW_DIR."/lib/movie.php");
+
/**
- * Update missing movie information
+ * Update missing movie info
*/
-class movieInfo
+class update_missing_movie_info extends NNScripts
{
/**
- * NNScripts class
- * @var NNScripts
+ * The script name
+ * @var string
*/
- private $nnscripts;
+ protected $scriptName = 'Update missing movie information';
/**
- * The database object
- * @var DB
+ * The script version
+ * @var string
*/
- private $db;
+ protected $scriptVersion = '0.2';
+
+ /**
+ * Allowed settings
+ * @var array
+ */
+ protected $allowedSettings = array('display');
/**
* The movie object
@@ -57,25 +55,27 @@ class movieInfo
*/
private $movie;
-
+
+
/**
- * Constructor
- *
- * @param NNScripts $nnscripts
- * @param DB $db
- * @param Movie $movie
+ * The constructor
+ *
*/
- public function __construct( NNScripts $nnscripts, DB $db, Movie $movie )
+ public function __construct()
{
- // Set the NNScripts variable
- $this->nnscripts = $nnscripts;
+ // Call the parent constructor
+ parent::__construct();
- // Set the database variable
- $this->db = $db;
+ // Set the commandline options
+ $options = array();
+ $this->setCliOptions( $options, array('display', 'help') );
+
+ // Show the header
+ $this->displayHeader();
// Set the movie variable
- $this->movie = $movie;
- }
+ $this->movie = new Movie();
+ }
/**
@@ -105,53 +105,31 @@ class movieInfo
$name = sprintf("%s (%s)", str_replace(array('.', '_'), ' ', trim($matches[1])), $matches[2]);
}
- $this->nnscripts->display( sprintf( "Updating: %s ", $name ) );
- if( defined('UPDATE') && true === UPDATE )
- {
- // Update the movie info
- $this->movie->updateMovieInfo( $row['imdbID'] );
+ $this->display( sprintf( "Updating: %s ", $name ) );
+
+ // Update the movie info
+ $this->movie->updateMovieInfo( $row['imdbID'] );
- // Prevent overloading the remote servers
- sleep(2);
- }
- $this->nnscripts->display( PHP_EOL );
+ // Prevent overloading the remote servers
+ sleep(2);
+
+ $this->display( PHP_EOL );
}
}
else
{
- $this->nnscripts->display( 'No missing movie information found'. PHP_EOL );
+ $this->display( 'No missing movie information found'. PHP_EOL );
}
-
- $this->nnscripts->display( PHP_EOL );
- }
+ }
}
+
+// Main application
try
{
- // Init
- $scriptName = 'Update missing movie information';
- $scriptVersion = '0.1';
-
- // Load the NNscript class
- $nnscripts = new NNScripts( $scriptName, $scriptVersion );
-
- // Display the header
- $nnscripts->displayHeader();
-
- // Load the application part
- $movie = new Movie;
- if( !$movie )
- throw new Exception("Error loading movie library");
-
- $db = new DB;
- if( !$db )
- throw new Exception("Error loading database library");
-
- // Load the blacklistReleases class
- $mi = new movieInfo( $nnscripts, $db, $movie );
- $mi->update();
-
+ // Update missing movie information
+ $ummi = new update_missing_movie_info();
+ $ummi->update();
} catch( Exception $e ) {
echo $e->getMessage() . PHP_EOL;
}
-