diff --git a/README.md b/README.md
index 2a1cc2c2990797093efd42fe52c1593cd9ad2c40..a051131a21c63ed07eed8d1a87799913e1e06926 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ Copyright \(c\) 2012, 2013, 2014, 2015 Agence Française Informatique \(AFI\). A
You can redistribute it and/or modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by the Free Software Foundation \([see COPYING](COPYING)\)
-[Third-Party Components and their license] (doc/extern_libs.txt)
+[Third-Party Components and their license] (doc/extern_libs.org)
diff --git a/application/modules/admin/controllers/HarvestController.php b/application/modules/admin/controllers/HarvestController.php
index 65835255e6b84f3eb1cf279642b76aa0d8466c14..17d0b14a041700f6c220418db4e66155d40f371c 100644
--- a/application/modules/admin/controllers/HarvestController.php
+++ b/application/modules/admin/controllers/HarvestController.php
@@ -31,7 +31,8 @@ class Admin_HarvestController extends ZendAfi_Controller_Action {
'jamendo-browse',
'jamendo-ajax',
'orphea-browse',
- 'orphea-ajax']))
+ 'orphea-ajax',
+ 'soundcloud']))
return;
$services = $this->getServices();
@@ -177,6 +178,39 @@ class Admin_HarvestController extends ZendAfi_Controller_Action {
}
+ public function soundcloudAction() {
+ $soundcloud = new Class_WebService_BibNumerique_SoundCloud();
+ if (!$soundcloud->isEnabled()) {
+ $this->_redirect('/admin/index');
+ }
+
+
+ $import_form = $this->view
+ ->newForm(['id' => 'import', 'class' => 'form'])
+ ->setMethod('post')
+ ->addElement('url', 'url', ['label' => $this->view->_('URL de la piste SoundCloud'),
+ 'required' => true,
+ 'allowEmpty' => false])
+ ->addDisplayGroup(['url'], 'album', ['legend' => $this->view->_('Album')])
+ ->addElement('submit', 'submit', ['label' => $this->view->_('Importer')]);
+
+ if ($this->getRequest()->isPost() && $import_form->isValid($this->getRequest()->getPost())) {
+ if ($album = $soundcloud->importFromUrl($this->getRequest()->getPost('url'))) {
+ $this->_helper->notify($this->view->_('Album "%s" importé de SoundCloud',
+ $album->getTitre()));
+ $this->_redirect('/admin/album/edit_album/id/'.$album->getId());
+ return;
+ }
+
+ $import_form->getElement('url')
+ ->addDecorator('Errors')
+ ->addError('URL invalide');
+ }
+
+ $this->view->titre = $this->view->_('Import SoundCloud');
+ $this->view->import_form = $import_form;
+ }
+
protected function _withServiceDo($service) {
if (!$service->isEnabled()) {
diff --git a/application/modules/admin/views/scripts/harvest/sound-cloud.phtml b/application/modules/admin/views/scripts/harvest/sound-cloud.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..98e06ef6a8701cf5b4e65954c830c00146341fd2
--- /dev/null
+++ b/application/modules/admin/views/scripts/harvest/sound-cloud.phtml
@@ -0,0 +1 @@
+coucou !
diff --git a/application/modules/admin/views/scripts/harvest/soundcloud.phtml b/application/modules/admin/views/scripts/harvest/soundcloud.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..77ca2392b0966c76b99c59dfc6a7910c61254490
--- /dev/null
+++ b/application/modules/admin/views/scripts/harvest/soundcloud.phtml
@@ -0,0 +1 @@
+<?php echo $this->renderForm($this->import_form); ?>
diff --git a/application/modules/admin/views/scripts/index/index.phtml b/application/modules/admin/views/scripts/index/index.phtml
index 01122c45bb53cccb964175aee2e9c6fce2ec8ca6..351d936a34549eedf6e40846a18e018b1eb5d814 100644
--- a/application/modules/admin/views/scripts/index/index.phtml
+++ b/application/modules/admin/views/scripts/index/index.phtml
@@ -62,34 +62,19 @@ foreach ($modstats as $stat) {
}
?>
-<h2>Un problème ? Contactez le support AFI:</h2>
-<?php echo $this->ligneInfos('Par courriel (de préférence)', '<a href="mailto:hotline@afi-sa.fr">hotline@afi-sa.fr</a>') ?>
-<?php echo $this->ligneInfos('Par téléphone', '01.60.17.12.34 en semaine, 01.60.37.01.34 le samedi') ?>
-
<h2><?php echo $this->_('Participez à la communauté'); ?> !</h2>
-<div class='ligne_info'><a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh">Google group Bokeh</a></div>
- <div class='ligne_info'><a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org">Wiki Bokeh</a></div>
+<div class='ligne_info'>
+ <a onclick="window.open(this.href); return false" href="http://bokeh-library-portal.org">Site communautaire</a> -
+ <a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh">Google group Bokeh</a> -
+ <a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org">Wiki Bokeh</a> -
+ <a onclick="window.open(this.href); return false" href="http://git.afi-sa.fr/afi/opacce/tree/master">Code source</a>
+</div>
<h2><?php echo $this->_('Salle de discussion #Bokeh'); ?> :</h2>
<?php echo $this->ligneInfos($this->_('Discutez avec les contributeurs de Bokeh en direct'), '<a href="http://wiki.bokeh-library-portal.org/index.php/Salle_de_discussion_bokeh" target="_blank"><img src="'.BASE_URL.'/public/admin/images/ico/help.png"></img></a>') ?>
<br>
<iframe src="https://kiwiirc.com/client/irc.freenode.net/?nick=votrenom-?#bokeh" style="border:0; width:100%; height:450px;"></iframe>
- <h2><?php echo $this->_('Forum Bokeh'); ?> :</h2>
- <iframe id="forum_embed"
- src="javascript:void(0)"
- scrolling="no"
- frameborder="0"
- width="700"
- height="700">
- </iframe>
-
- <script type="text/javascript">
- document.getElementById("forum_embed").src =
- "https://groups.google.com/forum/embed/?place=forum/utilisateurs-bokeh" +
- "&showsearch=true&hl=fr&hideforumtitle=true&showpopout=true";
-</script>
-
<script>
(function() {
function supportsCanvas() {
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 7dfc4b2a1dcf2a5da311b5f38133983ee0eeeb92..9c5259ae77778ce6d169e8c9b7b2ceca220e909d 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -235,6 +235,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
'MUSICME_BIB_ID' => Class_AdminVar_Meta::newDefault('')->bePrivate(),
'JAMENDO_CLIENT_ID' => Class_AdminVar_Meta::newDefault($this->_('ID client Jamendo')),
+ 'SOUNDCLOUD_CLIENT_ID' => Class_AdminVar_Meta::newDefault($this->_('ID client SoundCloud')),
'VODECLIC_KEY' => Class_AdminVar_Meta::newDefault($this->_('Clé de sécurité Vodeclic'))->bePrivate(),
'VODECLIC_ID' => Class_AdminVar_Meta::newDefault($this->_('Identifiant partenaire Vodeclic'))->bePrivate(),
@@ -465,6 +466,14 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
}
+ /**
+ * @return bool
+ */
+ public function isSoundCloudEnabled() {
+ return ('' != trim(Class_AdminVar::get('SOUNDCLOUD_CLIENT_ID')));
+ }
+
+
/**
* @return bool
*/
diff --git a/library/Class/Album.php b/library/Class/Album.php
index 19a31da1e3780a93e7f0c2fec06a1e1c0c02b8ad..18c309dc4a40c910690d084a7b658a899a40d589 100644
--- a/library/Class/Album.php
+++ b/library/Class/Album.php
@@ -482,7 +482,9 @@ class Class_Album extends Storm_Model_Abstract {
public function isAudioRecord() {
return in_array($this->getTypeDocId(),
- [Class_TypeDoc::JAMENDO, Class_TypeDoc::AUDIO_RECORD]);
+ [Class_TypeDoc::JAMENDO,
+ Class_TypeDoc::AUDIO_RECORD,
+ Class_TypeDoc::SOUNDCLOUD]);
}
@@ -506,6 +508,11 @@ class Class_Album extends Storm_Model_Abstract {
}
+ public function isSoundCloud() {
+ return $this->getTypeDocId() == Class_TypeDoc::SOUNDCLOUD;
+ }
+
+
public function isNumeriquePremium() {
return $this->getTypeDocId() == Class_TypeDoc::NUMERIQUEPREMIUM;
}
diff --git a/library/Class/Album/Renderer.php b/library/Class/Album/Renderer.php
index c1487b9230089bb87461df07e94b2e5dc95bb25d..9f4fcc82db8c8a366564eec235ce8599d0459bc2 100644
--- a/library/Class/Album/Renderer.php
+++ b/library/Class/Album/Renderer.php
@@ -40,6 +40,7 @@ class Class_Album_Renderer {
'tagCoursToutApprendre' => function($album) { return $album->isCoursToutApprendre(); },
'monocleReaderServerSide' => function($album) { return $album->isEPUB(); },
'tagJamendoPlayer' => function($album) { return $album->isJamendo(); },
+ 'tagSoundCloudPlayer' => function($album) { return $album->isSoundCloud(); },
'tagAlbumTrackList' => function($album) { return $album->isAudioRecord(); },
'tagNumeriquePremiumBook' => function($album) { return $album->isNumeriquePremium(); },
'tagDilicomWidget' => function($album) { return $album->isDilicom(); },
diff --git a/library/Class/AlbumRessource.php b/library/Class/AlbumRessource.php
index e83aa8c6a9db8d9fa5411a8349ecc538e5f12a4e..453bbdb872a03fdc7536a03b2fbf1dfaaf6ae77b 100644
--- a/library/Class/AlbumRessource.php
+++ b/library/Class/AlbumRessource.php
@@ -805,6 +805,8 @@ class Class_AlbumRessource extends Storm_Model_Abstract {
return
$this->getAlbum()->isJamendo()
||
+ $this->getAlbum()->isSoundCloud()
+ ||
$this->isFileExtensionIn($this->getAudioExtensions());
}
diff --git a/library/Class/TypeDoc.php b/library/Class/TypeDoc.php
index 56eb95a3b6818707e1a49e07e43adb0d3cff4166..b4751f46ab846a979af7005e2f07e84951e64589 100644
--- a/library/Class/TypeDoc.php
+++ b/library/Class/TypeDoc.php
@@ -220,6 +220,7 @@ class Class_TypeDoc extends Storm_Model_Abstract {
const ONEDTOUCH = 114;
const JAMENDO = 115;
const WEBSITE = 116;
+ const SOUNDCLOUD = 117;
public static function getDefaultTypeDocs() {
@@ -247,7 +248,8 @@ class Class_TypeDoc extends Storm_Model_Abstract {
self::ONEDTOUCH => '1D touch',
self::ORPHEA => 'Orphea',
self::JAMENDO => 'Jamendo',
- self::WEBSITE => 'Site web'
+ self::WEBSITE => 'Site web',
+ self::SOUNDCLOUD => 'SoundCloud'
];
}
diff --git a/library/Class/WebService/BibNumerique/Jamendo/Album.php b/library/Class/WebService/BibNumerique/Jamendo/Album.php
index d77f585bcebc9f002cbe96147a30509b417d238c..a26aef9649d4b1ade60004c9f79ad56849a42812 100644
--- a/library/Class/WebService/BibNumerique/Jamendo/Album.php
+++ b/library/Class/WebService/BibNumerique/Jamendo/Album.php
@@ -34,7 +34,8 @@ class Class_WebService_BibNumerique_Jamendo_Album extends Class_WebService_BibNu
->setTitle($json->name)
->setYear(explode('-', $json->releasedate)[0])
->addAuthor($json->artist_name)
- ->addPoster($json->image);
+ ->addPoster($json->image)
+ ->setRights('Creative Commons');
$tracks = [];
diff --git a/library/Class/WebService/BibNumerique/RessourceNumerique.php b/library/Class/WebService/BibNumerique/RessourceNumerique.php
index efe87b1fe9d744e2f4aa9dfc31fff5b4937bed32..530a099023d4e5a832298e6f9417d5bbad9fd156 100644
--- a/library/Class/WebService/BibNumerique/RessourceNumerique.php
+++ b/library/Class/WebService/BibNumerique/RessourceNumerique.php
@@ -31,6 +31,7 @@ class Class_WebService_BibNumerique_RessourceNumerique {
$_id_language,
$_date_maj,
$_annee,
+ $_rights,
$_posters = [],
$_trailers = [],
$_photos = [],
@@ -114,6 +115,17 @@ class Class_WebService_BibNumerique_RessourceNumerique {
}
+ public function setRights($rights) {
+ $this->_rights = $rights;
+ return $this;
+ }
+
+
+ public function getRights() {
+ return $this->_rights;
+ }
+
+
public function getEditeur() {
return trim($this->_editeur);
}
@@ -206,13 +218,14 @@ class Class_WebService_BibNumerique_RessourceNumerique {
public function addMatiere($matiere_libelle) {
$this->_matieres[] = $matiere_libelle;
+ return $this;
}
public function importMatieres($album) {
$ids=[];
$indexation = new Class_Indexation();
- foreach ($this->_matieres as $matiere_libelle) {
+ foreach (array_filter($this->_matieres) as $matiere_libelle) {
if ( $matiere=Class_CodifMatiere::findFirstBy(['libelle' => $matiere_libelle])) {
$ids[]=$matiere->getId();
continue;
@@ -249,7 +262,8 @@ class Class_WebService_BibNumerique_RessourceNumerique {
->setUrlOrigine($this->getBaseUrl())
->setCategorie($categorie)
->setRessources($this->getRessources())
- ->setStatus(Class_Album::STATUS_VALIDATED);
+ ->setStatus(Class_Album::STATUS_VALIDATED)
+ ->setDroits($this->getRights());
array_map([$album, 'addAuthor'], $this->getAuthors());
diff --git a/library/Class/WebService/BibNumerique/SoundCloud.php b/library/Class/WebService/BibNumerique/SoundCloud.php
new file mode 100644
index 0000000000000000000000000000000000000000..34efc0b2d6e938f6f09b506abd305351a314f82a
--- /dev/null
+++ b/library/Class/WebService/BibNumerique/SoundCloud.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_WebService_BibNumerique_SoundCloud extends Class_WebService_BibNumerique_Abstract {
+
+ public function importFromUrl($url) {
+ if (!preg_match('/soundcloud.com\/[^\/]+\/(.*)/', $url, $matches))
+ return null;
+
+ $track_id = $matches[1];
+ $json = $this->_httpGetTrack($track_id, Class_AdminVar::get('SOUNDCLOUD_CLIENT_ID'));
+ return (new Class_WebService_BibNumerique_SoundCloud_Track($json))->import();
+ }
+
+
+ protected function _httpGetTrack($track_id, $client_id) {
+ $url = 'http://api.soundcloud.com/tracks/' . $track_id . '?client_id=' . $client_id;
+ return json_decode($this->httpGet($url));
+ }
+
+ protected function _deleteNonHarvested() {return $this;}
+ protected function loadPage($page_number = 1){return $this;}
+
+ public function isEnabled(){
+ return Class_AdminVar::isSoundCloudEnabled();
+ }
+
+
+ public function getName() {
+ return 'SoundCloud';
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/WebService/BibNumerique/SoundCloud/Track.php b/library/Class/WebService/BibNumerique/SoundCloud/Track.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ee2799b786846e6aeeba04ded99accfa9b80c47
--- /dev/null
+++ b/library/Class/WebService/BibNumerique/SoundCloud/Track.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_WebService_BibNumerique_SoundCloud_Track extends Class_WebService_BibNumerique_RessourceNumerique {
+ protected $_tags;
+
+ public function __construct($json) {
+ $this
+ ->setId($json->id)
+ ->setTitle($json->title)
+ ->setDescription($json->description)
+ ->setTags(array_filter(array_map('trim', explode('"', $json->tag_list))))
+ ->setYear($json->release_year)
+ ->addPoster($json->artwork_url)
+ ->addAuthor($json->user->username)
+ ->addMatiere($json->genre)
+ ->setRights($json->license)
+ ->setRessources([
+ (new Class_AlbumRessource())
+ ->setMediaType(Class_AlbumRessource::MEDIA_TYPE_URL)
+ ->setTitre($json->title)
+ ->setUrl($json->stream_url)
+ ->setDuration($json->duration)
+ ->setLicense(strtoupper($json->license))
+ ]);
+ }
+
+ public function setTags($tags) {
+ $this->_tags = $tags;
+ return $this;
+ }
+
+
+ public function fillAlbum($album) {
+ $album
+ ->setTags(implode(';', $this->_tags))
+ ->setTypeDocId(Class_TypeDoc::SOUNDCLOUD);
+ }
+
+
+ public function getRessourceCategorieLibelle(){
+ return 'SoundCloud';
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/HelpLink.php b/library/ZendAfi/View/Helper/Admin/HelpLink.php
index 4d4c12504ef68ce4e4d10b46617e23ab7b00e5f3..2408d133e5473095f9b87ada8dc35dd752229ca0 100644
--- a/library/ZendAfi/View/Helper/Admin/HelpLink.php
+++ b/library/ZendAfi/View/Helper/Admin/HelpLink.php
@@ -62,7 +62,8 @@ class ZendAfi_View_Helper_Admin_HelpLinkBokehWiki {
'custom-fields' => ['index' => 'Gestion_des_champs_personnalisés'],
'custom-fields-report' => ['index' => 'Rapports_statistiques'],
'formation' => ['index' => 'Gestion_des_formations' ],
- 'harvest' => ['jamendo-browse' => 'Jamendo'],
+ 'harvest' => ['jamendo-browse' => 'Jamendo',
+ 'soundcloud' => 'SoundCloud'],
'modo' => ['index' => 'Modération'],
'modules' => ['recherche_viewnotice' => 'Affichage_d%27une_notice',
'recherche_resultat' => 'Paramétrer_une_liste_de_résultat',
diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
index 020703ac23b41099c153201633b949160f7f639e..1377584cb040ac7d8755fea9f6881ac1844be92d 100644
--- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
+++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
@@ -128,6 +128,8 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
.$this->addMenu("jamendo", $this->translate()->_("Jamendo"), "/admin/harvest/jamendo-browse",
Class_AdminVar::isJamendoEnabled())
+ .$this->addMenu("soundcloud", $this->translate()->_("SoundCloud"), "/admin/harvest/soundcloud",
+ Class_AdminVar::isSoundCloudEnabled())
.$this->addMenu("websites", $this->translate()->_("Sitothèque"), "/admin/sito/create",
Class_AdminVar::isSitoInAlbums()
diff --git a/library/ZendAfi/View/Helper/IconeSupport.php b/library/ZendAfi/View/Helper/IconeSupport.php
index 87af7130cfa34c2c0367f38f18899f74414fcaa1..eedd8d2e68ba81caeedd7b05d00396396770b239 100644
--- a/library/ZendAfi/View/Helper/IconeSupport.php
+++ b/library/ZendAfi/View/Helper/IconeSupport.php
@@ -38,6 +38,7 @@ class ZendAfi_View_Helper_IconeSupport extends Zend_View_Helper_HtmlElement {
Class_TypeDoc::ARTEVOD => 'artevod.png',
Class_TypeDoc::VODECLIC => 'vodeclic.png',
Class_TypeDoc::JAMENDO => 'jamendo_s.png',
+ Class_TypeDoc::SOUNDCLOUD => 'soundcloud_s.png',
Class_TypeDoc::WEBSITE => 'support_10.gif',
);
diff --git a/library/ZendAfi/View/Helper/TagSoundCloudPlayer.php b/library/ZendAfi/View/Helper/TagSoundCloudPlayer.php
new file mode 100644
index 0000000000000000000000000000000000000000..bfe6e382b905833ecd1b58224d21bbe4718277ca
--- /dev/null
+++ b/library/ZendAfi/View/Helper/TagSoundCloudPlayer.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_View_Helper_TagSoundCloudPlayer extends ZendAfi_View_Helper_TagAlbumTrackList {
+ public function tagSoundCloudPlayer($album) {
+ return
+ $this->view->tag('iframe',
+ null,
+ ['height' => 166,
+ 'scrolling' => 'no',
+ 'frameborder' => 'no',
+ 'width' => '100%',
+ 'src' => sprintf('https://w.soundcloud.com/player/?url=%s&show_artwork=true',
+ urlencode('http://api.soundcloud.com/tracks/'.$album->getIdOrigine()))]);
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/public/admin/images/supports/soundcloud_s.png b/public/admin/images/supports/soundcloud_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..06cb12ec439f9dbc2b70169bd2dc3e7e9cd391e8
Binary files /dev/null and b/public/admin/images/supports/soundcloud_s.png differ
diff --git a/public/admin/skins/bokeh72/config.json b/public/admin/skins/bokeh72/config.json
index 4313880baa0e5894c29b2debd281f5498e8fe2e6..6521c78e575539998568f4a3b3c6fa65ad1d0af7 100644
--- a/public/admin/skins/bokeh72/config.json
+++ b/public/admin/skins/bokeh72/config.json
@@ -20,6 +20,7 @@
"toutapprendre": "../../images/picto/oai_16.png",
"oai": "../../images/picto/oai_16.png",
"jamendo": "../../images/picto/jamendo_16.png",
+ "soundcloud": "icons/menu/soundcloud_16.png",
"opds": "../../images/picto/epub_16.png",
"ead": "../../images/picto/ead_16.png",
"pnb": "../../images/picto/pnb_16.png",
diff --git a/public/admin/skins/bokeh72/icons/menu/soundcloud_16.png b/public/admin/skins/bokeh72/icons/menu/soundcloud_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..06cb12ec439f9dbc2b70169bd2dc3e7e9cd391e8
Binary files /dev/null and b/public/admin/skins/bokeh72/icons/menu/soundcloud_16.png differ
diff --git a/public/admin/skins/bokeh72/icons/menu/soundcloud_48.png b/public/admin/skins/bokeh72/icons/menu/soundcloud_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7af7dd7e44cff48f6ef751b251eea1f8f91b180
Binary files /dev/null and b/public/admin/skins/bokeh72/icons/menu/soundcloud_48.png differ
diff --git a/public/admin/skins/bokeh74/config.json b/public/admin/skins/bokeh74/config.json
index fc856e9b8fe1564eb17ece97cf0cf49eaf6e96a2..27bde42d93395c24329b3151560ef4ced50c124e 100644
--- a/public/admin/skins/bokeh74/config.json
+++ b/public/admin/skins/bokeh74/config.json
@@ -51,6 +51,7 @@
"numilog": "../../images/picto/oai_16.png",
"toutapprendre": "../../images/picto/oai_16.png",
"jamendo": "../../images/picto/jamendo_16.png",
+ "soundcloud": "icons/menu/soundcloud_24.png",
"pnb": "../../images/picto/pnb_16.png",
"php": "../../images/picto/php.png",
diff --git a/public/admin/skins/bokeh74/global.css b/public/admin/skins/bokeh74/global.css
index 01e408e3de0f8e6952bce5be89943d6802eccd23..16bd873887ae36baec039b6cd6df51ccfc7969f2 100755
--- a/public/admin/skins/bokeh74/global.css
+++ b/public/admin/skins/bokeh74/global.css
@@ -106,7 +106,7 @@ a {
font-size: 1em;
}
-.error {
+.error, .errors {
color: #F00;
font-weight: bold;
}
diff --git a/public/admin/skins/bokeh74/icons/menu/soundcloud_24.png b/public/admin/skins/bokeh74/icons/menu/soundcloud_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc470a9207ed9a46bd006cca2d40483832481bf
Binary files /dev/null and b/public/admin/skins/bokeh74/icons/menu/soundcloud_24.png differ
diff --git a/public/admin/skins/bokeh74/icons/menu/soundcloud_48.png b/public/admin/skins/bokeh74/icons/menu/soundcloud_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7af7dd7e44cff48f6ef751b251eea1f8f91b180
Binary files /dev/null and b/public/admin/skins/bokeh74/icons/menu/soundcloud_48.png differ
diff --git a/public/admin/skins/retro/config.json b/public/admin/skins/retro/config.json
index fc856e9b8fe1564eb17ece97cf0cf49eaf6e96a2..27bde42d93395c24329b3151560ef4ced50c124e 100644
--- a/public/admin/skins/retro/config.json
+++ b/public/admin/skins/retro/config.json
@@ -51,6 +51,7 @@
"numilog": "../../images/picto/oai_16.png",
"toutapprendre": "../../images/picto/oai_16.png",
"jamendo": "../../images/picto/jamendo_16.png",
+ "soundcloud": "icons/menu/soundcloud_24.png",
"pnb": "../../images/picto/pnb_16.png",
"php": "../../images/picto/php.png",
diff --git a/public/admin/skins/retro/icons/menu/soundcloud_24.png b/public/admin/skins/retro/icons/menu/soundcloud_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc470a9207ed9a46bd006cca2d40483832481bf
Binary files /dev/null and b/public/admin/skins/retro/icons/menu/soundcloud_24.png differ
diff --git a/public/admin/skins/retro/icons/menu/soundcloud_48.png b/public/admin/skins/retro/icons/menu/soundcloud_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7af7dd7e44cff48f6ef751b251eea1f8f91b180
Binary files /dev/null and b/public/admin/skins/retro/icons/menu/soundcloud_48.png differ
diff --git a/public/opac/js/digital_connectors.js b/public/opac/js/digital_connectors.js
index aef6185c84eddb02c98f6b00cfa75d20fcfe68b1..3fec0feb4e579e6144aec4e9240a80b972289b30 100644
--- a/public/opac/js/digital_connectors.js
+++ b/public/opac/js/digital_connectors.js
@@ -27,6 +27,16 @@
"name" : "",
"url" : "http://wiki.bokeh-library-portal.org/index.php/Jamendo"}
},
+ "SoundCloud": {
+ "label" : "SoundCloud",
+ "url" : "https://www.soundcloud.com",
+ "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/soundcloud_200.png",
+ "desc": "SoundCloud est une plateforme de distribution audio en ligne sur laquelle les utilisateurs peuvent collaborer, promouvoir et distribuer leurs projets musicaux.",
+ "features": ["HARVEST"],
+ "sales_contact": {"mail" : "",
+ "name" : "",
+ "url" : "http://wiki.bokeh-library-portal.org/index.php/SoundCloud"}
+ },
"MUSICME": {
"label" : "MusicMe",
"url" : "http://www.musicme.com/",
diff --git a/tests/application/modules/admin/controllers/IndexControllerTest.php b/tests/application/modules/admin/controllers/IndexControllerTest.php
index 6b2b6acbea3a24899adbd18b89f2e91d6bd31000..af3c5e5aee35b4e00d1d1e0851f1d69f513687cf 100644
--- a/tests/application/modules/admin/controllers/IndexControllerTest.php
+++ b/tests/application/modules/admin/controllers/IndexControllerTest.php
@@ -74,12 +74,6 @@
}
- /** @test */
- public function embedForumShouldBePresent() {
- $this->assertXPathContentContains('//script', 'embed/?place=forum/utilisateurs-bokeh');
- }
-
-
/** @test */
public function domaineNameShouldPresent() {
$this->assertXPathContentContains('//div/b', 'http://bokeh-library-portal.org');
diff --git a/tests/scenarios/Jamendo/JamendoTest.php b/tests/scenarios/Jamendo/JamendoTest.php
index ce1defecdc7e35a1186942cf31f9da8ff8c07e4d..072db59dc8a2fce66e115817aec46082a766a401 100644
--- a/tests/scenarios/Jamendo/JamendoTest.php
+++ b/tests/scenarios/Jamendo/JamendoTest.php
@@ -182,6 +182,12 @@ class JamendoAlbumEcosTest extends JamendoTestCase{
}
+ /** @test */
+ public function rightsShouldContainsCreativeCommons() {
+ $this->assertEquals('Creative Commons', $this->_album->getDroits());
+ }
+
+
/** @test */
public function posterShouldBeCovers1200DotJPG() {
$this->assertEquals('https://imgjam1.jamendo.com/albums/s146/146232/covers/1.200.jpg',
@@ -352,7 +358,6 @@ class HarvestControllerJamendoTest extends HarvestControllerJamendoTestCase {
public function setUp() {
parent::setUp();
$this->dispatch('/admin/harvest/jamendo-browse', true);
-
}
diff --git a/tests/scenarios/SoundCloud/SoundCloudTest.php b/tests/scenarios/SoundCloud/SoundCloudTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1eb7f2cf4f332af9cede1f83559c2cabf2311cd4
--- /dev/null
+++ b/tests/scenarios/SoundCloud/SoundCloudTest.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+class SoundCloudFixtures {
+ public static function prepare() {
+ Class_AdminVar::newInstanceWithId('SOUNDCLOUD_CLIENT_ID',
+ ['valeur' => '5f3790669220322f2c3033980ae074b7']);
+
+ $mock_http = Storm_Test_ObjectWrapper::mock();
+ $mock_http->whenCalled('open_url')
+ ->with('http://api.soundcloud.com/tracks/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd?client_id=5f3790669220322f2c3033980ae074b7')
+ ->answers(file_get_contents(__DIR__.'/giant_golem.json'))
+ ->whenCalled('open_url')
+ ->answers('');
+
+ Class_WebService_BibNumerique_SoundCloud::setDefaultHttpClient($mock_http);
+ }
+}
+
+
+class SoundCloudTest extends ModelTestCase {
+ protected
+ $_storm_default_to_volatile = true,
+ $_album;
+
+ public function setUp() {
+ parent::setUp();
+ SoundCloudFixtures::prepare();
+ $this->_soundcloud = new Class_WebService_BibNumerique_SoundCloud();
+ $this->_soundcloud->importFromUrl('https://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd');
+
+ $this->_album = Class_Album::find(1);
+ }
+
+
+ /** @test */
+ public function albumTitleShouldBeRosetta() {
+ $this->assertEquals('The Mihalis Experience - Rosetta - The Giant Golem (CC-BY-NC-ND)',
+ $this->_album->getTitre());
+ }
+
+
+ /** @test */
+ public function idOrigineShouldBe259796701() {
+ $this->assertEquals(259796701,
+ $this->_album->getIdOrigine());
+
+ }
+
+
+ /** @test */
+ public function tagListShouldBePsychedelicAndProgressiveRock() {
+ $this->assertEquals('Psychedelic Rock;Progressive Rock',
+ $this->_album->getTags());
+ }
+
+
+ /** @test */
+ public function descriptionShouldContainsGroupeDeRock() {
+ $this->assertContains('Groupe de rock', $this->_album->getDescription());
+ }
+
+
+ /** @test */
+ public function yearShouldBe2015() {
+ $this->assertEquals(2015, $this->_album->getAnnee());
+ }
+
+
+ /** @test */
+ public function posterUrlShouldBeArtwork000158835831() {
+ $this->assertEquals('https://i1.sndcdn.com/artworks-000158835831-tb6jbx-large.jpg',
+ $this->_album->getPoster());
+ }
+
+
+ /** @test */
+ public function authorShouldBeZickLibrenbib() {
+ $this->assertContains('ziklibrenbib', $this->_album->getAuthorsNames());
+ }
+
+
+ /** @test */
+ public function typeDocShouldBeSoundClound() {
+ $this->assertEquals(Class_TypeDoc::SOUNDCLOUD,
+ $this->_album->getTypeDoc()->getId());
+ }
+
+
+ /** @test */
+ public function matiereShouldContainsAlternativeRock() {
+ $matiere = Class_CodifMatiere::find($this->_album->getMatiere());
+ $this->assertEquals('Alternative Rock',
+ $matiere->getLibelle());
+ }
+
+
+ /** @test */
+ public function rightsShouldContainsCCByNCND() {
+ $this->assertEquals('cc-by-nc-nd', $this->_album->getDroits());
+ }
+
+
+ /** @test */
+ public function albumShouldBeAudioRecord() {
+ $this->assertTrue($this->_album->isAudioRecord());
+ }
+
+
+ /** @test */
+ public function categoryNameShouldBeSoundCloud() {
+ $this->assertEquals('SoundCloud',
+ $this->_album->getCategorie()->getLibelle());
+ }
+
+
+ /** @test */
+ public function firstTrackTitleShouldBeMihalisExperience() {
+ $this->assertEquals('The Mihalis Experience - Rosetta - The Giant Golem (CC-BY-NC-ND)',
+ $this->_album->getRessources()[0]->getTitre());
+ }
+
+
+ /** @test */
+ public function trackUrlShouldBeTrackStream() {
+ $this->assertEquals('https://api.soundcloud.com/tracks/259796701/stream',
+ $this->_album->getRessources()[0]->getUrl());
+ }
+
+
+ /** @test */
+ public function trackDurationShouldBe412877() {
+ $this->assertEquals(412877, $this->_album->getRessources()[0]->getDuration());
+ }
+
+
+ /** @test */
+ public function albumLicenceShouldBeCCBYND() {
+ $this->assertEquals('CC-BY-NC-ND',
+ $this->_album->getRessources()[0]->getLicense());
+ }
+
+
+ /** @test */
+ public function albumTracksShouldBeAudio() {
+ $this->assertCount(1, $this->_album->getAudioTracks());
+ }
+}
+
+
+
+class HarvestControllerSoundCloudTest extends Admin_AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
+ public function setUp() {
+ parent::setUp();
+ SoundCloudFixtures::prepare();
+ $this->dispatch('/admin/harvest/soundcloud', true);
+ }
+
+
+ /** @test */
+ public function pageShouldContainsImportForm() {
+ $this->assertXPath('//form[@id="import"]//input[@type="url"][@name="url"]',
+ $this->_response->getBody());
+ }
+
+
+ /** @test */
+ public function titleShouldBeImportSoundCloud() {
+ $this->assertXPathContentContains('//h1', 'Import SoundCloud');
+ }
+
+
+ /** @test */
+ public function menuGaucheShouldContainsLinkToSoundCloudAction() {
+ $this->assertXPathContentContains('//div[@class="menuGaucheAdmin"]//a[contains(@href, "harvest/soundcloud")]', 'SoundCloud');
+ }
+}
+
+
+
+class HarvestControllerSoundCloudNotRegisteredTest extends Admin_AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
+
+ /** @test */
+ public function soundCloudActionShouldRedirectToIndex() {
+ $this->dispatch('/admin/harvest/soundcloud', true);
+ $this->assertRedirectTo('/admin/index');
+ }
+
+ /** @test */
+ public function menuGaucheShouldNotContainsLinkToSoundCloudAction() {
+ $this->dispatch('/admin', true);
+ $this->assertNotXPath('//a[contains(@href, "harvest/soundcloud")]');
+ }
+}
+
+
+
+class HarvestControllerSoundCloudImportActionTest extends Admin_AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
+ public function setUp() {
+ parent::setUp();
+ SoundCloudFixtures::prepare();
+ }
+
+ /** @test */
+ public function importMihalisShouldCreateAlbum() {
+ $this->postDispatch('/admin/harvest/soundcloud',
+ ['url' => 'https://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd']);
+ $this->assertEquals('The Mihalis Experience - Rosetta - The Giant Golem (CC-BY-NC-ND)',
+ Class_Album::find(1)->getTitre());
+ }
+
+
+ /** @test */
+ public function importAlbumsShouldRedirectToPageAlbum() {
+ $this->postDispatch('/admin/harvest/soundcloud',
+ ['url' => 'https://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd']);
+ $this->assertRedirectTo('/admin/album/edit_album/id/1');
+
+ }
+
+
+ /** @test */
+ public function importAlbumsShouldNotifySuccessfullImport() {
+ $this->postDispatch('/admin/harvest/soundcloud',
+ ['url' => 'https://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd']);
+ $this->assertFlashMessengerContentContains('Album "The Mihalis Experience - Rosetta - The Giant Golem (CC-BY-NC-ND)" importé de SoundCloud');
+ }
+
+
+ /** @test */
+ public function importAlbumsWithNoURlShouldDisplayError() {
+ $this->postDispatch('/admin/harvest/soundcloud',
+ ['url' => '']);
+ $this->assertXPathContentContains('//ul[@class="errors"]//li', 'Une valeur est requise');
+ }
+
+
+ /** @test */
+ public function importAlbumsWithWrongURlShouldDisplayError() {
+ $this->postDispatch('/admin/harvest/soundcloud',
+ ['url' => 'http://google.fr']);
+ $this->assertXPathContentContains('//ul[@class="errors"]//li', 'URL invalide');
+ }
+}
+
+
+
+
+
+
+class SoundCloudRenderAlbumMihalisTest extends ViewHelperTestCase {
+ protected $_storm_default_to_volatile = true;
+
+ public function setUp() {
+ parent::setUp();
+
+ SoundCloudFixtures::prepare();
+
+ $this->_soundcloud = new Class_WebService_BibNumerique_SoundCloud();
+ $this->_soundcloud->importFromUrl('https://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd');
+
+ $helper = new ZendAfi_View_Helper_RenderAlbum();
+ $helper->setView(new ZendAfi_Controller_Action_Helper_View());
+ $this->_html = $helper->renderAlbum(Class_Album::find(1));
+ }
+
+
+ /** @test */
+ public function soundCloudAudionPlayerShouldBeLoaded() {
+ $this->assertXPath($this->_html,
+ '//iframe[@src="https://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F259796701&show_artwork=true"]',
+ $this->_html);
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/tests/scenarios/SoundCloud/giant_golem.json b/tests/scenarios/SoundCloud/giant_golem.json
new file mode 100644
index 0000000000000000000000000000000000000000..75a6a5a78bfcee4931666610d74cc4b96982107a
--- /dev/null
+++ b/tests/scenarios/SoundCloud/giant_golem.json
@@ -0,0 +1 @@
+{"kind":"track","id":259796701,"created_at":"2016/04/19 05:11:28 +0000","user_id":11105820,"duration":412877,"commentable":true,"state":"finished","original_content_size":6593914,"last_modified":"2016/04/19 05:11:42 +0000","sharing":"public","tag_list":"\"Psychedelic Rock\" \"Progressive Rock\"","permalink":"the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd","streamable":true,"embeddable_by":"all","downloadable":false,"purchase_url":null,"label_id":null,"purchase_title":null,"genre":"Alternative Rock","title":"The Mihalis Experience - Rosetta - The Giant Golem (CC-BY-NC-ND)","description":"Groupe de rock psychédélique originaire de Lorraine, The Mihalis Experience nous propose son premier EP. Grâce à un mélange de rock prog et de blues, tout en impro, le quartet chemine vers des horizons de rock atmosphérique, nous emmenant vers des ambiances venant directement des 70’s. Nourris aux riffs de Pink Floyd à Soft Machine en passant par King Crimson, The Mihalis Experience s’invente dans des boucles protéiformes, et prouve que la magie du psychédélique opère toujours, entre aspirations créatives et spiritualité vaudoue.\n\nSource : https://themihalisexperience.bandcamp.com/album/rosetta","label_name":null,"release":null,"track_type":null,"key_signature":null,"isrc":null,"video_url":null,"bpm":null,"release_year":2015,"release_month":9,"release_day":20,"original_format":"mp3","license":"cc-by-nc-nd","uri":"https://api.soundcloud.com/tracks/259796701","user":{"id":11105820,"kind":"user","permalink":"ziklibrenbib","username":"ziklibrenbib","last_modified":"2016/04/01 08:47:01 +0000","uri":"https://api.soundcloud.com/users/11105820","permalink_url":"http://soundcloud.com/ziklibrenbib","avatar_url":"https://i1.sndcdn.com/avatars-000061601375-la9cv3-large.jpg"},"permalink_url":"http://soundcloud.com/ziklibrenbib/the-mihalis-experience-rosetta-the-giant-golem-cc-by-nc-nd","artwork_url":"https://i1.sndcdn.com/artworks-000158835831-tb6jbx-large.jpg","waveform_url":"https://w1.sndcdn.com/VmFpUZwsRhCH_m.png","stream_url":"https://api.soundcloud.com/tracks/259796701/stream","playback_count":0,"download_count":0,"favoritings_count":1,"comment_count":0,"attachments_uri":"https://api.soundcloud.com/tracks/259796701/attachments"}
\ No newline at end of file