images

a-mair · Dec 2, 2023 · 87977a7 · 87977a7
1 parent 17c60e7
commit 87977a7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/pages/get_recordings.ecpp b/pages/get_recordings.ecpp
@@ -48,7 +48,7 @@ recordings_tree_re_created = <$ recordings_tree_re_created?"true":"false"$>;
       bool found = false;
       for (const RecordingsItemRecPtr &rPtr: *recordingsTree->allRecordings()) if (recording == rPtr->IdI() ) {
         recoring_item.clear();
-        rPtr->AppendAsJSArray(recoring_item, true);
+        rPtr->AppendAsJSArray(recoring_item);
         </%cpp>
 recs[<$cSv(cToSvInt(rPtr->IdI()))$>]=[<$$ recoring_item.c_str() $>]
         <%cpp>

diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
@@ -478,7 +478,7 @@ if (write_recs && recItemsC) {
   <%cpp>
   for (const RecordingsItemRecPtr &rPtr: *recItemsC) {
     recoring_item->clear();
-    rPtr->AppendAsJSArray(*recoring_item, true);
+    rPtr->AppendAsJSArray(*recoring_item);
   </%cpp>
 recs[<$cSv(cToSvInt(rPtr->IdI()))$>]=[<$$ recoring_item->c_str() $>]
 % }
@@ -533,7 +533,7 @@ if (currentSort != "duplicates" || currentFlat == "true") {
         <%cpp>
         for (const RecordingsItemRecPtr &rPtr: recItems) {
           recoring_item->clear();
-          rPtr->AppendAsJSArray(*recoring_item, true);
+          rPtr->AppendAsJSArray(*recoring_item);
           </%cpp>
 recs[<$cSv(cToSvInt(rPtr->IdI()))$>]=[<$$ recoring_item->c_str() $>]
 %       }

diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
@@ -194,7 +194,7 @@ bool display_pictures = !(LiveSetup().GetTvscraperImageDir().empty());
 <%cpp>
 if(recItemFound) {
   epg_item.clear();
-  recItem->AppendAsJSArray(epg_item, true);
+  recItem->AppendAsJSArray(epg_item);
 </%cpp>
   <script>
     document.write(existingRecordingString(<$col_span - 2$>, \"<? lastEventCurrentDay ? "bottomrow" ?>\", <$$epg_item.c_str()$>))

diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp
@@ -123,7 +123,7 @@ bool logged_in(false);
 <%cpp>
 if(recItemFound) {
   epg_itemS.clear();
-  recItem->AppendAsJSArray(epg_itemS, true);
+  recItem->AppendAsJSArray(epg_itemS);
 </%cpp>
   <script>  
     document.write(existingRecordingString(<$col_span - 2$>, \"<? bottom ? "bottomrow" ?>\", <$$epg_itemS.c_str()$>))

diff --git a/recman.cpp b/recman.cpp
@@ -599,13 +599,13 @@ bool searchNameDesc(RecordingsItemRecPtr &RecItem, const std::vector<RecordingsI
 	 *  Implementation of class RecordingsItemDirSeason:
 	 */
 	RecordingsItemDirSeason::RecordingsItemDirSeason(int level, const RecordingsItemRecPtr &rPtr):
-		RecordingsItemDir("", level)
+		RecordingsItemDir(std::to_string(rPtr->m_s_season_number), level)
 	{
     m_cmp_rec = RecordingsItemPtrCompare::ByEpisode;
-    m_imageLevels = cImageLevels(eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
+//    m_imageLevels = cImageLevels(eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
+    m_imageLevels = cImageLevels(eImageLevel::seasonMovie);
     m_rec_item = rPtr;
     m_s_season_number = m_rec_item->m_s_season_number;
-	  m_name = std::to_string(m_s_season_number);
 	}
 	RecordingsItemDirSeason::~RecordingsItemDirSeason() { }
 
@@ -644,7 +644,8 @@ bool searchNameDesc(RecordingsItemRecPtr &RecItem, const std::vector<RecordingsI
     m_timeImage = timeImage;
     m_timeDurationDeviation = timeDurationDeviation;
 
-    m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
+//  m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
+    m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::anySeasonCollection);
     getScraperData();
     timeItemRec->stop();
 	}
@@ -888,7 +889,7 @@ void AppendScraperData(cLargeString &target, cSv s_IMDB_ID, const cTvMedia &s_im
   target.append("\"");
 }
 
-  void RecordingsItemRec::AppendAsJSArray(cLargeString &target, bool displayFolder) {
+  void RecordingsItemRec::AppendAsJSArray(cLargeString &target) {
     target.append("\"");
 // [0] : ID
     target.append(cToSvXxHash128(IdHash()));
@@ -936,12 +937,9 @@ void AppendScraperData(cLargeString &target, cSv s_IMDB_ID, const cTvMedia &s_im
     target.append("\",");
     target.append(DurationDeviation());
 // [18] Path / folder
-    target.append(",");
-//          if(displayFolder) {
-      target.append("\"");
-      AppendHtmlEscapedAndCorrectNonUTF8(target, (const char *)Recording()->Folder() );
-      target.append("\"");
-//          }
+    target.append(",\"");
+    AppendHtmlEscapedAndCorrectNonUTF8(target, (const char *)Recording()->Folder() );
+    target.append("\"");
 // [19] duration
     target.append(",\"");
     if(Duration() >= 0)

diff --git a/recman.h b/recman.h
@@ -337,7 +337,7 @@ namespace vdrlive {
       bool matchesFilter(cSv filter);
 
       virtual int SD_HD();
-      virtual void AppendAsJSArray(cLargeString &target, bool displayFolder);
+      virtual void AppendAsJSArray(cLargeString &target);
       static void AppendAsJSArray(cLargeString &target, std::vector<RecordingsItemRecPtr>::const_iterator recIterFirst, std::vector<RecordingsItemRecPtr>::const_iterator recIterLast, bool &first, cSv filter, bool reverse);
 
       mutable cMeasureTime *m_timeIdentify = nullptr;
@@ -407,7 +407,7 @@ namespace vdrlive {
       const cTvMedia &scraperImage() const { return m_s_image; }
 
       virtual int SD_HD() { return 0; }
-      virtual void AppendAsJSArray(cLargeString &target, bool displayFolder) {}
+      virtual void AppendAsJSArray(cLargeString &target) {}
     private:
       const cEvent *m_event;
   };