LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[FlickrBridge] Add filter by media and sort by options (#1758)

Browse source
This commit is contained in:
Joseph 2020-11-16 17:33:48 +00:00 committed by GitHub
parent 5729e069e9
commit e6c73a1fe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 100 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
bridges/FlickrBridge.php
View file

@ -20,6 +20,27 @@ class FlickrBridge extends BridgeAbstract {
'required' => true, 'required' => true,
'title' => 'Insert keyword', 'title' => 'Insert keyword',
'exampleValue' => 'bird' 'exampleValue' => 'bird'
),
'media' => array(
'name' => 'Media',
'type' => 'list',
'values' => array(
'All (Photos & videos)' => 'all',
'Photos' => 'photos',
'Videos' => 'videos',
),
'defaultValue' => 'all',
),
'sort' => array(
'name' => 'Sort By',
'type' => 'list',
'values' => array(
'Relevance' => 'relevance',
'Date uploaded' => 'date-posted-desc',
'Date taken' => 'date-taken-desc',
'Interesting' => 'interestingness-desc',
),
'defaultValue' => 'relevance',
) )
), ),
'By username' => array( 'By username' => array(
@ -29,30 +50,60 @@ class FlickrBridge extends BridgeAbstract {
'required' => true, 'required' => true,
'title' => 'Insert username (as shown in the address bar)', 'title' => 'Insert username (as shown in the address bar)',
'exampleValue' => 'flickr' 'exampleValue' => 'flickr'
),
'media' => array(
'name' => 'Media',
'type' => 'list',
'values' => array(
'All (Photos & videos)' => 'all',
'Photos' => 'photos',
'Videos' => 'videos',
),
'defaultValue' => 'all',
),
'sort' => array(
'name' => 'Sort By',
'type' => 'list',
'values' => array(
'Relevance' => 'relevance',
'Date uploaded' => 'date-posted-desc',
'Date taken' => 'date-taken-desc',
'Interesting' => 'interestingness-desc',
),
'defaultValue' => 'date-posted-desc',
) )
) )
); );
private $username = '';
public function collectData() { public function collectData() {
switch($this->queriedContext) { switch($this->queriedContext) {
case 'Explore': case 'Explore':
$filter = 'photo-lite-models'; $filter = 'photo-lite-models';
$html = getSimpleHTMLDOM(self::URI . 'explore') $html = getSimpleHTMLDOM($this->getURI())
or returnServerError('Could not request Flickr.'); or returnServerError('Could not request Flickr.');
break; break;
case 'By keyword': case 'By keyword':
$filter = 'photo-lite-models'; $filter = 'photo-lite-models';
$html = getSimpleHTMLDOM(self::URI . 'search/?q=' . urlencode($this->getInput('q')) . '&s=rec') $html = getSimpleHTMLDOM($this->getURI())
or returnServerError('No results for this query.'); or returnServerError('No results for this query.');
break; break;
case 'By username': case 'By username':
$filter = 'photo-models'; //$filter = 'photo-models';
$html = getSimpleHTMLDOM(self::URI . 'photos/' . urlencode($this->getInput('u'))) $filter = 'photo-lite-models';
$html = getSimpleHTMLDOM($this->getURI())
or returnServerError('Requested username can\'t be found.'); or returnServerError('Requested username can\'t be found.');
$this->username = $this->getInput('u');
if ($html->find('span.search-pill-name', 0)) {
$this->username = $html->find('span.search-pill-name', 0)->plaintext;
}
break; break;
default: default:
@ -64,7 +115,6 @@ class FlickrBridge extends BridgeAbstract {
$photo_models = $this->getPhotoModels($model_json, $filter); $photo_models = $this->getPhotoModels($model_json, $filter);
foreach($photo_models as $model) { foreach($photo_models as $model) {
$item = array(); $item = array();
/* Author name depends on scope. On a keyword search the /* Author name depends on scope. On a keyword search the
@ -72,12 +122,12 @@ class FlickrBridge extends BridgeAbstract {
* the author is part of the owner data. * the author is part of the owner data.
*/ */
if(array_key_exists('username', $model)) { if(array_key_exists('username', $model)) {
$item['author'] = $model['username']; $item['author'] = urldecode($model['username']);
} elseif (array_key_exists('owner', reset($model_json)[0])) { } elseif (array_key_exists('owner', reset($model_json)[0])) {
$item['author'] = reset($model_json)[0]['owner']['username']; $item['author'] = urldecode(reset($model_json)[0]['owner']['username']);
} }
$item['title'] = (array_key_exists('title', $model) ? $model['title'] : 'Untitled'); $item['title'] = urldecode((array_key_exists('title', $model) ? $model['title'] : 'Untitled'));
$item['uri'] = self::URI . 'photo.gne?id=' . $model['id']; $item['uri'] = self::URI . 'photo.gne?id=' . $model['id'];
$description = (array_key_exists('description', $model) ? $model['description'] : ''); $description = (array_key_exists('description', $model) ? $model['description'] : '');
@ -87,7 +137,7 @@ class FlickrBridge extends BridgeAbstract {
. '"><img src="' . '"><img src="'
. $this->extractContentImage($model) . $this->extractContentImage($model)
. '" style="max-width: 640px; max-height: 480px;"/></a><br><p>' . '" style="max-width: 640px; max-height: 480px;"/></a><br><p>'
. $description . urldecode($description)
. '</p>'; . '</p>';
$item['enclosures'] = $this->extractEnclosures($model); $item['enclosures'] = $this->extractEnclosures($model);
@ -98,6 +148,46 @@ class FlickrBridge extends BridgeAbstract {
} }
public function getURI() {
switch($this->queriedContext) {
case 'Explore':
return self::URI . 'explore';
break;
case 'By keyword':
return self::URI . 'search/?q=' . urlencode($this->getInput('q'))
. '&sort=' . $this->getInput('sort') . '&media=' . $this->getInput('media');
break;
case 'By username':
return self::URI . 'search/?user_id=' . urlencode($this->getInput('u'))
. '&sort=' . $this->getInput('sort') . '&media=' . $this->getInput('media');
break;
default:
return parent::getURI();
}
}
public function getName() {
switch($this->queriedContext) {
case 'Explore':
return 'Explore - ' . self::NAME;
break;
case 'By keyword':
return $this->getInput('q') . ' - keyword - ' . self::NAME;
break;
case 'By username':
return $this->username . ' - ' . self::NAME;
break;
default:
return parent::getName();
}
return parent::getName();
}
private function extractJsonModel($html) { private function extractJsonModel($html) {
// Find SCRIPT containing JSON data // Find SCRIPT containing JSON data