first work on feed updater + pinger

diff --git a/.gitignore b/.gitignore
index f2b734fe228cfc3addaf05355034d129d939a84c..a09bfc2d4e97c32baa888dd9339bef87f321a67e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data/config.php
 www/test.htm
+lib/simplepie/*

diff --git a/bin/stapibas b/bin/stapibas
new file mode 100755 (executable)
index 0000000..77763ce
--- /dev/null
+++ b/bin/stapibas
@@ -0,0 +1,12 @@
+#!/usr/bin/env php
+<?php
+namespace stapibas;
+require_once __DIR__ . '/../data/config.php';
+require_once 'stapibas/autoloader.php';
+
+$uf = new Feed_UpdateFeeds();
+$uf->db = new PDO($dbdsn, $dbuser, $dbpass);
+$uf->log = new Logger();
+$uf->updateAll();
+
+?>

diff --git a/data/config.php.dist b/data/config.php.dist
index 4b9a97cdff362b23ef765354ff0d766e83cccfc4..034a469e6a00fca18851bf50bc7751642dcbfd80 100644 (file)
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -2,4 +2,10 @@
 $dbdsn  = 'mysql:dbname=stapibas;host=127.0.0.1';
 $dbuser = 'stapibas';
 $dbpass = 'password';
+
+set_include_path(
+    __DIR__ . '/../src/' . PATH_SEPARATOR
+     . get_include_path()
+);
+$GLOBALS['stapibas_libdir'] = __DIR__ . '/../lib';
 ?>

diff --git a/src/stapibas/Feed/UpdateFeeds.php b/src/stapibas/Feed/UpdateFeeds.php
new file mode 100644 (file)
index 0000000..642f29e
--- /dev/null
+++ b/src/stapibas/Feed/UpdateFeeds.php
@@ -0,0 +1,128 @@
+<?php
+namespace stapibas;
+
+/**
+ * Fetches feeds that need an update and updates their feedentries.
+ */
+class Feed_UpdateFeeds
+{
+    public $db;
+    public $log;
+
+    public function updateAll()
+    {
+        $res = $this->db->query(
+            'SELECT * FROM feeds'
+            . ' WHERE f_needs_update = 1 OR f_updated = "0000-00-00"'
+        );
+        while ($feedRow = $res->fetch(\PDO::FETCH_OBJ)) {
+            $this->log->info(
+                sprintf('Updating feed #%d: %s', $feedRow->f_id, $feedRow->f_url)
+            );
+            $this->updateFeed($feedRow);
+        }
+    }
+
+    protected function updateFeed($feedRow)
+    {
+        $req = new \HTTP_Request2($feedRow->f_url);
+        $req->setHeader('User-Agent', 'stapibas');
+
+        if ($feedRow->f_updated != '0000-00-00 00:00:00') {
+            $req->setHeader(
+                'If-Modified-Since',
+                gmdate('r', strtotime($feedRow->f_updated))
+            );
+        }
+
+        $res = $req->send();
+        if ($res->getStatus() == 304) {
+            //not modified
+            $this->setNoUpdate($feedRow);
+            $this->log->info('Not modified');
+            return;
+        }
+
+        if (intval($res->getStatus() / 100) != 2) {
+            //no 2xx is an error for us
+            $this->log->info('Error fetching feed');
+            return;
+        }
+
+        $this->updateEntries($feedRow, $res);
+    }
+
+    protected function updateEntries($feedRow, \HTTP_Request2_Response $res)
+    {
+        require_once $GLOBALS['stapibas_libdir'] . '/simplepie/autoloader.php';
+        $sp = new \SimplePie();
+        $sp->set_raw_data($res->getBody());
+        $sp->init();
+
+        $new = $updated = $items = 0;
+        foreach ($sp->get_items() as $item) {
+            ++$items;
+            $url = $item->get_permalink();
+            $entryRow = $this->db->query(
+                'SELECT fe_id, fe_updated, fe_needs_update FROM feedentries'
+                . ' WHERE fe_url = ' . $this->db->quote($url)
+                . ' AND fe_f_id = ' . $this->db->quote($feedRow->f_id)
+            )->fetch(\PDO::FETCH_OBJ);
+
+            if ($entryRow === false) {
+                //new item!
+                $this->db->exec(
+                    'INSERT INTO feedentries SET'
+                    . '  fe_f_id = ' . $this->db->quote($feedRow->f_id)
+                    . ', fe_url = ' . $this->db->quote($url)
+                    . ', fe_needs_update = 1'
+                );
+                ++$new;
+                continue;
+            }
+            if ($entryRow->fe_needs_update == 0
+                && $item->get_updated_gmdate('U') > strtotime($entryRow->fe_updated)
+            ) {
+                //updated
+                $this->db->exec(
+                    'UPDATE feedentries SET'
+                    . '  fe_url = ' . $this->db->quote($url)
+                    . ', fe_needs_update = 1'
+                    . ' WHERE fe_id = ' . $this->db->quote($entryRow->fe_id)
+                );
+                ++$updated;
+                continue;
+            }
+        }
+        $this->log->info(
+            sprintf(
+                'Feed #%d: %d new, %d updated of %d entries',
+                $feedRow->f_id, $new, $updated, $items
+            )
+        );
+        $this->setUpdated($feedRow, $res);
+    }
+
+    protected function setNoUpdate($feedRow)
+    {
+        $this->db->exec(
+            'UPDATE feeds SET f_needs_update = 0'
+            . ' WHERE f_id = ' . $this->db->quote($feedRow->f_id)
+        );
+    }
+
+    protected function setUpdated($feedRow, \HTTP_Request2_Response $res)
+    {
+        $this->db->exec(
+            'UPDATE feeds'
+            . ' SET f_needs_update = 0'
+            . ', f_updated = ' . $this->db->quote(
+                gmdate('Y-m-d H:i:s', strtotime($res->getHeader('last-modified')))
+            )
+            . ' WHERE f_id = ' . $this->db->quote($feedRow->f_id)
+        );
+    }
+
+}
+
+?>
\ No newline at end of file

