atria-soft/zeus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] better dislay and view saison in files

Browse Source
This commit is contained in:
Edouard DUPIN 2017-04-16 23:24:07 +02:00
parent 9f72146bf2
commit b6af117397
7 changed files with 383 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

401
tools/player-video/appl/widget/ListViewer.cpp
View File

@ -46,30 +46,37 @@ appl::widget::ListViewer::~ListViewer() {
} }
void appl::widget::ListViewer::searchElements(std::string _filter) { void appl::widget::ListViewer::searchElements(std::string _filter) {
if (_filter == "film") {
searchElementsInternal("'type' == 'film' AND 'production-methode' == 'picture'");
} else if (_filter == "annimation") {
searchElementsInternal("'type' == 'film' AND 'production-methode' == 'draw'");
} else if (_filter == "tv-show") {
searchElementsInternal("'type' == 'tv-show' AND 'production-methode' == 'picture'", "series-name");
} else if (_filter == "tv-annimation") {
searchElementsInternal("'type' == 'tv-show' AND 'production-methode' == 'draw'", "series-name");
} else if (_filter == "theater") {
searchElementsInternal("'type' == 'theater'");
} else if (_filter == "one-man") {
searchElementsInternal("'type' == 'one-man'");
} else if (_filter == "courses") {
searchElementsInternal("'type' == 'courses'");
} else {
searchElementsInternal("*");
}
}
void appl::widget::ListViewer::searchElementsInternal(const std::string& _filter, const std::string& _group) {
m_listElement.clear(); m_listElement.clear();
m_listElementGroup.clear();
m_listDisplay.clear(); m_listDisplay.clear();
resetScrollOrigin();
if (m_clientProp == nullptr) { if (m_clientProp == nullptr) {
APPL_ERROR("No client Availlable ..."); APPL_ERROR("No client Availlable ...");
return; return;
} }
if (_filter == "film") { m_currentFilter = _filter;
_filter = "'type' == 'film' AND 'production-methode' == 'picture'"; m_currentGroup = _group;
} else if (_filter == "annimation") { markToRedraw();
_filter = "'type' == 'film' AND 'production-methode' == 'draw'";
} else if (_filter == "tv-show") {
_filter = "'type' == 'tv-show' AND 'production-methode' == 'picture'";
} else if (_filter == "tv-annimation") {
_filter = "'type' == 'tv-show' AND 'production-methode' == 'draw'";
} else if (_filter == "theater") {
_filter = "'type' == 'theater'";
} else if (_filter == "one-man") {
_filter = "'type' == 'one-man'";
} else if (_filter == "courses") {
_filter = "'type' == 'courses'";
} else {
_filter = "*";
}
m_clientProp->connect(); m_clientProp->connect();
if (m_clientProp->connection.isAlive() == false) { if (m_clientProp->connection.isAlive() == false) {
APPL_ERROR("Conection is not alive anymore ..."); APPL_ERROR("Conection is not alive anymore ...");
@ -88,122 +95,146 @@ void appl::widget::ListViewer::searchElements(std::string _filter) {
APPL_ERROR(" ==> Service does not exist : 'video'"); APPL_ERROR(" ==> Service does not exist : 'video'");
return; return;
} }
zeus::Future<std::vector<uint32_t>> listElem = remoteServiceVideo.getSQL(_filter).wait(); if (m_currentGroup != "") {
if (listElem.hasError() == true) { zeus::Future<std::vector<std::string>> listElem = remoteServiceVideo.getMetadataValuesWhere(m_currentGroup, m_currentFilter).wait();
APPL_ERROR(" ==> Can not get element from video service <with fileter ! '" << _filter << "' : " << listElem.getErrorType() << " : " << listElem.getErrorHelp()); if (listElem.hasError() == true) {
return; APPL_ERROR(" ==> Can not get elements from video service <with fileter ! '" << m_currentFilter << "' : " << listElem.getErrorType() << " : " << listElem.getErrorHelp());
} return;
std::vector<uint32_t> returnValues = listElem.get();
APPL_INFO("Get some Values: " << returnValues << "");
for (auto &it : returnValues) {
auto elem = ememory::makeShared<ElementProperty>();
if (elem == nullptr) {
APPL_ERROR("Can not allocate element... " << it);
continue;
} }
elem->m_id = it; std::vector<std::string> returnValues = listElem.get();
elem->m_metadataUpdated = false; APPL_INFO("Get some Values: " << returnValues << "");
// TODO : Type the "andThen" to simplify user experience if (returnValues.size() == 1) {
// TODO : Add the reference on the typed future in the function andTrn ... ==> then we can add later the cancel // TODO : maybe something to do for series
}
// Get the media for (auto &it : returnValues) {
zeus::ProxyMedia media = remoteServiceVideo.get(it).waitFor(echrono::seconds(2000)).get(); auto elem = ememory::makeShared<ElementPropertyGroup>();
if (media.exist() == false) { if (elem == nullptr) {
APPL_ERROR("get media error"); APPL_ERROR("Can not allocate element... " << it);
continue; continue;
}
elem->m_id = 0;
elem->m_title = it;
//elem->m_thumb = remoteServiceVideo.mediaThumbGet(it, 128).wait().get();
m_listElementGroup.push_back(elem);
}
} else {
zeus::Future<std::vector<uint32_t>> listElem = remoteServiceVideo.getSQL(m_currentFilter).wait();
if (listElem.hasError() == true) {
APPL_ERROR(" ==> Can not get element from video service <with fileter ! '" << m_currentFilter << "' : " << listElem.getErrorType() << " : " << listElem.getErrorHelp());
return;
}
std::vector<uint32_t> returnValues = listElem.get();
APPL_INFO("Get some Values: " << returnValues << "");
for (auto &it : returnValues) {
auto elem = ememory::makeShared<ElementProperty>();
if (elem == nullptr) {
APPL_ERROR("Can not allocate element... " << it);
continue;
}
elem->m_id = it;
elem->m_metadataUpdated = false;
// TODO : Type the "andThen" to simplify user experience
// TODO : Add the reference on the typed future in the function andTrn ... ==> then we can add later the cancel
// Get the media
zeus::ProxyMedia media = remoteServiceVideo.get(it).waitFor(echrono::seconds(2000)).get();
if (media.exist() == false) {
APPL_ERROR("get media error");
continue;
}
appl::widget::ListViewerShared tmpWidget = ememory::staticPointerCast<appl::widget::ListViewer>(sharedFromThis());
media.getMetadata("title")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get title: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_title = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("series-name")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_ERROR(" [" << elem->m_id << "] get serie: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_serie = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("saison")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get saison: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_saison = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("episode")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get episode: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_episode = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("description")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get description: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_description = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("production-methode")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get production-methode: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_productMethode = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("type")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get type: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_type = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMineType()
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get mine-type: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_mineType = _fut.get();
if (etk::start_with(elem->m_mineType, "video") == true) {
// TODO : Optimise this ...
elem->m_thumb = egami::load("DATA:Video.svg", ivec2(128,128));
} else if (etk::start_with(elem->m_mineType, "audio") == true) {
// TODO : Optimise this ...
elem->m_thumb = egami::load("DATA:MusicNote.svg", ivec2(128,128));
}
}
tmpWidget->markToRedraw();
return true;
});
elem->m_metadataUpdated = true;
//elem->m_thumb = remoteServiceVideo.mediaThumbGet(it, 128).wait().get();
m_listElement.push_back(elem);
} }
appl::widget::ListViewerShared tmpWidget = ememory::staticPointerCast<appl::widget::ListViewer>(sharedFromThis());
media.getMetadata("title")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get title: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_title = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("series-name")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_ERROR(" [" << elem->m_id << "] get serie: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_serie = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("saison")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get saison: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_saison = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("episode")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get episode: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_episode = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("description")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get description: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_description = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("production-methode")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get production-methode: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_productMethode = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMetadata("type")
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get type: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_type = _fut.get();
}
tmpWidget->markToRedraw();
return true;
});
media.getMineType()
.andThen([=](zeus::Future<std::string> _fut) mutable {
APPL_INFO(" [" << elem->m_id << "] get mine-type: " << _fut.get());
{
std::unique_lock<std::mutex> lock(elem->m_mutex);
elem->m_mineType = _fut.get();
if (etk::start_with(elem->m_mineType, "video") == true) {
// TODO : Optimise this ...
elem->m_thumb = egami::load("DATA:Video.svg", ivec2(128,128));
} else if (etk::start_with(elem->m_mineType, "audio") == true) {
// TODO : Optimise this ...
elem->m_thumb = egami::load("DATA:MusicNote.svg", ivec2(128,128));
}
}
tmpWidget->markToRedraw();
return true;
});
elem->m_metadataUpdated = true;
//elem->m_thumb = remoteServiceVideo.mediaThumbGet(it, 128).wait().get();
m_listElement.push_back(elem);
} }
APPL_INFO("Request All is done"); APPL_INFO("Request All is done");
} }
@ -230,7 +261,8 @@ void appl::widget::ListViewer::onRegenerateDisplay() {
m_text.clear(); m_text.clear();
// to know the size of one line : // to know the size of one line :
vec3 minSize = m_text.calculateSize(char32_t('A')); vec3 minSize = m_text.calculateSize(char32_t('A'));
if (m_listElement.size() == 0) { if ( m_listElement.size() == 0
&& m_listElementGroup.size() == 0) {
int32_t paddingSize = 2; int32_t paddingSize = 2;
vec2 tmpMax = propertyMaxSize->getPixel(); vec2 tmpMax = propertyMaxSize->getPixel();
@ -244,7 +276,7 @@ void appl::widget::ListViewer::onRegenerateDisplay() {
ivec2 localSize = m_minSize; ivec2 localSize = m_minSize;
// no change for the text orogin : // no change for the text orogin:
vec3 tmpTextOrigin((m_size.x() - m_minSize.x()) / 2.0, vec3 tmpTextOrigin((m_size.x() - m_minSize.x()) / 2.0,
(m_size.y() - m_minSize.y()) / 2.0, (m_size.y() - m_minSize.y()) / 2.0,
0); 0);
@ -310,6 +342,11 @@ void appl::widget::ListViewer::onRegenerateDisplay() {
} else { } else {
elem->m_property.reset(); elem->m_property.reset();
} }
if (offset + iii < m_listElementGroup.size()) {
elem->m_propertyGroup = m_listElementGroup[offset + iii];
} else {
elem->m_propertyGroup.reset();
}
//switch(iii%6) { //switch(iii%6) {
switch((offset + iii)%6) { switch((offset + iii)%6) {
case 0: case 0:
@ -358,7 +395,7 @@ void appl::widget::ListViewer::onRegenerateDisplay() {
startPos -= vec2(0, elementSize.y()); startPos -= vec2(0, elementSize.y());
} }
m_maxSize.setX(m_size.x()); m_maxSize.setX(m_size.x());
m_maxSize.setY((float)m_listElement.size()*elementSize.y()); m_maxSize.setY(float(std::max(m_listElement.size(),m_listElementGroup.size()))*elementSize.y());
// call the herited class... // call the herited class...
ewol::widget::WidgetScrolled::onRegenerateDisplay(); ewol::widget::WidgetScrolled::onRegenerateDisplay();
} }
@ -377,7 +414,8 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) {
m_image.clear(); m_image.clear();
m_text.clear(); m_text.clear();
m_draw.clear(); m_draw.clear();
if (m_property == nullptr) { if ( m_property == nullptr
&& m_propertyGroup == nullptr) {
return; return;
} }
//APPL_INFO("Regenrate size : " << _startPos << " " << _size); //APPL_INFO("Regenrate size : " << _startPos << " " << _size);
@ -398,8 +436,6 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) {
m_pos = _startPos; m_pos = _startPos;
m_size = _size; m_size = _size;
std::unique_lock<std::mutex> lock(m_property->m_mutex);
// -------------------------------------------- // --------------------------------------------
// -- Display text... // -- Display text...
// -------------------------------------------- // --------------------------------------------
@ -413,42 +449,56 @@ void appl::ElementDisplayed::generateDisplay(vec2 _startPos, vec2 _size) {
//APPL_VERBOSE("[" << getId() << "] {" << errorString << "} display at pos : " << tmpTextOrigin); //APPL_VERBOSE("[" << getId() << "] {" << errorString << "} display at pos : " << tmpTextOrigin);
m_text.setTextAlignement(originText.x(), originText.x()+_size.x()-_size.y(), ewol::compositing::alignDisable); m_text.setTextAlignement(originText.x(), originText.x()+_size.x()-_size.y(), ewol::compositing::alignDisable);
// TODO: m_text.setClipping(originText, vec2(originText.x()+_size.x()-_size.y(), _size.y())); // TODO: m_text.setClipping(originText, vec2(originText.x()+_size.x()-_size.y(), _size.y()));
//m_text.setClipping(drawClippingPos, drawClippingSize); std::string textToDisplay;
std::string textToDisplay = "<b>" + m_property->m_title + "</b><br/>"; if (m_property != nullptr) {
bool newLine = false; std::unique_lock<std::mutex> lock(m_property->m_mutex);
if (m_property->m_serie != "") { //m_text.setClipping(drawClippingPos, drawClippingSize);
textToDisplay += "<i>Serie: <b>" + m_property->m_serie + "</b></i><br/>"; textToDisplay = "<b>" + m_property->m_title + "</b><br/>";
} bool newLine = false;
if (m_property->m_saison != "") { if (m_property->m_serie != "") {
textToDisplay += "<i>Saison: <b>" + m_property->m_saison + "</b></i> "; textToDisplay += "<i>Serie: <b>" + m_property->m_serie + "</b></i><br/>";
newLine = true;
}
if (m_property->m_episode != "") {
textToDisplay += "<i>Episode: <b>" + m_property->m_episode + "</b></i> ";
newLine = true;
}
if (m_property->m_type != "") {
textToDisplay += " <i>type: <b>" + m_property->m_type + "</b></i> ";
if (m_property->m_productMethode != "") {
textToDisplay += " / " + m_property->m_productMethode + " ";
} }
newLine = true; if (m_property->m_saison != "") {
textToDisplay += "<i>Saison: <b>" + m_property->m_saison + "</b></i> ";
newLine = true;
}
if (m_property->m_episode != "") {
textToDisplay += "<i>Episode: <b>" + m_property->m_episode + "</b></i> ";
newLine = true;
}
if (m_property->m_type != "") {
textToDisplay += " <i>type: <b>" + m_property->m_type + "</b></i> ";
if (m_property->m_productMethode != "") {
textToDisplay += " / " + m_property->m_productMethode + " ";
}
newLine = true;
}
if (newLine == true) {
textToDisplay += "<br/>";
}
textToDisplay += "<i>" + m_property->m_description + "</i>";
} else {
std::unique_lock<std::mutex> lock(m_propertyGroup->m_mutex);
//m_text.setClipping(drawClippingPos, drawClippingSize);
textToDisplay = "<b>" + m_propertyGroup->m_title + "</b><br/>";
} }
if (newLine == true) {
textToDisplay += "<br/>";
}
textToDisplay += "<i>" + m_property->m_description + "</i>";
m_text.printDecorated(textToDisplay); m_text.printDecorated(textToDisplay);
// -------------------------------------------- // --------------------------------------------
// -- Display Image... // -- Display Image...
// -------------------------------------------- // --------------------------------------------
if (etk::start_with(m_property->m_mineType, "video") == true) { if (m_property != nullptr) {
m_image.setSource("DATA:Video.svg", 128); std::unique_lock<std::mutex> lock(m_property->m_mutex);
} else if (etk::start_with(m_property->m_mineType, "audio") == true) { if (etk::start_with(m_property->m_mineType, "video") == true) {
m_image.setSource("DATA:MusicNote.svg", 128); m_image.setSource("DATA:Video.svg", 128);
} else if (etk::start_with(m_property->m_mineType, "audio") == true) {
m_image.setSource("DATA:MusicNote.svg", 128);
} else {
APPL_INFO("Set image: Unknow type '" << m_property->m_mineType << "'");
m_image.setSource("DATA:Home.svg", 128);
}
} else { } else {
APPL_INFO("Set image: Unknow type '" << m_property->m_mineType << "'"); std::unique_lock<std::mutex> lock(m_propertyGroup->m_mutex);
m_image.setSource("DATA:Home.svg", 128); m_image.setSource("DATA:Home.svg", 128);
} }
m_image.setPos(_startPos+vec2(10,10)); m_image.setPos(_startPos+vec2(10,10));
@ -482,8 +532,11 @@ bool appl::widget::ListViewer::onEventInput(const ewol::event::Input& _event) {
if (_event.getId() == 1) { if (_event.getId() == 1) {
if(_event.getStatus() == gale::key::status::pressSingle) { if(_event.getStatus() == gale::key::status::pressSingle) {
APPL_DEBUG("Select element : " << findId << " " << m_listDisplay[findId]->m_idCurentElement); APPL_DEBUG("Select element : " << findId << " " << m_listDisplay[findId]->m_idCurentElement);
ememory::SharedPtr<appl::ElementProperty> prop = m_listDisplay[findId]->m_property; if (m_listDisplay[findId]->m_property != nullptr) {
if (prop != nullptr) { ememory::SharedPtr<appl::ElementProperty> prop = m_listDisplay[findId]->m_property;
if (prop == nullptr) {
return true;
}
std::string fullTitle; std::string fullTitle;
if (prop->m_serie != "") { if (prop->m_serie != "") {
fullTitle += prop->m_serie + "-"; fullTitle += prop->m_serie + "-";
@ -497,6 +550,18 @@ bool appl::widget::ListViewer::onEventInput(const ewol::event::Input& _event) {
fullTitle += prop->m_title; fullTitle += prop->m_title;
APPL_DEBUG("info element : " << prop->m_id << " title: " << fullTitle); APPL_DEBUG("info element : " << prop->m_id << " title: " << fullTitle);
signalSelect.emit(prop->m_id); signalSelect.emit(prop->m_id);
} else if (m_listDisplay[findId]->m_propertyGroup != nullptr) {
ememory::SharedPtr<appl::ElementPropertyGroup> prop = m_listDisplay[findId]->m_propertyGroup;
if (prop == nullptr) {
return true;
}
std::string newGroup = "";
if (m_currentGroup == "series-name") {
newGroup = "saison";
} else if (m_currentGroup == "artist") {
newGroup = "album";
}
searchElementsInternal(m_currentFilter + " AND '" + m_currentGroup + "' == '" + prop->m_title + "'", newGroup);
} }
return true; return true;
} }

13
tools/player-video/appl/widget/ListViewer.hpp
View File

@ -20,7 +20,7 @@ namespace appl {
class ElementProperty { class ElementProperty {
public: public:
std::mutex m_mutex; std::mutex m_mutex;
uint32_t m_id; //!< Remote Id of the Media uint64_t m_id; //!< Remote Id of the Media
bool m_metadataUpdated; //!< Check value to know when metadata is getted (like thumb ...) bool m_metadataUpdated; //!< Check value to know when metadata is getted (like thumb ...)
egami::Image m_thumb; //!< simple image describing the element egami::Image m_thumb; //!< simple image describing the element
std::string m_title; //!< Title of the Element std::string m_title; //!< Title of the Element
@ -35,9 +35,16 @@ namespace appl {
// TODO: int32_t m_countPersonalView; //!< number of view this media // TODO: int32_t m_countPersonalView; //!< number of view this media
// TODO: int64_t m_globalPersonalView; //!< number of time this media has been viewed // TODO: int64_t m_globalPersonalView; //!< number of time this media has been viewed
}; };
class ElementPropertyGroup {
public:
std::mutex m_mutex;
uint64_t m_id; //!< Remote Id of the Media
std::string m_title; //!< Title of the Group
};
class ElementDisplayed { class ElementDisplayed {
public: public:
ememory::SharedPtr<appl::ElementProperty> m_property; ememory::SharedPtr<appl::ElementProperty> m_property;
ememory::SharedPtr<appl::ElementPropertyGroup> m_propertyGroup;
int32_t m_idCurentElement; int32_t m_idCurentElement;
etk::Color<float> m_bgColor; etk::Color<float> m_bgColor;
vec2 m_pos; vec2 m_pos;
@ -75,6 +82,9 @@ namespace appl {
ememory::SharedPtr<ClientProperty> m_clientProp; //!< Generic entrypoint on the Client ememory::SharedPtr<ClientProperty> m_clientProp; //!< Generic entrypoint on the Client
protected: protected:
std::vector<ememory::SharedPtr<ElementProperty>> m_listElement; //!< list of all element getted in the remote access std::vector<ememory::SharedPtr<ElementProperty>> m_listElement; //!< list of all element getted in the remote access
std::vector<ememory::SharedPtr<ElementPropertyGroup>> m_listElementGroup; //!< list of all element getted in the remote access
std::string m_currentFilter;
std::string m_currentGroup;
std::vector<ememory::SharedPtr<ElementDisplayed>> m_listDisplay; //!< list of element in the current local display std::vector<ememory::SharedPtr<ElementDisplayed>> m_listDisplay; //!< list of element in the current local display
protected: protected:
//! @brief constructor //! @brief constructor
@ -92,6 +102,7 @@ namespace appl {
m_clientProp = _prop; m_clientProp = _prop;
} }
void searchElements(std::string _filter=""); void searchElements(std::string _filter="");
void searchElementsInternal(const std::string& _filter, const std::string& _group="");
bool onEventInput(const ewol::event::Input& _event) override; bool onEventInput(const ewol::event::Input& _event) override;
}; };
} }

53
tools/player-video/appl/widget/VolumeBar.cpp
View File

@ -8,14 +8,15 @@
#include <ewol/widget/Manager.hpp> #include <ewol/widget/Manager.hpp>
const float dotRadius = 6.0f;
appl::widget::VolumeBar::VolumeBar() : appl::widget::VolumeBar::VolumeBar() :
signalChange(this, "change", ""), signalChange(this, "change", ""),
propertyValue(this, "value", propertyValue(this, "value",
0.0f, 0.0f,
"Value of the VolumeBar", "Value of the VolumeBar",
&appl::widget::VolumeBar::onChangePropertyValue), &appl::widget::VolumeBar::onChangePropertyValue),
propertyStep(this, "step",
1.0f,
"step value when change"),
propertyMinimum(this, "min", propertyMinimum(this, "min",
-10.0f, -10.0f,
"Minimum value", "Minimum value",
@ -45,7 +46,7 @@ appl::widget::VolumeBar::~VolumeBar() {
void appl::widget::VolumeBar::calculateMinMaxSize() { void appl::widget::VolumeBar::calculateMinMaxSize() {
vec2 minTmp = propertyMinSize->getPixel(); vec2 minTmp = propertyMinSize->getPixel();
m_minSize.setValue(std::max(minTmp.x(), 40.0f), m_minSize.setValue(std::max(minTmp.x(), 40.0f),
std::max(minTmp.y(), dotRadius*2.0f) ); std::max(minTmp.y(), std::max(minTmp.x(), 40.0f)) );
markToRedraw(); markToRedraw();
} }
@ -60,32 +61,62 @@ void appl::widget::VolumeBar::onRegenerateDisplay() {
// clean the object list ... // clean the object list ...
m_draw.clear(); m_draw.clear();
m_draw.setColor(m_textColorFg); m_draw.setColor(m_textColorFg);
// draw a line: // draw a line:
m_draw.setPos(vec3(dotRadius, 0.0f, 0.0f)); #if 0
m_draw.rectangleWidth(vec3(m_size.x(), m_size.y()-dotRadius*2.0f, 0.0f)); m_draw.setPos(vec2(0.0f, 0.0f));
m_draw.rectangleWidth(vec2(m_size.x(), m_size.y()));
#else
m_draw.setThickness(4.0f);
m_draw.setPos(vec2(0.0f, 0.0f));
m_draw.lineRel(vec2(m_size.x(), 0.0f));
m_draw.lineRel(vec2(0.0f, m_size.y()));
m_draw.lineRel(vec2(-m_size.x(), 0.0f));
m_draw.lineRel(vec2(0.0f, -m_size.y()));
#endif
// chaneg color whe soud became louder ... // chaneg color whe soud became louder ...
if (*propertyValue > 0.5f) { if (*propertyValue > 0.5f) {
m_draw.setColor(m_textColorLoaded); m_draw.setColor(m_textColorLoaded);
} else { } else {
m_draw.setColor(m_textColorDone); m_draw.setColor(m_textColorDone);
} }
m_draw.setPos(vec3(m_size.x()*0.1f, dotRadius, 0.0f)); m_draw.setPos(vec3(m_size.x()*0.1f, m_size.x()*0.1f, 0.0f));
float offset = (*propertyValue-*propertyMinimum)/(*propertyMaximum-*propertyMinimum); float offset = (*propertyValue-*propertyMinimum)/(*propertyMaximum-*propertyMinimum);
m_draw.rectangleWidth(vec3(m_size.x()*0.8f, offset*(m_size.y()-2.0f*dotRadius), 0.0f) ); m_draw.rectangleWidth(vec3(m_size.x()*0.8f, offset*(m_size.y()-m_size.x()*0.2f), 0.0f) );
} }
bool appl::widget::VolumeBar::onEventInput(const ewol::event::Input& _event) { bool appl::widget::VolumeBar::onEventInput(const ewol::event::Input& _event) {
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
//EWOL_DEBUG("Event on VolumeBar ..." << _event); //EWOL_DEBUG("Event on VolumeBar ..." << _event);
if (1 == _event.getId()) { if (_event.getId() == 1) {
if( gale::key::status::pressSingle == _event.getStatus() if( _event.getStatus() == gale::key::status::pressSingle
|| gale::key::status::move == _event.getStatus()) { || _event.getStatus() == gale::key::status::move) {
// get the new position : // get the new position :
EWOL_VERBOSE("Event on VolumeBar " << relativePos); EWOL_VERBOSE("Event on VolumeBar " << relativePos);
float oldValue = *propertyValue; float oldValue = *propertyValue;
updateValue((float)(relativePos.y() - dotRadius) / (m_size.y()-2*dotRadius) * (*propertyMaximum-*propertyMinimum)+*propertyMinimum); updateValue((float)(relativePos.y() - m_size.x()*0.1f) / (m_size.y()-m_size.x()*0.2f) * (*propertyMaximum-*propertyMinimum)+*propertyMinimum);
if (oldValue != *propertyValue) {
EWOL_VERBOSE(" new value : " << *propertyValue << " in [" << *propertyMinimum << ".." << *propertyMaximum << "]");
signalChange.emit(*propertyValue);
}
return true;
}
} else if (_event.getId() == 4) {
if(_event.getStatus() == gale::key::status::pressSingle) {
float oldValue = *propertyValue;
updateValue(*propertyValue + *propertyStep);
if (oldValue != *propertyValue) {
EWOL_VERBOSE(" new value : " << *propertyValue << " in [" << *propertyMinimum << ".." << *propertyMaximum << "]");
signalChange.emit(*propertyValue);
}
return true;
}
} else if (_event.getId() == 5) {
if(_event.getStatus() == gale::key::status::pressSingle) {
float oldValue = *propertyValue;
updateValue(*propertyValue - *propertyStep);
if (oldValue != *propertyValue) { if (oldValue != *propertyValue) {
EWOL_VERBOSE(" new value : " << *propertyValue << " in [" << *propertyMinimum << ".." << *propertyMaximum << "]"); EWOL_VERBOSE(" new value : " << *propertyValue << " in [" << *propertyMinimum << ".." << *propertyMaximum << "]");
signalChange.emit(*propertyValue); signalChange.emit(*propertyValue);

1
tools/player-video/appl/widget/VolumeBar.hpp
View File

@ -26,6 +26,7 @@ namespace appl {
public: public:
//eproperty::Value<std::string> propertyShape; //!< name of the shape used //eproperty::Value<std::string> propertyShape; //!< name of the shape used
eproperty::Value<float> propertyValue; //!< current value of the VolumeBar eproperty::Value<float> propertyValue; //!< current value of the VolumeBar
eproperty::Value<float> propertyStep; //!< Up and down step value
eproperty::Value<float> propertyMinimum; //!< minimum value of the VolumeBar eproperty::Value<float> propertyMinimum; //!< minimum value of the VolumeBar
eproperty::Value<float> propertyMaximum; //!< maximum value of the VolumeBar eproperty::Value<float> propertyMaximum; //!< maximum value of the VolumeBar
protected: protected:

4
tools/player-video/data/gui-player.xml
View File

@ -32,7 +32,7 @@
<sizer mode="hori" fill="true" expand="true,false"> <sizer mode="hori" fill="true" expand="true,false">
<sizer mode="vert" fill="true" expand="false,true"> <sizer mode="vert" fill="true" expand="false,true">
<image src="DATA:Light.svg" size="8,8mm" /> <image src="DATA:Light.svg" size="8,8mm" />
<appl_VolumeBar name="[{ID}]appl-player-light" expand="false,true" fill="true" step="1" value="100" min="0" max="100" mode="vert"/> <appl_VolumeBar name="[{ID}]appl-player-light" expand="false,true" fill="true" step="5" value="100" min="0" max="100" mode="vert"/>
<label name="[{ID}]appl-player-label-light">100%</label> <label name="[{ID}]appl-player-label-light">100%</label>
</sizer> </sizer>
<sizer mode="vert" fill="true" expand="true"> <sizer mode="vert" fill="true" expand="true">
@ -41,7 +41,7 @@
</sizer> </sizer>
<sizer mode="vert" fill="true" expand="false,true"> <sizer mode="vert" fill="true" expand="false,true">
<image src="DATA:Volume.svg" size="8,8mm" /> <image src="DATA:Volume.svg" size="8,8mm" />
<appl_VolumeBar name="[{ID}]appl-player-volume" expand="false,true" fill="true" step="0.1" value="0" min="-60" max="6" mode="vert"/> <appl_VolumeBar name="[{ID}]appl-player-volume" expand="false,true" fill="true" step="0.3" value="0" min="-40" max="6" mode="vert"/>
<label name="[{ID}]appl-player-label-volume">0dB</label> <label name="[{ID}]appl-player-label-volume">0dB</label>
</sizer> </sizer>
</sizer> </sizer>

1
tools/router/appl/Router.cpp
View File

@ -236,6 +236,7 @@ ememory::SharedPtr<appl::GateWayInterface> appl::Router::get(const std::string&
APPL_INFO("New Child log in = " << logFile); APPL_INFO("New Child log in = " << logFile);
} }
std::string delay = "--router-delay=" + etk::to_string(*propertyDelayToStop); std::string delay = "--router-delay=" + etk::to_string(*propertyDelayToStop);
APPL_INFO("execute: " << binary << " " << userConf << " --srv=all " << delay << " " << basePath << " " << logFile);
int ret = execlp( binary.c_str(), int ret = execlp( binary.c_str(),
binary.c_str(), // must repeate the binary name to have the name as first argument ... binary.c_str(), // must repeate the binary name to have the name as first argument ...
userConf.c_str(), userConf.c_str(),

142
tools/service-video/appl/main-service-video.cpp
View File

@ -212,12 +212,8 @@ namespace appl {
} }
} }
std::vector<uint32_t> getSQL(std::string _sqlLikeRequest) override { std::vector<std::vector<std::string>> interpreteSQLRequest(const std::string& _sqlLikeRequest) {
std::vector<uint32_t> out; std::vector<std::vector<std::string>> out;
if (_sqlLikeRequest == "") {
throw std::invalid_argument("empty request");
}
std::vector<std::vector<std::string>> listAndParsed;
if (_sqlLikeRequest != "*") { if (_sqlLikeRequest != "*") {
std::vector<std::string> listAnd = etk::split(_sqlLikeRequest, "AND"); std::vector<std::string> listAnd = etk::split(_sqlLikeRequest, "AND");
APPL_INFO("Find list AND : "); APPL_INFO("Find list AND : ");
@ -237,56 +233,75 @@ namespace appl {
throw std::invalid_argument("action invalid : '" + elements[1] + "' only availlable : [==,!=,<=,>=,<,>]"); throw std::invalid_argument("action invalid : '" + elements[1] + "' only availlable : [==,!=,<=,>=,<,>]");
} }
APPL_INFO(" - '" << elements[0] << "' action='" << elements[1] << "' with='" << elements[2] << "'"); APPL_INFO(" - '" << elements[0] << "' action='" << elements[1] << "' with='" << elements[2] << "'");
listAndParsed.push_back(elements); out.push_back(elements);
} }
} }
return out;
}
bool isValid(const std::vector<std::vector<std::string>>& _listElement,
const std::map<std::string, std::string>& _metadata) {
for (auto &itCheck : _listElement) {
// find matadataValue:
auto itM = _metadata.find(itCheck[0]);
if (itM == _metadata.end()) {
// not find key ==> no check to do ...
return false;
}
if (itCheck[1] == "==") {
if (itM->second != itCheck[2]) {
return false;
}
} else if (itCheck[1] == "!=") {
if (itM->second == itCheck[2]) {
return false;
}
} else if (itCheck[1] == "<=") {
if (itM->second < itCheck[2]) {
return false;
}
} else if (itCheck[1] == ">=") {
if (itM->second > itCheck[2]) {
return false;
}
} else if (itCheck[1] == "<") {
if (itM->second <= itCheck[2]) {
return false;
}
} else if (itCheck[1] == ">") {
if (itM->second >= itCheck[2]) {
return false;
}
}
}
return true;
}
std::string mapToString(const std::map<std::string, std::string>& _metadata) {
std::string out = "{";
for (auto &it : _metadata) {
out += it.first + ":" + it.second + ",";
}
out += "}";
return out;
}
std::vector<uint32_t> getSQL(std::string _sqlLikeRequest) override {
std::vector<uint32_t> out;
if (_sqlLikeRequest == "") {
throw std::invalid_argument("empty request");
}
APPL_INFO("check : " << _sqlLikeRequest);
std::vector<std::vector<std::string>> listAndParsed = interpreteSQLRequest(_sqlLikeRequest);
std::unique_lock<std::mutex> lock(g_mutex); std::unique_lock<std::mutex> lock(g_mutex);
for (auto &it : m_listFile) { for (auto &it : m_listFile) {
if (it == nullptr) { if (it == nullptr) {
continue; continue;
} }
bool isCorrectElement = true; APPL_INFO(" [" << it->getUniqueId() << " list=" << mapToString(it->getMetadataDirect()));
for (auto &itCheck : listAndParsed) { bool isCorrectElement = isValid(listAndParsed, it->getMetadataDirect());
// find matadataValue:
auto itM = it->getMetadataDirect().find(itCheck[0]);
if (itM == it->getMetadataDirect().end()) {
// not find key ==> no check to do ...
isCorrectElement = false;
break;
}
if (itCheck[1] == "==") {
if (itM->second != itCheck[2]) {
isCorrectElement = false;
break;
}
} else if (itCheck[1] == "!=") {
if (itM->second == itCheck[2]) {
isCorrectElement = false;
break;
}
} else if (itCheck[1] == "<=") {
if (itM->second < itCheck[2]) {
isCorrectElement = false;
break;
}
} else if (itCheck[1] == ">=") {
if (itM->second > itCheck[2]) {
isCorrectElement = false;
break;
}
} else if (itCheck[1] == "<") {
if (itM->second <= itCheck[2]) {
isCorrectElement = false;
break;
}
} else if (itCheck[1] == ">") {
if (itM->second >= itCheck[2]) {
isCorrectElement = false;
break;
}
}
}
if (isCorrectElement == true) { if (isCorrectElement == true) {
APPL_INFO(" select");
out.push_back(it->getUniqueId()); out.push_back(it->getUniqueId());
} }
} }
@ -294,9 +309,36 @@ namespace appl {
} }
std::vector<std::string> getMetadataValuesWhere(std::string _keyName, std::string _sqlLikeRequest) override { std::vector<std::string> getMetadataValuesWhere(std::string _keyName, std::string _sqlLikeRequest) override {
std::unique_lock<std::mutex> lock(g_mutex);
std::vector<std::string> out; std::vector<std::string> out;
// 'type' == 'film' AND 'production-methode' == 'picture' if (_sqlLikeRequest == "") {
throw std::invalid_argument("empty request");
}
std::vector<std::vector<std::string>> listAndParsed = interpreteSQLRequest(_sqlLikeRequest);
std::unique_lock<std::mutex> lock(g_mutex);
for (auto &it : m_listFile) {
if (it == nullptr) {
continue;
}
bool isCorrectElement = isValid(listAndParsed, it->getMetadataDirect());
if (isCorrectElement == false) {
continue;
}
auto it2 = it->getMetadataDirect().find(_keyName);
if (it2 == it->getMetadataDirect().end()) {
continue;
}
std::string value = it2->second;
isCorrectElement = false;
for (auto &it2: out) {
if (it2 == value) {
isCorrectElement = true;
break;
}
}
if (isCorrectElement == false) {
out.push_back(value);
}
}
return out; return out;
} }