From c4c0b56b22b4adb270bec83b32f6e8f57e225699 Mon Sep 17 00:00:00 2001 From: Jakob Sack Date: Thu, 9 Aug 2012 21:23:31 +0200 Subject: Try to use backgroundjobs --- lib/backgroundjob.php | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/feedmapper.php | 17 +++++++--- 2 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 lib/backgroundjob.php diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php new file mode 100644 index 000000000..6506e9bc0 --- /dev/null +++ b/lib/backgroundjob.php @@ -0,0 +1,91 @@ +. +* +*/ + +namespace OCA\News; + +/** + * This class maps a feed to an entry in the feeds table of the database. + */ +class Backgroundjob { + static public function sortFeeds( $a, $b ){ + if( $a['id'] == $b['id'] ){ + return 0; + } + elseif( $a['id'] < $b['id'] ){ + return -1; + } + else{ + return 1; + } + } + + static public function run(){ + if( \OC::$CLI ){ + self::cliStep(); + } + else{ + self::webStep(); + } + } + + static private function cliStep(){ + $feedmapper = new \OC_News_FeedMapper(); + + // Iterate over all feeds + $feeds = $feedmapper->findAll(); + foreach( $feeds as $feed ){ + self::updateFeed( $feedmapper, $feed ); + } + } + + static private function webStep(){ + // Iterate over all users + $lastid = OCP\Config::getAppValue('news', 'backgroundjob_lastid',0); + + $feedmapper = new \OC_News_FeedMapper(); + $feeds = $feedmapper->findAll(); + usort( $feeds, array( 'OCA\News\Backgroundjob', 'sortFeeds' )); + + $done = false; + foreach( $feeds as $feed ){ + if( $feeds['id'] > $lastid ){ + // set lastid BEFORE updating feed! + OCP\Config::setAppValue('news', 'backgroundjob_lastid',$lastid); + $done = true; + self::updateFeed( $feedmapper, $feed ); + } + } + + if( !$done ){ + OCP\Config::setAppValue('news', 'backgroundjob_lastid',0); + } + } + + static private function updateFeed( $feedmapper, $feed ){ + $newfeed = null; + $newfeed = \OC_News_Utils::fetch( $feed['url'] ); + if( $newfeed !== null ){ + $feedmapper = new \OC_News_FeedMapper(); + $newfeedid = $feedmapper->save($newfeed, $feed['folderid'] ); + } + } +} diff --git a/lib/feedmapper.php b/lib/feedmapper.php index a533691cb..7775413c3 100644 --- a/lib/feedmapper.php +++ b/lib/feedmapper.php @@ -39,15 +39,24 @@ class OC_News_FeedMapper { * @returns */ public function findAll(){ - $stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE user_id = ?'); - $result = $stmt->execute(array($this->userid)); + $query = 'SELECT * FROM ' . self::tableName; + $params = array(); + if( $this->userid ){ + $query = $query + ' WHERE user_id = ?' + $params[] = $this->userid; + } + + $stmt = OCP\DB::prepare( $query ); + $result = $stmt->execute( $params ); $feeds = array(); while ($row = $result->fetchRow()) { $url = $row['url']; $id = $row['id']; $folderid = $row['folder_id']; - $feeds[] = array("url" => $url, "id" => $id, "folderid" => $folderid); + $userid = $row['user_id']; + $feeds[] = array("url" => $url, "id" => $id, "folderid" => $folderid, 'userid' => $userid ); } + return $feeds; } @@ -230,4 +239,4 @@ class OC_News_FeedMapper { return true; } -} \ No newline at end of file +} -- cgit v1.2.3 From 2eb2f917938fa3728ebad2ca21672deb1fa03757 Mon Sep 17 00:00:00 2001 From: Jakob Sack Date: Thu, 9 Aug 2012 21:24:02 +0200 Subject: Register background job --- appinfo/app.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appinfo/app.php b/appinfo/app.php index 13b0643f3..6134d28de 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -21,6 +21,9 @@ OC::$CLASSPATH['OC_News_FolderMapper'] = 'apps/news/lib/foldermapper.php'; OC::$CLASSPATH['OC_News_Utils'] = 'apps/news/lib/utils.php'; +OC::$CLASSPATH['OCA\News\Backgroundjob'] = 'apps/news/lib/backgroundjob.php'; +OCP\Backgroundjob::addRegularTask( 'OCA\News\Backgroundjob', 'run' ); + $l = new OC_l10n('news'); OCP\App::addNavigationEntry( array( -- cgit v1.2.3 From 03b7bb8c06e1202276128e226043b70ab2425f43 Mon Sep 17 00:00:00 2001 From: Jakob Sack Date: Thu, 9 Aug 2012 22:09:39 +0200 Subject: News: fix bug in backgroundjobs --- lib/backgroundjob.php | 8 ++++---- lib/feedmapper.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php index 6506e9bc0..1c12cbc4f 100644 --- a/lib/backgroundjob.php +++ b/lib/backgroundjob.php @@ -59,7 +59,7 @@ class Backgroundjob { static private function webStep(){ // Iterate over all users - $lastid = OCP\Config::getAppValue('news', 'backgroundjob_lastid',0); + $lastid = \OCP\Config::getAppValue('news', 'backgroundjob_lastid',0); $feedmapper = new \OC_News_FeedMapper(); $feeds = $feedmapper->findAll(); @@ -67,16 +67,16 @@ class Backgroundjob { $done = false; foreach( $feeds as $feed ){ - if( $feeds['id'] > $lastid ){ + if( $feed['id'] > $lastid ){ // set lastid BEFORE updating feed! - OCP\Config::setAppValue('news', 'backgroundjob_lastid',$lastid); + \OCP\Config::setAppValue('news', 'backgroundjob_lastid',$feed['id']); $done = true; self::updateFeed( $feedmapper, $feed ); } } if( !$done ){ - OCP\Config::setAppValue('news', 'backgroundjob_lastid',0); + \OCP\Config::setAppValue('news', 'backgroundjob_lastid',0); } } diff --git a/lib/feedmapper.php b/lib/feedmapper.php index 7775413c3..19cee1d2a 100644 --- a/lib/feedmapper.php +++ b/lib/feedmapper.php @@ -42,7 +42,7 @@ class OC_News_FeedMapper { $query = 'SELECT * FROM ' . self::tableName; $params = array(); if( $this->userid ){ - $query = $query + ' WHERE user_id = ?' + $query = $query.' WHERE user_id = ?'; $params[] = $this->userid; } -- cgit v1.2.3