Skip to content

Commit 5409af1

Browse files
update urls
1 parent 05ca3ee commit 5409af1

File tree

11 files changed

+51
-17
lines changed

11 files changed

+51
-17
lines changed

Emby.Server.Implementations/Browser/BrowserLauncher.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static void OpenDashboardPage(string page, IServerApplicationHost appHos
2626
/// <param name="appHost">The app host.</param>
2727
public static void OpenWizard(IServerApplicationHost appHost)
2828
{
29-
OpenDashboardPage("index.html?start=wizard", appHost);
29+
OpenDashboardPage("index.html#!/wizardstart.html", appHost);
3030
}
3131

3232
/// <summary>

Emby.Server.Implementations/HttpServer/HttpListenerHost.cs

+10
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,16 @@ await Write(httpRes,
628628
return;
629629
}
630630

631+
if (localPath.EndsWith("web/dashboard.html", StringComparison.OrdinalIgnoreCase) && httpReq.UrlReferrer == null)
632+
{
633+
RedirectToUrl(httpRes, "index.html#!/dashboard.html");
634+
}
635+
636+
if (localPath.EndsWith("web/home.html", StringComparison.OrdinalIgnoreCase) && httpReq.UrlReferrer == null)
637+
{
638+
RedirectToUrl(httpRes, "index.html");
639+
}
640+
631641
if (!string.IsNullOrEmpty(GlobalResponse))
632642
{
633643
// We don't want the address pings in ApplicationHost to fail

Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ private string GetCompressionType(IRequest request)
248248

249249
if (acceptEncoding != null)
250250
{
251-
if (_brotliCompressor != null && acceptEncoding.IndexOf("br", StringComparison.OrdinalIgnoreCase) != -1)
252-
return "br";
251+
//if (_brotliCompressor != null && acceptEncoding.IndexOf("br", StringComparison.OrdinalIgnoreCase) != -1)
252+
// return "br";
253253

254254
if (acceptEncoding.IndexOf("deflate", StringComparison.OrdinalIgnoreCase) != -1)
255255
return "deflate";

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ async void _timerProvider_TimerFired(object sender, GenericEventArgs<TimerInfo>
11741174
{
11751175
var timer = e.Argument;
11761176

1177-
_logger.Info("Recording timer fired.");
1177+
_logger.Info("Recording timer fired for {0}.", timer.Name);
11781178

11791179
try
11801180
{

MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs

+35-2
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,17 @@ private async Task<MetadataResult<Series>> FetchMovieData(string tmdbId, string
208208
result.Item = new Series();
209209
result.ResultLanguage = seriesInfo.ResultLanguage;
210210

211-
ProcessMainInfo(result.Item, seriesInfo, preferredCountryCode);
211+
var settings = await MovieDbProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
212+
213+
ProcessMainInfo(result, seriesInfo, preferredCountryCode, settings);
212214

213215
return result;
214216
}
215217

216-
private void ProcessMainInfo(Series series, RootObject seriesInfo, string preferredCountryCode)
218+
private void ProcessMainInfo(MetadataResult<Series> seriesResult, RootObject seriesInfo, string preferredCountryCode, TmdbSettingsResult settings)
217219
{
220+
var series = seriesResult.Item;
221+
218222
series.Name = seriesInfo.name;
219223
series.SetProviderId(MetadataProviders.Tmdb, seriesInfo.id.ToString(_usCulture));
220224

@@ -307,6 +311,35 @@ private void ProcessMainInfo(Series series, RootObject seriesInfo, string prefer
307311
}
308312
}
309313
}
314+
315+
seriesResult.ResetPeople();
316+
var tmdbImageUrl = settings.images.GetImageUrl("original");
317+
318+
if (seriesInfo.credits != null && seriesInfo.credits.cast != null)
319+
{
320+
foreach (var actor in seriesInfo.credits.cast.OrderBy(a => a.order))
321+
{
322+
var personInfo = new PersonInfo
323+
{
324+
Name = actor.name.Trim(),
325+
Role = actor.character,
326+
Type = PersonType.Actor,
327+
SortOrder = actor.order
328+
};
329+
330+
if (!string.IsNullOrWhiteSpace(actor.profile_path))
331+
{
332+
personInfo.ImageUrl = tmdbImageUrl + actor.profile_path;
333+
}
334+
335+
if (actor.id > 0)
336+
{
337+
personInfo.SetProviderId(MetadataProviders.Tmdb, actor.id.ToString(CultureInfo.InvariantCulture));
338+
}
339+
340+
seriesResult.AddPerson(personInfo);
341+
}
342+
}
310343
}
311344

312345
internal static string GetSeriesDataPath(IApplicationPaths appPaths, string tmdbId)

MediaBrowser.WebDashboard/Api/DashboardService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public async Task<object> Get(GetDashboardResource request)
316316
// But don't redirect if an html import is being requested.
317317
if (path.IndexOf("bower_components", StringComparison.OrdinalIgnoreCase) == -1)
318318
{
319-
Request.Response.Redirect("wizardstart.html");
319+
Request.Response.Redirect("index.html#!/wizardstart.html");
320320
return null;
321321
}
322322
}

MediaBrowser.WebDashboard/Api/PackageCreator.cs

-9
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,6 @@ private string GetMetaTags(string mode)
142142
sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem: ws: wss:;\">");
143143
}
144144

145-
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
146-
{
147-
sb.Append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no\">");
148-
}
149-
else
150-
{
151-
sb.Append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, minimum-scale=1\">");
152-
}
153-
154145
return sb.ToString();
155146
}
156147

SharedVersion.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("3.4.1.16")]
3+
[assembly: AssemblyVersion("3.4.1.17")]
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

ThirdParty/emby/Emby.Server.Sync.dll

1 KB
Binary file not shown.

0 commit comments

Comments
 (0)