diff --git a/src/stapibas/Logger.php b/src/stapibas/Logger.php
new file mode 100644 (file)
index 0000000..9068609
--- /dev/null
+++ b/src/stapibas/Logger.php
@@ -0,0 +1,17 @@
+<?php
+namespace stapibas;
+
+class Logger
+{
+    public function info($msg)
+    {
+        $this->log($msg);
+    }
+
+    public function log($msg)
+    {
+        echo $msg . "\n";
+    }
+}
+
+?>

diff --git a/src/stapibas/PDO.php b/src/stapibas/PDO.php
new file mode 100644 (file)
index 0000000..a85008b
--- /dev/null
+++ b/src/stapibas/PDO.php
@@ -0,0 +1,28 @@
+<?php
+namespace stapibas;
+
+/**
+ * Small error-handling wrapper around PDO
+ */
+class PDO extends \PDO
+{
+    public function query()
+    {
+        $args = func_get_args();
+        $res = call_user_func_array(array('parent', 'query'), $args);
+        if ($res !== false) {
+            return $res;
+        }
+
+        $this->handleError();
+    }
+
+    protected function handleError()
+    {
+        echo "SQL error\n";
+        echo " " . $this->errorCode() . "\n";
+        echo " " . implode(' - ', $this->errorInfo()) . "\n";
+    }
+}
+
+?>
\ No newline at end of file

diff --git a/src/stapibas/autoloader.php b/src/stapibas/autoloader.php
new file mode 100644 (file)
index 0000000..6ff3f1b
--- /dev/null
+++ b/src/stapibas/autoloader.php
@@ -0,0 +1,20 @@
+<?php
+function stapibas_autoload($className)
+{
+    $className = ltrim($className, '\\');
+    $fileName  = '';
+    $namespace = '';
+    if ($lastNsPos = strripos($className, '\\')) {
+        $namespace = substr($className, 0, $lastNsPos);
+        $className = substr($className, $lastNsPos + 1);
+        $fileName  = str_replace('\\', '/', $namespace) . '/';
+    }
+    $fileName .= str_replace('_', '/', $className) . '.php';
+
+    if (stream_resolve_include_path($fileName)) {
+        require $fileName;
+    }
+}
+
+spl_autoload_register('stapibas_autoload');
+?>

diff --git a/www/xmlrpc.php b/www/xmlrpc.php
index 52bdf6e0d7e0f506aaa83eb135678761dbb9f1d9..9221e2b76d286f4918d6bae80d0deb8260fe0e45 100644 (file)
--- a/www/xmlrpc.php
+++ b/www/xmlrpc.php
@@ -3,21 +3,7 @@
  * Simply stores all pingbacks in the database.
  */
 require_once __DIR__ . '/../data/config.php';
-
-function __autoload($className)
-{
-    $className = ltrim($className, '\\');
-    $fileName  = '';
-    $namespace = '';
-    if ($lastNsPos = strripos($className, '\\')) {
-        $namespace = substr($className, 0, $lastNsPos);
-        $className = substr($className, $lastNsPos + 1);
-        $fileName  = str_replace('\\', '/', $namespace) . '/';
-    }
-    $fileName .= str_replace('_', '/', $className) . '.php';
-
-    require $fileName;
-}
+require_once 'stapibas/autoloader.php';
 
 $db = new PDO($dbdsn, $dbuser, $dbpass);