series tab add bonus video view

Author: dragonflylee

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [next]
+
+### Fixed
+
+* add home tab retry dialog when request failed
+
+### Add
+
+* bonus video view for series tab 
+
 ## [0.8.2]
 
 ### Fixed

app/include/tab/media_series.hpp

@@ -29,15 +29,18 @@ class MediaSeries : public brls::Box, public Presenter {
     BRLS_BIND(brls::Label, labelGenres, "series/label/genres");
     BRLS_BIND(brls::Header, labelNextup, "series/label/nextup");
     BRLS_BIND(brls::Header, labelSimilar, "series/label/similar");
+    BRLS_BIND(brls::Header, labelSpecial, "series/label/special");
     BRLS_BIND(HRecyclerFrame, people, "series/people");
     BRLS_BIND(HRecyclerFrame, similar, "series/similar");
+    BRLS_BIND(HRecyclerFrame, special, "series/special");
     BRLS_BIND(HRecyclerFrame, nextUp, "series/nextup");
     BRLS_BIND(AutoTabFrame, tabFrame, "series/tabFrame");
 
     void doSeries();
     void doSeason();
     void doSimilar();
     void doNextup();
+    void doSpecial();
 
     std::string seriesId;
 };

app/src/tab/media_series.cpp

@@ -142,12 +142,14 @@ MediaSeries::MediaSeries(const jellyfin::Item& item) : seriesId(item.Id) {
     this->people->registerCell("Cell", MediaCardCell::create);
     this->similar->registerCell("Cell", VideoCardCell::create);
     this->nextUp->registerCell("Cell", VideoCardCell::create);
+    this->special->registerCell("Cell", VideoCardCell::create);
     this->tabFrame->registerTabAction(this);
 
     this->doSeason();
     this->doSeries();
     this->doNextup();
     this->doSimilar();
+    this->doSpecial();
 
     // loading Logo
     auto logo = item.ImageTags.find(jellyfin::imageTypePrimary);
@@ -284,6 +286,7 @@ void MediaSeries::doSimilar() {
     std::string query = HTTP::encode_form({
         {"userId", AppConfig::instance().getUserId()},
         {"limit", "12"},
+        {"enableImageTypes", "Primary"},
         {"fields", "ItemCounts"},
     });
 
@@ -308,4 +311,28 @@ void MediaSeries::doSimilar() {
             brls::Application::notify(ex);
         },
         jellyfin::apiSimilar, this->seriesId, query);
+}
+
+void MediaSeries::doSpecial() {
+    ASYNC_RETAIN
+    jellyfin::getJSON<std::vector<jellyfin::Episode>>(
+        [ASYNC_TOKEN](const std::vector<jellyfin::Episode>& r) {
+            ASYNC_RELEASE
+            if (r.size() > 0) {
+                this->special->setDataSource(new VideoDataSource(r));
+                this->special->setVisibility(brls::Visibility::VISIBLE);
+                this->labelSpecial->setVisibility(brls::Visibility::VISIBLE);
+            } else {
+                this->special->setVisibility(brls::Visibility::GONE);
+                this->labelSpecial->setVisibility(brls::Visibility::GONE);
+                this->special->clearData();
+            }
+        },
+        [ASYNC_TOKEN](const std::string& ex) {
+            ASYNC_RELEASE
+            this->special->setVisibility(brls::Visibility::GONE);
+            this->labelSpecial->setSubtitle(ex);
+            brls::Application::notify(ex);
+        },
+        jellyfin::apiItemSpecial, AppConfig::instance().getUserId(), this->seriesId);
 }

app/src/view/video_source.cpp

@@ -52,17 +52,16 @@ RecyclingGridItem* VideoDataSource::cellForRow(RecyclingView* recycler, size_t i
 
         if (item.Type == jellyfin::mediaTypeGenre || item.Type == jellyfin::mediaTypeBook) {
             cell->labelExt->setVisibility(brls::Visibility::GONE);
+        } else if (item.Type == jellyfin::mediaTypeVideo || item.ProductionYear == 0) {
+            cell->labelExt->setText(misc::sec2Time(item.RunTimeTicks / jellyfin::PLAYTICKS));
         } else {
-            cell->labelExt->setText(item.ProductionYear > 0 ? std::to_string(item.ProductionYear) : "");
+            cell->labelExt->setText(std::to_string(item.ProductionYear));
         }
 
-        auto it = item.ImageTags.find(jellyfin::imageTypeThumb);
+        auto it = item.ImageTags.find(jellyfin::imageTypePrimary);
         if (it != item.ImageTags.end()) {
-            Image::load(cell->picture, jellyfin::apiThumbImage, item.Id,
-                HTTP::encode_form({{"tag", it->second}, {"maxWidth", "325"}}));
-        } else {
             Image::load(cell->picture, jellyfin::apiPrimaryImage, item.Id,
-                HTTP::encode_form({{"tag", item.ImageTags[jellyfin::imageTypePrimary]}, {"maxWidth", "240"}}));
+                HTTP::encode_form({{"tag", it->second}, {"maxWidth", "325"}}));
         }
     }
 

resources/i18n/cs/main.json

@@ -68,6 +68,7 @@
     "play": "Přehrát",
     "intro": "Přehled/Obsah",
     "people": "Lidé",
+    "special": "Bonusový materiál",
     "similar": "Podobné položky",
     "date_add": "Data přidání",
     "date_played": "Data přehrání",

resources/i18n/en-US/main.json

@@ -97,6 +97,7 @@
     "play": "Play",
     "intro": "Intro",
     "people": "People",
+    "special": "Special Features",
     "similar": "More Like This",
     "date_add": "Date Add",
     "date_played": "Date Played",

resources/i18n/es/main.json

@@ -97,6 +97,7 @@
     "play": "Reproducir",
     "intro": "Introducción",
     "people": "Reparto y equipo",
+    "special": "Características Especiales",
     "similar": "Más como esto",
     "date_add": "Fecha en que se añadió",
     "date_played": "Fecha de reproducción",

resources/i18n/fr/main.json

@@ -97,6 +97,7 @@
     "play": "Lire",
     "intro": "introduire",
     "people": "Personnes",
+    "special": "Bonus",
     "similar": "Plus de ce genre",
     "date_add": "Date d'ajout",
     "date_played": "Date de diffusion",

resources/i18n/ja/main.json

@@ -97,6 +97,7 @@
     "play": "再生",
     "intro": "イントロ",
     "people": "ピープル",
+    "special": "特殊機能",
     "similar": "これに似たもの",
     "date_add": "追加日",
     "date_played": "再生した日付",

resources/i18n/ko/main.json

@@ -97,6 +97,7 @@
     "play": "재생",
     "intro": "소개",
     "people": "인물",
+    "special": "부가 영상",
     "similar": "비슷한 작품",
     "date_add": "추가 날짜",
     "date_played": "재생 날짜",