owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Refactored some code and integrated CSS changes made by G.Debros

Browse Source
This commit is contained in:
emeric
2015-11-21 22:11:16 +01:00
parent 3826377f01
commit fc88cce33e
20 changed files with 369 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/desktop/TrackView.cpp
+4 -11
View File
@@ -23,6 +23,7 @@
#include <Wt/WBreak>
#include "logger/Logger.hpp"
#include "utils/Utils.hpp"
#include "LmsApplication.hpp"
#include "TrackView.hpp"
@@ -41,18 +42,10 @@ class DurationItemDelegate : public Wt::WItemDelegate
{
boost::posix_time::time_duration duration = boost::any_cast<boost::posix_time::time_duration>(index.data(Wt::DisplayRole));
boost::posix_time::time_facet* facet = new boost::posix_time::time_facet();
// TODO bug when redrawn
std::string format = duration.total_seconds() < 3600 ? "%M:%S" : "%H:%M:%S";
if (duration.total_seconds() < 3600)
facet->time_duration_format("%M:%S");
else
facet->time_duration_format("%H:%M:%S");
std::ostringstream oss;
oss.imbue(std::locale(oss.getloc(), facet));
oss << duration;
return new Wt::WText(oss.str(), Wt::PlainText);
return new Wt::WText(durationToString(duration, format), Wt::PlainText);
}
};
src/ui/audio/mobile/ArtistSearch.cpp
+13 -1
View File
@@ -20,6 +20,7 @@
#include <Wt/WText>
#include <Wt/WTemplate>
#include <Wt/WPushButton>
#include <Wt/WImage>
#include "LmsApplication.hpp"
@@ -38,6 +39,11 @@ _resCount(0)
title->setTemplateText(Wt::WString::tr("mobile-search-title"));
title->bindWidget("text", new Wt::WText("Artists", Wt::PlainText));
Wt::WTemplate* artistWrapper = new Wt::WTemplate(this);
artistWrapper->setTemplateText(Wt::WString::tr("wa-artist-wrapper"));
_contents = new Wt::WContainerWidget();
artistWrapper->bindWidget("contents", _contents );
}
void
@@ -75,7 +81,13 @@ ArtistSearch::addResults(Database::SearchFilter filter, std::size_t nb)
for (Artist::pointer artist : artists)
{
Wt::WTemplate* res = new Wt::WTemplate(this);
res->setTemplateText(Wt::WString::tr("mobile-artist-res"));
res->setTemplateText(Wt::WString::tr("wa-artist-res"));
Wt::WImage *artistImg = new Wt::WImage();
artistImg->setStyleClass("center-block"); // TODO move in css?
artistImg->setStyleClass("release_res_shadow release_img-responsive"); // TODO move in css?
res->bindWidget("gif", artistImg);
Wt::WText *text = new Wt::WText(Wt::WString::fromUTF8(artist->getName()), Wt::PlainText);
res->bindWidget("name", text);
src/ui/audio/mobile/ArtistSearch.hpp
+1 -1
View File
@@ -20,7 +20,6 @@
#ifndef UI_MOBILE_ARTIST_SEARCH_HPP
#define UI_MOBILE_ARTIST_SEARCH_HPP
#include <boost/algorithm/string/split.hpp>
#include <Wt/WContainerWidget>
#include "database/Types.hpp"
@@ -48,6 +47,7 @@ class ArtistSearch : public Wt::WContainerWidget
void clear(void);
void addResults(Database::SearchFilter filter, size_t nb);
Wt::WContainerWidget* _contents;
std::size_t _resCount;
};
src/ui/audio/mobile/MobileAudio.cpp
+10 -21
View File
@@ -17,9 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
#include <Wt/WContainerWidget>
#include <Wt/WTemplate>
@@ -27,16 +24,17 @@
#include <Wt/WText>
#include <Wt/WTable>
#include "LmsApplication.hpp"
#include "logger/Logger.hpp"
#include "utils/Utils.hpp"
#include "MobileAudio.hpp"
#include "LmsApplication.hpp"
#include "ArtistSearch.hpp"
#include "ReleaseSearch.hpp"
#include "TrackSearch.hpp"
#include "MobileAudioMediaPlayer.hpp"
#include "logger/Logger.hpp"
#include "MobileAudio.hpp"
namespace UserInterface {
namespace Mobile {
@@ -87,26 +85,17 @@ Audio::Audio(Wt::WContainerWidget *parent)
AudioMediaPlayer* mediaPlayer = new AudioMediaPlayer(encoding);
footer->bindWidget("player", mediaPlayer);
edit->changed().connect(std::bind([=] () {
std::string text = edit->text().toUTF8();
edit->changed().connect(std::bind([=] ()
{
// When a new search is done, output some results from:
// Artist
// Release
// Song
std::vector<std::string> keywords;
boost::algorithm::split(keywords, text, boost::is_any_of(" "), boost::token_compress_on);
std::vector<std::string> keywords = splitStrings(edit->text().toUTF8(), " ");;
releaseSearch->search(SearchFilter::NameLikeMatch( {{
{ SearchFilter::Field::Artist, keywords },
{ SearchFilter::Field::Release, keywords }}}),
3);
artistSearch->search(SearchFilter::NameLikeMatch({{{SearchFilter::Field::Artist, keywords}}}),
3);
trackSearch->search(SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, keywords}}}),
3);
releaseSearch->search(SearchFilter::ByName(SearchFilter::Field::Release, keywords), 4);
artistSearch->search(SearchFilter::ByName(SearchFilter::Field::Artist, keywords), 4);
trackSearch->search(SearchFilter::ByName(SearchFilter::Field::Track, keywords), 4);
artistSearch->show();
releaseSearch->show();
src/ui/audio/mobile/ReleaseSearch.cpp
+25 -3
View File
@@ -40,6 +40,11 @@ _resCount(0)
title->setTemplateText(Wt::WString::tr("mobile-search-title"));
title->bindWidget("text", new Wt::WText("Releases", Wt::PlainText));
Wt::WTemplate* releaseWrapper = new Wt::WTemplate(this);
releaseWrapper->setTemplateText(Wt::WString::tr("wa-release-wrapper"));
_contents = new Wt::WContainerWidget();
releaseWrapper->bindWidget("contents", _contents );
}
void
@@ -58,9 +63,23 @@ ReleaseSearch::search(Database::SearchFilter filter, size_t max)
addResults(filter, max);
}
static Wt::WString
getArtistFromRelease(Release::pointer release)
{
auto artists = Artist::getByFilter(DboSession(),
SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2);
if (artists.size() > 1)
return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
else
return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
}
void
ReleaseSearch::addResults(Database::SearchFilter filter, size_t nb)
{
using namespace Database;
Wt::Dbo::Transaction transaction(DboSession());
std::vector<Release::pointer> releases = Release::getByFilter(DboSession(), filter, _resCount, nb + 1);
@@ -77,14 +96,17 @@ ReleaseSearch::addResults(Database::SearchFilter filter, size_t nb)
for (Release::pointer release : releases)
{
Wt::WTemplate* releaseWidget = new Wt::WTemplate(this);
releaseWidget->setTemplateText(Wt::WString::tr("mobile-release-res"));
releaseWidget->setTemplateText(Wt::WString::tr("wa-release-res"));
Wt::WImage *cover = new Wt::WImage();
cover->setStyleClass("center-block");
cover->setImageLink( Wt::WLink( LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 56)));
releaseWidget->bindWidget("cover", cover);
cover->setImageLink( Wt::WLink( LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 512)));
cover->setStyleClass("release_res_shadow release_img-responsive"); // TODO move?
releaseWidget->bindWidget("cover", cover);
releaseWidget->bindWidget("name", new Wt::WText(Wt::WString::fromUTF8(release->getName()), Wt::PlainText));
releaseWidget->bindString("release_name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText);
releaseWidget->bindString("artist", getArtistFromRelease(release));
releaseWidget->clicked().connect(std::bind([=] {
_sigReleaseSelected(release.id());
src/ui/audio/mobile/ReleaseSearch.hpp
+1
View File
@@ -48,6 +48,7 @@ class ReleaseSearch : public Wt::WContainerWidget
void clear(void);
void addResults(Database::SearchFilter filter, size_t nb);
Wt::WContainerWidget* _contents;
std::size_t _resCount;
};
src/ui/audio/mobile/TrackSearch.cpp
+100 -54
View File
@@ -23,6 +23,7 @@
#include <Wt/WTemplate>
#include "logger/Logger.hpp"
#include "utils/Utils.hpp"
#include "LmsApplication.hpp"
#include "TrackSearch.hpp"
@@ -33,101 +34,146 @@ namespace Mobile {
using namespace Database;
TrackSearch::TrackSearch(Wt::WContainerWidget *parent)
: Wt::WContainerWidget(parent),
_resCount(0)
: Wt::WContainerWidget(parent)
{
Wt::WTemplate* wrapper = new Wt::WTemplate(this);
wrapper->setTemplateText(Wt::WString::tr("wa-trackview-wrapper"));
Wt::WTemplate* title = new Wt::WTemplate(this);
wrapper->bindWidget("title", title);
title->setTemplateText(Wt::WString::tr("mobile-search-title"));
title->bindString("text", "Releases", Wt::PlainText);
title->bindWidget("text", new Wt::WText("Tracks", Wt::PlainText));
_releaseContainer = new Wt::WContainerWidget();
wrapper->bindWidget("release-container", _releaseContainer);
_showMore = new Wt::WTemplate();
wrapper->bindWidget("show-more", _showMore);
_showMore->setTemplateText(Wt::WString::tr("mobile-search-more"));
_showMore->bindString("text", "Tap to show more results...");
_showMore->hide();
}
void
TrackSearch::clear()
{
while (count() > 1)
removeWidget(this->widget(1));
// Flush the release container
_releaseContainer->clear();
_resCount = 0;
// Flush the current context
_currentTrackContainer = nullptr;
_nbTracks = 0;
_showMore->hide();
}
void
TrackSearch::search(Database::SearchFilter filter, size_t max)
TrackSearch::search(SearchFilter filter, size_t nb)
{
_filter = filter;
clear();
addResults(filter, max);
addResults(nb);
}
void
TrackSearch::addResults(Database::SearchFilter filter, size_t nb)
static
std::vector<Track::pointer >
getTracks(SearchFilter filter, size_t offset, size_t nb, bool &moreResults)
{
Wt::Dbo::Transaction transaction(DboSession());
std::vector<Track::pointer > tracks = Track::getByFilter(DboSession(), filter, offset, nb + 1);
std::vector<Track::pointer > tracks = Track::getByFilter(DboSession(), filter, _resCount, nb + 1);
bool expectMoreResults;
if (tracks.size() == nb + 1)
{
expectMoreResults = true;
moreResults = true;
tracks.pop_back();
}
else
expectMoreResults = false;
moreResults = false;
return tracks;
}
static Wt::WString
getArtistNameFromRelease(Release::pointer release)
{
auto artists = Artist::getByFilter(DboSession(),
SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2);
if (artists.size() > 1)
return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
else
return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
}
void
TrackSearch::addResults(size_t nb)
{
Wt::Dbo::Transaction transaction(DboSession());
bool moreResults;
std::vector<Track::pointer > tracks = getTracks(_filter, _nbTracks, nb, moreResults);
for (Track::pointer track : tracks)
{
Wt::WTemplate* trackWidget = new Wt::WTemplate(this);
trackWidget->setTemplateText(Wt::WString::tr("mobile-track-res"));
// First check if we need to create a new track container
Wt::WImage *cover = new Wt::WImage();
cover->setStyleClass("center-block");
cover->setImageLink( Wt::WLink (LmsApplication::instance()->getCoverResource()->getTrackUrl(track.id(), 56)) );
trackWidget->bindWidget("cover", cover);
// Track Name (bold)
// Artist - Album (italic)
Wt::WContainerWidget *container = new Wt::WContainerWidget();
Wt::WText *title = new Wt::WText(Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
title->setStyleClass("mobile-track");
container->addWidget(title);
if (!track->getArtist()->getName().empty()
|| !track->getRelease()->getName().empty())
// New container if it is the first one or if the released has changed
if (!_currentTrackContainer
|| _currentReleaseId != track->getRelease().id())
{
title->setInline(false);
Wt::WText *artistRelease = new Wt::WText(Wt::WString::fromUTF8(track->getArtist()->getName() + " - " + track->getRelease()->getName()), Wt::PlainText);
artistRelease->setStyleClass("mobile-artist");
container->addWidget(artistRelease);
}
trackWidget->bindWidget("name", container);
Release::pointer release = track->getRelease();
Wt::WPushButton *playBtn = new Wt::WPushButton("Play");
playBtn->setStyleClass("btn-primary center-block");
Wt::WTemplate *releaseContainer = new Wt::WTemplate(_releaseContainer);
releaseContainer->setTemplateText(Wt::WString::tr("wa-trackview-release-container"));
_currentReleaseId = release.id();
Wt::WImage *cover = new Wt::WImage();
cover->setStyleClass ("center-block img-responsive"); // TODO move to CSS?
cover->setImageLink(Wt::WLink (LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 512)));
releaseContainer->bindWidget("cover", cover);
releaseContainer->bindString("artist-name", getArtistNameFromRelease(release));
releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
releaseContainer->bindInt("year", 2001);
_currentTrackContainer = new Wt::WContainerWidget();
releaseContainer->bindWidget("track-container", _currentTrackContainer);
}
assert(_currentTrackContainer != nullptr);
Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer);
trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track"));
// TODO, do not display track pos for tracks that are not part of a release
trackRes->bindInt("track-pos", track->getTrackNumber());
trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
// TODO, display artist name for compilation releases?
// TODO handle large duration (> 1 hour)
trackRes->bindString("time", durationToString(track->getDuration(), "%M:%S"), Wt::PlainText);
Wt::WText *playBtn = new Wt::WText("Play", Wt::PlainText);
playBtn->setStyleClass("center-block"); // TODO move to CSS?
playBtn->clicked().connect(std::bind([=] {
_sigTrackPlay.emit(track.id());
}));
trackWidget->bindWidget("btn", playBtn);
trackRes->bindWidget("btn", playBtn);
_nbTracks++;
}
_resCount += tracks.size();
if (expectMoreResults)
if (moreResults)
{
Wt::WTemplate* moreRes = new Wt::WTemplate(this);
moreRes->setTemplateText(Wt::WString::tr("mobile-search-more"));
moreRes->bindWidget("text", new Wt::WText("Tap to show more results..."));
moreRes->clicked().connect(std::bind([=] {
_showMore->clicked().connect(std::bind([=] {
_sigMoreTracksSelected();
removeWidget(moreRes);
addResults(filter, 20);
addResults(20);
}));
_showMore->show();
}
else
_showMore->hide();
}
} // namespace Mobile
src/ui/audio/mobile/TrackSearch.hpp
+12 -2
View File
@@ -48,9 +48,19 @@ class TrackSearch : public Wt::WContainerWidget
Wt::Signal<void> _sigMoreTracksSelected;
void clear(void);
void addResults(Database::SearchFilter filter, size_t nb);
void addResults(size_t nb);
std::size_t _resCount;
Wt::WTemplate* _showMore;
Database::SearchFilter _filter;
std::size_t _nbTracks;
// Main container that holds the releases
Wt::WContainerWidget* _releaseContainer;
// Used to add more results on the fly
Database::Release::id_type _currentReleaseId;
Wt::WContainerWidget* _currentTrackContainer;
};
} // namespace Mobile
src/ui/resource/CoverResource.hpp
+1
View File
@@ -41,6 +41,7 @@ class CoverResource : public Wt::WResource
std::string getReleaseUrl(Database::Release::id_type releaseId, size_t size) const;
std::string getTrackUrl(Database::Track::id_type trackId, size_t size) const;
std::string getArtistUrl(Database::Artist::id_type artistId, size_t size) const;
std::string getUnknownTrackUrl(size_t size) const;
void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response);