' . $item['genre'] . '
' . $item['chaptercount'] . '
'; $this->items[] = $item; } - } + break; - if($type === "path") { + case 'Get manga updates': + $limit = $this->getInput('limit'); + if(empty($limit)){ + $limit = MANGAREADER_LIMIT; + } $this->request = $xpath->query(".//*[@id='mangaproperties']//*[@class='aname']")->item(0)->nodeValue; @@ -187,14 +170,15 @@ class MangareaderBridge extends BridgeAbstract{ foreach ($chapters as $chapter){ $item = array(); $item['title'] = htmlspecialchars($xpath->query("td[1]", $chapter)->item(0)->nodeValue); - $item['uri'] = 'http://www.mangareader.net' . $xpath->query("td[1]/a", $chapter)->item(0)->getAttribute('href'); + $item['uri'] = $this->uri . $xpath->query("td[1]/a", $chapter)->item(0)->getAttribute('href'); $item['timestamp'] = strtotime($xpath->query("td[2]", $chapter)->item(0)->nodeValue); array_unshift($this->items, $item); } + break; } // Return some dummy-data if no content available - if(count($this->items) == 0){ + if(empty($this->items)){ $item = array(); $item['content'] = "No updates available
"; @@ -202,6 +186,25 @@ class MangareaderBridge extends BridgeAbstract{ } } + public function getURI(){ + switch($this->queriedContext){ + case 'Get latest updates': + $path = "latest"; + break; + case 'Get popular mangas': + $path = "popular"; + if($this->getInput('category') !== "all"){ + $path .= "/" . $this->getInput('category'); + } + break; + case 'Get manga updates': + $path = $this->getInput('path'); + break; + } + return $this->uri . $path; + } + + public function getName(){ return (!empty($this->request) ? $this->request . ' - ' : '') . 'Mangareader Bridge'; } diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php index a4534d48..1dc08cfa 100644 --- a/bridges/MilbooruBridge.php +++ b/bridges/MilbooruBridge.php @@ -16,22 +16,16 @@ class MilbooruBridge extends BridgeAbstract{ )); public function collectData(){ - $page = 0;$tags=''; - if ($this->getInput('p')) { - $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p')); - } - if ($this->getInput('t')) { - $tags = urlencode($this->getInput('t')); - } - $html = $this->getSimpleHTMLDOM("http://sheslostcontrol.net/moe/shimmie/index.php?q=/post/list/$tags/$page") or $this->returnServerError('Could not request Milbooru.'); - + $html = $this->getSimpleHTMLDOM( + $this->uri.'?q=/post/list/'.urlencode($this->getInput('t')).'/'.$this->getInput('p') + )or $this->returnServerError('Could not request Milbooru.'); foreach($html->find('div[class=shm-image-list] span[class=thumb]') as $element) { $item = array(); - $item['uri'] = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('a', 0)->href; + $item['uri'] = $this->uri.$element->find('a', 0)->href; $item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('data-post-id')); $item['timestamp'] = time(); - $thumbnailUri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('img', 0)->src; + $thumbnailUri = $this->uri.$element->find('img', 0)->src; $item['tags'] = $element->find('a', 0)->getAttribute('data-tags'); $item['title'] = 'Milbooru | '.$item['postid']; $item['content'] = ''.$article_subtitle.'
' - .trim($contents); - - $item = array(); - $item['uri'] = $article_url; - $item['title'] = $article_title; - $item['author'] = $article_author; - $item['timestamp'] = $article_timestamp; - $item['content'] = $contents; - $this->items[] = $item; - $limit++; + if ($limit >= 10) { + break; } - } + $article_url = ExtractFromDelimiters($element->innertext, '', ''); + $article_author = ExtractFromDelimiters($element->innertext, 'dc/elements/1.1/">', ''); + $article_title = $element->find('title', 0)->plaintext; + $article_subtitle = $element->find('description', 0)->plaintext; + $article_timestamp = strtotime($element->find('pubDate', 0)->plaintext); + $article_thumbnail = ExtractFromDelimiters($element->innertext, ''.$article_subtitle.'
' + .trim($contents); + + $item = array(); + $item['uri'] = $article_url; + $item['title'] = $article_title; + $item['author'] = $article_author; + $item['timestamp'] = $article_timestamp; + $item['content'] = $contents; + $this->items[] = $item; + $limit++; + } } } diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php index d01ef53c..69dd8ddd 100644 --- a/bridges/NiceMatinBridge.php +++ b/bridges/NiceMatinBridge.php @@ -9,11 +9,11 @@ class NiceMatinBridge extends BridgeAbstract{ private function NiceMatinExtractContent($url) { $html = $this->getSimpleHTMLDOM($url); if(!$html) - $this->returnServerError('Could not acquire content from url: ' . $url . '!'); + return 'Could not acquire content from url: ' . $url . '!'; $content = $html->find('article', 0); if(!$content) - $this->returnServerError('Could not find \'section\'!'); + return 'Could not find \'section\'!'; $text = preg_replace('#');
@@ -21,25 +21,27 @@ class NiceMatinBridge extends BridgeAbstract{
}
public function collectData(){
- $html = $this->getSimpleHTMLDOM('http://www.nicematin.com/derniere-minute/rss') or $this->returnServerError('Could not request NiceMatin.');
+ $html = $this->getSimpleHTMLDOM($this->uri.'derniere-minute/rss')
+ or $this->returnServerError('Could not request NiceMatin.');
$limit = 0;
foreach($html->find('item') as $element) {
- if($limit < 10) {
- // We need to fix the 'link' tag as simplehtmldom cannot parse it (just rename it and load back as dom)
- $element_text = $element->outertext;
- $element_text = str_replace('', '
'.$fullhtml->find('div.seriesimg', 0)->innertext.'';
+ $item['content'] = ''.$this->seriesTitle.' - '.$item['title'].' by '.$item['team'].'
'.$fullhtml->find('div.seriesimg', 0)->innertext.'';
$this->items[] = $item;
}
}
public function getName(){
- return (!empty($this->request) ? $this->request.' - ' : '') .'Novel Updates';
+ return (!empty($this->seriesTitle) ? $this->seriesTitle.' - ' : '') .'Novel Updates';
}
public function getCacheDuration(){
diff --git a/lib/Bridge.php b/lib/Bridge.php
index d2c8ada9..c8f5cbac 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -352,6 +352,9 @@ abstract class BridgeAbstract implements BridgeInterface {
}
// Only keep guessed context parameters values
+ if(!isset($this->inputs[$this->queriedContext])){
+ $this->inputs[$this->queriedContext]=array();
+ }
$this->inputs=array($this->queriedContext=>$this->inputs[$this->queriedContext]);
$this->collectData();