From 073a178aa2f06d342fa5b197410fdafb0ed286f9 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 Mar 2016 12:26:32 +0100 Subject: [PATCH] [UI/MOBILE] WIP on internal path support --- src/ui/LmsApplication.cpp | 10 ++++++---- src/ui/resource/ImageResource.cpp | 25 ++++++++++++++++--------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index babbf051..cc99db01 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -195,7 +195,6 @@ LmsApplication::handleAuthEvent(void) setConfirmCloseMessage("Closing LMS. Are you sure?"); // Handle internal paths -// setInternalPath("audio"); // Create a Vertical layout: top is the nav bar, bottom is the contents Wt::WVBoxLayout *layout = new Wt::WVBoxLayout(this->root()); @@ -216,7 +215,7 @@ LmsApplication::handleAuthEvent(void) LineEdit *searchEdit = new LineEdit(500); navigation->bindWidget("search", searchEdit); searchEdit->setEmptyText("Search..."); - AearchEdit->addStyleClass("navbar-form navbar-nav"); + searchEdit->addStyleClass("navbar-form navbar-nav"); searchEdit->setWidth(150); // TODO add a span with a search icon @@ -257,8 +256,11 @@ LmsApplication::handleAuthEvent(void) layout->addWidget(contentsStack, 1); layout->setContentsMargins(0, 0, 0, 0); - // Set initial path - wApp->setInternalPath("/audio/search/preview", true); + if (agentIsMobile()) + setInternalPath("/audio/search/preview", true); + else + setInternalPath("/audio"); + } } // namespace UserInterface diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index 1a332dc8..e192dd0d 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -179,19 +179,26 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons } } - std::vector covers; - switch (coverType) + if (!path.empty()) { - case Database::Track::CoverType::Embedded: - covers = CoverArt::Grabber::instance().getFromTrack(path); - break; + std::vector covers; - case Database::Track::CoverType::None: - covers = CoverArt::Grabber::instance().getFromDirectory(path.parent_path()); - break; + switch (coverType) + { + case Database::Track::CoverType::Embedded: + covers = CoverArt::Grabber::instance().getFromTrack(path); + break; + + case Database::Track::CoverType::None: + covers = CoverArt::Grabber::instance().getFromDirectory(path.parent_path()); + break; + } + + putCover(response, covers, size); + return; } - putCover(response, covers, size); + putImage(response, getDefaultCover(size)); return; } else if (releaseIdStr)