Remove hardcoded path and fix url bug in Windows

pull/1010/head
Claus Vium 5 years ago
parent 852460b991
commit c3fa299acc

@ -109,6 +109,7 @@ using MediaBrowser.XbmcMetadata.Providers;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -621,8 +622,8 @@ namespace Emby.Server.Implementations
Host = new WebHostBuilder() Host = new WebHostBuilder()
.UseKestrel() .UseKestrel()
.UseContentRoot("/Users/clausvium/RiderProjects/jellyfin/Jellyfin.Server/bin/Debug/netcoreapp2.1/jellyfin-web/src") .UseContentRoot(Path.Combine(Directory.GetCurrentDirectory(), @"jellyfin-web\src"))
.UseStartup<Startup>() //.UseStartup<Startup>()
// .ConfigureServices(async services => // .ConfigureServices(async services =>
// { // {
// services.AddSingleton<IStartup>(startUp); // services.AddSingleton<IStartup>(startUp);
@ -726,7 +727,7 @@ namespace Emby.Server.Implementations
} }
var req = new WebSocketSharpRequest(request, response, request.Path, Logger); var req = new WebSocketSharpRequest(request, response, request.Path, Logger);
await ((HttpListenerHost)HttpServer).RequestHandler(req,request.Path.ToString(), request.Host.ToString(), data.Values["localpath"].ToString(), CancellationToken.None).ConfigureAwait(false); await ((HttpListenerHost)HttpServer).RequestHandler(req, request.GetDisplayUrl(), request.Host.ToString(), data.Values["localpath"].ToString(), CancellationToken.None).ConfigureAwait(false);
} }
protected virtual IHttpClient CreateHttpClient() protected virtual IHttpClient CreateHttpClient()

Loading…
Cancel
Save