lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2269 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-11-03 22:34:15 -04:00 committed by GitHub
commit 7213603ea0
14 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -67,6 +67,11 @@
<Compile Include="FileOrganization\NameUtils.cs" />
<Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
<Compile Include="FileOrganization\TvFolderOrganizer.cs" />
<Compile Include="HttpServer\IHttpListener.cs" />
<Compile Include="HttpServer\Security\AuthorizationContext.cs" />
<Compile Include="HttpServer\Security\AuthService.cs" />
<Compile Include="HttpServer\Security\SessionContext.cs" />
<Compile Include="HttpServer\StreamWriter.cs" />
<Compile Include="Images\BaseDynamicImageProvider.cs" />
<Compile Include="Intros\DefaultIntroProvider.cs" />
<Compile Include="IO\ThrottledStream.cs" />

2
MediaBrowser.Server.Implementations/HttpServer/IHttpListener.cs → Emby.Server.Implementations/HttpServer/IHttpListener.cs
View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using MediaBrowser.Model.Services;
namespace MediaBrowser.Server.Implementations.HttpServer
namespace Emby.Server.Implementations.HttpServer
{
public interface IHttpListener : IDisposable
{

2
MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs → Emby.Server.Implementations/HttpServer/Security/AuthService.cs
View File

@ -10,7 +10,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Server.Implementations.HttpServer.Security
namespace Emby.Server.Implementations.HttpServer.Security
{
public class AuthService : IAuthService
{

2
MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs → Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Model.Services;
namespace MediaBrowser.Server.Implementations.HttpServer.Security
namespace Emby.Server.Implementations.HttpServer.Security
{
public class AuthorizationContext : IAuthorizationContext
{

2
MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs → Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
View File

@ -6,7 +6,7 @@ using MediaBrowser.Controller.Session;
using System.Threading.Tasks;
using MediaBrowser.Model.Services;
namespace MediaBrowser.Server.Implementations.HttpServer.Security
namespace Emby.Server.Implementations.HttpServer.Security
{
public class SessionContext : ISessionContext
{

2
MediaBrowser.Server.Implementations/HttpServer/StreamWriter.cs → Emby.Server.Implementations/HttpServer/StreamWriter.cs
View File

@ -8,7 +8,7 @@ using System.Threading.Tasks;
using MediaBrowser.Common.IO;
using MediaBrowser.Model.Services;
namespace MediaBrowser.Server.Implementations.HttpServer
namespace Emby.Server.Implementations.HttpServer
{
/// <summary>
/// Class StreamWriter

11
MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
View File

@ -262,8 +262,6 @@ namespace MediaBrowser.Providers.Music
public static List<ReleaseResult> Parse(XmlReader reader)
{
var list = new List<ReleaseResult>();
reader.MoveToContent();
reader.Read();
@ -278,9 +276,8 @@ namespace MediaBrowser.Providers.Music
{
using (var subReader = reader.ReadSubtree())
{
list.AddRange(ParseReleaseList(subReader));
return ParseReleaseList(subReader);
}
break;
}
default:
{
@ -295,7 +292,7 @@ namespace MediaBrowser.Providers.Music
}
}
return list;
return new List<ReleaseResult>();
}
private static List<ReleaseResult> ParseReleaseList(XmlReader reader)
@ -384,9 +381,7 @@ namespace MediaBrowser.Providers.Music
case "release-group":
{
result.ReleaseGroupId = reader.GetAttribute("id");
using (var subtree = reader.ReadSubtree())
{
}
reader.Skip();
break;
}
default:

1
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -17,6 +17,7 @@ using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Security;
using MediaBrowser.Controller;

4
MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@ -9,14 +9,12 @@ using System.IO;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
using ServiceStack;
using ServiceStack.Web;
using IRequest = MediaBrowser.Model.Services.IRequest;
using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
using StreamWriter = Emby.Server.Implementations.HttpServer.StreamWriter;
namespace MediaBrowser.Server.Implementations.HttpServer
{

1
MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
View File

@ -1,6 +1,5 @@
using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
using ServiceStack.Web;
using System;
using System.Globalization;
using System.Net;

1
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View File

@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Common.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;

5
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -122,8 +122,6 @@
<Compile Include="Devices\CameraUploadsFolder.cs" />
<Compile Include="EntryPoints\ExternalPortForwarding.cs" />
<Compile Include="EntryPoints\UdpServerEntryPoint.cs" />
<Compile Include="HttpServer\IHttpListener.cs" />
<Compile Include="HttpServer\Security\AuthorizationContext.cs" />
<Compile Include="HttpServer\ContainerAdapter.cs" />
<Compile Include="HttpServer\GetSwaggerResource.cs" />
<Compile Include="HttpServer\HttpListenerHost.cs" />
@ -131,14 +129,11 @@
<Compile Include="HttpServer\LoggerUtils.cs" />
<Compile Include="HttpServer\RangeRequestWriter.cs" />
<Compile Include="HttpServer\ResponseFilter.cs" />
<Compile Include="HttpServer\Security\AuthService.cs" />
<Compile Include="HttpServer\ServerFactory.cs" />
<Compile Include="HttpServer\ServerLogFactory.cs" />
<Compile Include="HttpServer\ServerLogger.cs" />
<Compile Include="HttpServer\Security\SessionContext.cs" />
<Compile Include="HttpServer\SocketSharp\HttpUtility.cs" />
<Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
<Compile Include="HttpServer\StreamWriter.cs" />
<Compile Include="HttpServer\SwaggerService.cs" />
<Compile Include="HttpServer\SocketSharp\Extensions.cs" />
<Compile Include="HttpServer\SocketSharp\RequestMono.cs" />

2
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -55,7 +55,6 @@ using MediaBrowser.Server.Implementations.Connect;
using MediaBrowser.Server.Implementations.Devices;
using MediaBrowser.Server.Implementations.EntryPoints;
using MediaBrowser.Server.Implementations.HttpServer;
using MediaBrowser.Server.Implementations.HttpServer.Security;
using MediaBrowser.Server.Implementations.IO;
using MediaBrowser.Server.Implementations.LiveTv;
using MediaBrowser.Server.Implementations.Localization;
@ -106,6 +105,7 @@ using Emby.Server.Implementations.Collections;
using Emby.Server.Implementations.Devices;
using Emby.Server.Implementations.Dto;
using Emby.Server.Implementations.FileOrganization;
using Emby.Server.Implementations.HttpServer.Security;
using Emby.Server.Implementations.Library;
using Emby.Server.Implementations.LiveTv;
using Emby.Server.Implementations.MediaEncoder;

15
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
View File

@ -582,14 +582,15 @@ namespace MediaBrowser.XbmcMetadata.Parsers
if (!string.IsNullOrWhiteSpace(val))
{
var parts = val.Split('/')
.Select(i => i.Trim())
.Where(i => !string.IsNullOrWhiteSpace(i));
//var parts = val.Split('/')
// .Select(i => i.Trim())
// .Where(i => !string.IsNullOrWhiteSpace(i));
foreach (var p in parts)
{
item.AddStudio(p);
}
//foreach (var p in parts)
//{
// item.AddStudio(p);
//}
item.AddStudio(val);
}
break;
}