Merge pull request #296 from kranack/dev-flickr

Update Flickr Bridge
This commit is contained in:
Mitsu 2016-08-02 14:21:54 +02:00 committed by GitHub
commit cb84635e2d

View file

@ -5,21 +5,34 @@ class FlickrExploreBridge extends BridgeAbstract{
$this->maintainer = "sebsauvage"; $this->maintainer = "sebsauvage";
$this->name = "Flickr Explore"; $this->name = "Flickr Explore";
$this->uri = "http://www.flickr.com/explore"; $this->uri = "https://www.flickr.com/explore";
$this->description = "Returns the latest interesting images from Flickr"; $this->description = "Returns the latest interesting images from Flickr";
$this->update = "2014-05-25"; $this->update = "2016-07-30";
} }
public function collectData(array $param){ public function collectData(array $param){
$html = $this->file_get_html('http://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404); $html = $this->file_get_html('https://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404);
foreach($html->find('.photo-list-photo-view') as $element) {
// Get the styles
$style = explode(';', $element->style);
// Get the background-image style
$backgroundImage = explode(':', end($style));
// URI type : url(//cX.staticflickr.com/X/XXXXX/XXXXXXXXX.jpg)
$imageURI = trim(str_replace(['url(', ')'], '', end($backgroundImage)));
// Get the image ID
$imageURIs = explode('_', basename($imageURI));
$imageID = reset($imageURIs);
// Get the image JSON via Flickr API
$imageJSON = json_decode(file_get_contents('https://api.flickr.com/services/rest/?method=flickr.photos.getInfo&api_key=103b574d49bd51f0e18bfe907da44a0f&photo_id='.$imageID.'&format=json&nojsoncallback=1')) or $this->returnError('Could not request Flickr.', 404); // FIXME: Request time too long...
foreach($html->find('span.photo_container') as $element) {
$item = new \Item(); $item = new \Item();
$item->uri = 'http://flickr.com'.$element->find('a',0)->href; $item->uri = 'https://flickr.com/photo.gne?id='.$imageID;
$item->thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src'); $item->thumbnailUri = $imageURI;
$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ? $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
$item->title = $element->find('a',0)->title; $item->title = $imageJSON->photo->title->_content;
$this->items[] = $item; $this->items[] = $item;
} }
} }
@ -29,7 +42,7 @@ class FlickrExploreBridge extends BridgeAbstract{
} }
public function getURI(){ public function getURI(){
return 'http://www.flickr.com/explore'; return 'https://www.flickr.com/explore';
} }
public function getCacheDuration(){ public function getCacheDuration(){