Skip to content

Commit 26236bf

Browse files
authored
Merge pull request #2132 from Lasidar/jellyfin/feature/add-movie-tag-filtering
Add tag filtering to movies and hide movie filtering if not available
2 parents c4ab55c + f18cb79 commit 26236bf

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

components/ItemGrid/ItemGridOptions.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</RadiobuttonList>
1414
<RadiobuttonList id="sortMenu" itemSize="[600, 75]" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="1" numRows="8" drawFocusFeedback="false">
1515
</RadiobuttonList>
16-
<RadiobuttonList id="filterMenu" itemSize="[600, 75]" checkOnSelect="false" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="0" drawFocusFeedback="false">
16+
<RadiobuttonList id="filterMenu" itemSize="[600, 75]" checkOnSelect="false" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="0" numRows="8" drawFocusFeedback="false">
1717
</RadiobuttonList>
1818
</Group>
1919
</LayoutGroup>

components/ItemGrid/MovieLibraryView.bs

+7-3
Original file line numberDiff line numberDiff line change
@@ -375,17 +375,21 @@ sub FilterDataLoaded(msg)
375375

376376
' Add Movie filters from the API data
377377
if LCase(m.loadItemsTask.view) = "movies"
378-
if isValid(data.genres)
378+
if isValid(data.genres) and data.genres.Count() > 0
379379
options.filter.push({ "Title": tr("Genres"), "Name": "Genres", "Options": data.genres, "Delimiter": "|", "CheckedState": [] })
380380
end if
381381

382-
if isValid(data.OfficialRatings)
382+
if isValid(data.OfficialRatings) and data.OfficialRatings.Count() > 0
383383
options.filter.push({ "Title": tr("Parental Ratings"), "Name": "OfficialRatings", "Options": data.OfficialRatings, "Delimiter": "|", "CheckedState": [] })
384384
end if
385385

386-
if isValid(data.Years)
386+
if isValid(data.Years) and data.Years.Count() > 0
387387
options.filter.push({ "Title": tr("Years"), "Name": "Years", "Options": data.Years, "Delimiter": ",", "CheckedState": [] })
388388
end if
389+
390+
if isValid(data.Tags) and data.Tags.Count() > 0
391+
options.filter.push({ "Title": tr("Tags"), "Name": "Tags", "Options": data.Tags, "Delimiter": ",", "CheckedState": [] })
392+
end if
389393
end if
390394

391395
setSelectedOptions(options)

0 commit comments

Comments
 (0)