diff --git a/includes/class-Bot.php b/includes/class-Bot.php index dc449bc..b957d88 100644 --- a/includes/class-Bot.php +++ b/includes/class-Bot.php @@ -1,215 +1,212 @@ . namespace itwikidelbot; use DateTime; use DateInterval; /** * The Bot class helps in running the bot */ class Bot { /** * The date * * @var DateTime */ private $dateTime; /** * A cache of already done dates. * It's an array of booleans like [year][month] = true. * * @var array */ private $cache = []; /** * Construct * * @param $date DateTime */ public function __construct( DateTime $date = null ) { if( ! $date ) { $date = new DateTime(); } $this->setDate( $date ); } /** * Static construct * * @param $date string */ public static function createFromString( $date = 'now' ) { return new self( new DateTime( $date ) ); } /** * Static construct * * @param $y int Year * @param $m int Month 1-12 * @param $d int Day 1-31 */ public static function createFromYearMonthDay( $y, $m, $d ) { return new self( DateTime::createFromFormat( "Y m d", "$y $m $d") ); } /** * Get the date * * @return DateTime */ public function getDate() { return $this->dateTime; } /** * Set the date * * @param $date DateTime * @return self */ public function setDate( DateTime $date ) { $this->dateTime = $date; } /** * Add a day * * @return self */ public function nextDay() { return $this->addDays( 1 ); } /** * Add a day * * @return self */ public function previousDay() { return $this->subDays( 1 ); } /** * Add a certain number of days * * @param $days int * @return self */ public function addDays( $days ) { $this->getDate()->add( new DateInterval( sprintf( 'P%dD', $days ) ) ); return $this; } /** * Subtract a certain number of days * * @param $days int * @return self */ public function subDays( $days ) { $this->getDate()->sub( new DateInterval( sprintf( 'P%dD', $days ) ) ); return $this; } /** * Run the bot at the internal date * * @TODO: do not repeat twice the same yearly and montly categories * @return self */ public function run() { + // date initialization $date = $this->getDate(); $year = $date->format( 'Y' ); $month = $date->format( 'n' ); // 1-12 $day = $date->format( 'j' ); // create the yearly category (once) $cache = & $this->cache; if( ! isset( $cache[ $year ] ) ) { $cache[ $year ] = []; ( new CategoryYear( $year ) ) ->saveIfNotExists(); } // create the monthly category (once) $cache = & $cache[ $year ]; if( ! isset( $cache[ $month ] ) ) { $cache[ $month ] = true; ( new CategoryYearMonth( $year, $month ) ) ->saveIfNotExists(); } // PDCs indexed by page ID $pdcs = []; // handle every PDC type foreach( CategoryYearMonthDayTypes::all() as $CategoryType ) { // fetch PDCs from this type $category_type = new $CategoryType( $year, $month, $day ); $category_type_pdcs = $category_type->fetchPDCs(); // save the specific daily category type only if it's not empty if( $category_type_pdcs ) { $category_type->saveIfNotExists(); } // merge the same PDCs into one foreach( $category_type_pdcs as $category_type_pdc ) { $id = $category_type_pdc->getID(); if( isset( $pdcs[ $id ] ) ) { $pdcs[ $id ]->merge( $category_type_pdc ); } else { $pdcs[ $id ] = $category_type_pdc; } } } - PDCs::sortByCreationDate( $pdcs ); + // discard PDCs that do not belong to this date + $pdcs = PDCs::filterNotInDate( $pdcs, $date ); - // TODO: remove these debugging lines - foreach( $pdcs as $pdc ) { - if( $pdc->getDurationDays() > 7 ) { - Log::info( sprintf( - 'the PDC %s expired after %d days', - $pdc->getTitle(), - $pdc->getDurationDays() - ) ); - } - } + // sort by creation date + PDCs::sortByCreationDate( $pdcs ); + // index then by their PDC_TYPE $pdcs_by_type = PDCs::indexByType( $pdcs ); + // save the counting page PageYearMonthDayPDCsCount::createFromDateTimePDCs( $this->getDate(), $pdcs_by_type ) ->save(); + // save the log page PageYearMonthDayPDCsLog::createFromDateTimePDCs( $this->getDate(), $pdcs_by_type ) ->save(); return $this; } } diff --git a/includes/class-PDCs.php b/includes/class-PDCs.php index 326b682..026256a 100644 --- a/includes/class-PDCs.php +++ b/includes/class-PDCs.php @@ -1,53 +1,74 @@ . namespace itwikidelbot; +use DateTime; + /** * PDCs handler */ class PDCs { /** * Sort some PDCs by creation date * * @param $pdcs array */ public static function sortByCreationDate( & $pdcs ) { // sort PDCs by start date usort( $pdcs, function ( $a, $b ) { return $a->getCreationDate() > $b->getCreationDate(); } ); } /** * Index some PDCs by their type * * @param $pdcs array * @return array */ public static function indexByType( $pdcs ) { $pdcs_by_type = []; foreach( CategoryYearMonthDayTypes::all() as $Type ) { $pdcs_by_type[ $Type::PDC_TYPE ] = []; } foreach( $pdcs as $pdc ) { $type = $pdc->getType(); $pdcs_by_type[ $type ][] = $pdc; } return $pdcs_by_type; } + /** + * Filter out all the PDCs that do not belong to a certain date + * + * @param $pdcs array + * @param $date DateTime + */ + public static function filterNotInDate( $pdcs, DateTime $date ) { + $pdcs_filtered = []; + + $date_raw = $date->format( 'Y-m-d' ); + foreach( $pdcs as $pdc ) { + if( $pdc->getStartDate()->format( 'Y-m-d' ) === $date_raw ) { + $pdcs_filtered[] = $pdc; + } + } + + return $pdcs_filtered; + } + }