Skip to content

Commit 5bbf58b

Browse files
LukePulverentiLukePulverenti
committed
3.0.5387 Beta
1 parent b978ffa commit 5bbf58b

File tree

4 files changed

+190
-161
lines changed

4 files changed

+190
-161
lines changed

‎MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs

+19-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
7979
{
8080
if (i is Movie)
8181
{
82-
return true;
82+
return !IsDuplicate(item, i);
8383
}
8484
}
8585
return false;
@@ -162,7 +162,7 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
162162
{
163163
return false;
164164
}
165-
return true;
165+
return !IsDuplicate(item, i.Item);
166166
})
167167
.OrderByDescending(i => i.Score)
168168
.ThenBy(i => Guid.NewGuid())
@@ -172,6 +172,23 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
172172
.Concat(customIntros.Take(1));
173173
}
174174

175+
private bool IsDuplicate(BaseItem playingContent, BaseItem test)
176+
{
177+
var id = playingContent.GetProviderId(MetadataProviders.Imdb);
178+
if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase))
179+
{
180+
return true;
181+
}
182+
183+
id = playingContent.GetProviderId(MetadataProviders.Tmdb);
184+
if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Tmdb), StringComparison.OrdinalIgnoreCase))
185+
{
186+
return true;
187+
}
188+
189+
return false;
190+
}
191+
175192
private CinemaModeConfiguration GetOptions()
176193
{
177194
return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode");

‎MediaBrowser.Server.Implementations/Session/SessionManager.cs

+4
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,10 @@ private async Task SaveCapabilities(string deviceId, SessionCapabilities capabil
14171417
{
14181418
_jsonSerializer.SerializeToFile(capabilities, path);
14191419
}
1420+
catch (Exception ex)
1421+
{
1422+
_logger.ErrorException("Error saving to {0}", ex, path);
1423+
}
14201424
finally
14211425
{
14221426
_capabilitiesLock.Release();

‎MediaBrowser.WebDashboard/dashboard-ui/mypreferenceslanguages.html

+47-45
Original file line numberDiff line numberDiff line change
@@ -14,64 +14,66 @@
1414

1515
<br />
1616
<form style="margin: 0 auto;" class="languagePreferencesForm">
17-
<div class="detailSectionHeader">
17+
<div class="detailSectionHeader" style="margin: 0 .5em;">
1818
${HeaderLanguagePreferences}
1919
</div>
2020

2121
<br />
22-
<div>
23-
<label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
24-
<select id="selectAudioLanguage" data-mini="true"></select>
25-
</div><br />
26-
<div>
27-
<input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
28-
<label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
29-
</div><br />
30-
<div>
31-
<label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
32-
<select id="selectSubtitleLanguage" data-mini="true"></select>
33-
</div><br />
34-
<div>
35-
<label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
36-
<select id="selectSubtitlePlaybackMode" data-mini="true">
37-
<option value="Default">${OptionDefaultSubtitles}</option>
38-
<option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
39-
<option value="Always">${OptionAlwaysPlaySubtitles}</option>
40-
<option value="None">${OptionNoSubtitles}</option>
41-
</select>
42-
<div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
43-
<div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
44-
<div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
45-
<div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
46-
</div>
47-
48-
<br /><br />
22+
<ul data-role="listview" class="ulForm">
23+
<li>
24+
<label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
25+
<select id="selectAudioLanguage" data-mini="true"></select>
26+
</li>
27+
<li>
28+
<input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
29+
<label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
30+
</li>
31+
<li>
32+
<label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
33+
<select id="selectSubtitleLanguage" data-mini="true"></select>
34+
</li>
35+
<li>
36+
<label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
37+
<select id="selectSubtitlePlaybackMode" data-mini="true">
38+
<option value="Default">${OptionDefaultSubtitles}</option>
39+
<option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
40+
<option value="Always">${OptionAlwaysPlaySubtitles}</option>
41+
<option value="None">${OptionNoSubtitles}</option>
42+
</select>
43+
<div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
44+
<div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
45+
<div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
46+
<div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
47+
</li>
48+
</ul>
4949
<div class="cinemaModeOptions" style="display:none;">
5050
<br />
51-
<div class="detailSectionHeader">
51+
<div class="detailSectionHeader" style="margin: 0 .5em;">
5252
${HeaderCinemaMode}
5353
</div>
54-
<br />
55-
<div>
56-
<input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
57-
<label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
54+
<ul data-role="listview" class="ulForm">
55+
<li>
56+
<input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
57+
<label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
5858

59-
<div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
60-
</div>
61-
<br /><br />
62-
</div>
63-
<div>
64-
<button type="submit" data-theme="a" data-icon="check" data-mini="true">
65-
${ButtonOk}
66-
</button>
67-
<button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
68-
${ButtonCancel}
69-
</button>
59+
<div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
60+
</li>
61+
</ul>
7062
</div>
63+
<ul data-role="listview" class="ulForm">
64+
<li>
65+
<button type="submit" data-theme="a" data-icon="check" data-mini="true">
66+
${ButtonOk}
67+
</button>
68+
<button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
69+
${ButtonCancel}
70+
</button>
71+
</li>
72+
</ul>
7173
</form>
7274
<script type="text/javascript">
7375
$('.languagePreferencesForm').off('submit', LanguagePreferencesPage.onSubmit).on('submit', LanguagePreferencesPage.onSubmit);
7476
</script>
7577
</div>
7678
</body>
77-
</html>
79+
</html>

0 commit comments

Comments
 (0)