open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved some entities to the main project

Browse Source
pull/702/head
LukePulverenti Luke Pulverenti luke pulverenti 12 years ago
parent b1df61f7ce
commit 2467ca9668
73 changed files with 212 additions and 190 deletions
Show Stats Download Patch File Download Diff File

5
MediaBrowser.Api/ApiService.cs
Unescape View File

@ -1,8 +1,9 @@
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.Movies;
using MediaBrowser.Model.Entities.TV;
using System;
using System.Collections.Generic;
using System.Linq;

2
MediaBrowser.Api/HttpHandlers/AudioHandler.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;

2
MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs
Unescape View File

@ -2,7 +2,7 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using System;
using System.Collections.Generic;
using System.Diagnostics;

1
MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;

2
MediaBrowser.Api/HttpHandlers/GenreHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;

2
MediaBrowser.Api/HttpHandlers/GenresHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;

1
MediaBrowser.Api/HttpHandlers/ImageHandler.cs
Unescape View File

@ -2,6 +2,7 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using System;
using System.ComponentModel.Composition;

2
MediaBrowser.Api/HttpHandlers/ItemHandler.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;
using System.Net;
using System.Threading.Tasks;

2
MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;

4
MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.Movies;
using System.ComponentModel.Composition;
using System.Linq;
using System.Net;

2
MediaBrowser.Api/HttpHandlers/PersonHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Net;

1
MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;

2
MediaBrowser.Api/HttpHandlers/StudioHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;

2
MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;

2
MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Authentication;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;
using System.Net;
using System.Threading.Tasks;

2
MediaBrowser.Api/HttpHandlers/UserHandler.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;
using System.Net;
using System.Threading.Tasks;

1
MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;

1
MediaBrowser.Api/HttpHandlers/VideoHandler.cs
Unescape View File

@ -1,5 +1,6 @@
using MediaBrowser.Common.Drawing;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System;

2
MediaBrowser.Api/HttpHandlers/YearHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Net;

2
MediaBrowser.Api/HttpHandlers/YearsHandler.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;

15
MediaBrowser.Common/Kernel/BaseKernel.cs
Unescape View File

@ -9,6 +9,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
@ -85,22 +86,18 @@ namespace MediaBrowser.Common.Kernel
await ReloadComposableParts().ConfigureAwait(false);
}
/// <summary>
/// Gets or sets the path to the current log file
/// </summary>
public static string LogFilePath { get; set; }
private void ReloadLogger()
{
DisposeLogger();
DateTime now = DateTime.Now;
LogFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read);
Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
Trace.AutoFlush = true;
Logger.LoggerInstance = new StreamLogger(fs);
Logger.LoggerInstance = new TraceLogger();
}
/// <summary>
@ -264,6 +261,8 @@ namespace MediaBrowser.Common.Kernel
/// </summary>
private void DisposeLogger()
{
Trace.Listeners.Clear();
if (Logger.LoggerInstance != null)
{
Logger.LoggerInstance.Dispose();

2
MediaBrowser.Common/Logging/ThreadedLogger.cs
Unescape View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
namespace MediaBrowser.Common.Logging

12
MediaBrowser.Common/Logging/TraceLogger.cs
Unescape View File

@ -0,0 +1,12 @@
using System.Diagnostics;
namespace MediaBrowser.Common.Logging
{
public class TraceLogger : BaseLogger
{
protected override void LogEntry(LogRow row)
{
Trace.WriteLine(row.ToString());
}
}
}

1
MediaBrowser.Common/MediaBrowser.Common.csproj
Unescape View File

@ -84,6 +84,7 @@
<Compile Include="Kernel\BaseApplicationPaths.cs" />
<Compile Include="Drawing\DrawingUtils.cs" />
<Compile Include="Logging\ThreadedLogger.cs" />
<Compile Include="Logging\TraceLogger.cs" />
<Compile Include="Net\Handlers\StaticFileHandler.cs" />
<Compile Include="Net\MimeTypes.cs" />
<Compile Include="Properties\Resources.Designer.cs">

2
MediaBrowser.Model/Entities/Audio.cs → MediaBrowser.Controller/Entities/Audio.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class Audio : BaseItem
{

2
MediaBrowser.Model/Entities/BaseEntity.cs → MediaBrowser.Controller/Entities/BaseEntity.cs
Unescape View File

@ -1,6 +1,6 @@
using System;
namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
/// <summary>
/// Provides a base entity for all of our types

5
MediaBrowser.Model/Entities/BaseItem.cs → MediaBrowser.Controller/Entities/BaseItem.cs
Unescape View File

@ -1,8 +1,9 @@
using System;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public abstract class BaseItem : BaseEntity, IHasProviderIds
{

5
MediaBrowser.Model/Entities/Folder.cs → MediaBrowser.Controller/Entities/Folder.cs
Unescape View File

@ -1,8 +1,9 @@
using System;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class Folder : BaseItem
{

2
MediaBrowser.Model/Entities/Genre.cs → MediaBrowser.Controller/Entities/Genre.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class Genre : BaseEntity
{

7
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
Unescape View File

@ -0,0 +1,7 @@

namespace MediaBrowser.Controller.Entities.Movies
{
public class BoxSet : Folder
{
}
}

2
MediaBrowser.Model/Entities/Movies/Movie.cs → MediaBrowser.Controller/Entities/Movies/Movie.cs
Unescape View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Model.Entities.Movies
namespace MediaBrowser.Controller.Entities.Movies
{
public class Movie : Video
{

2
MediaBrowser.Model/Entities/Person.cs → MediaBrowser.Controller/Entities/Person.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
/// <summary>
/// This is the full Person object that can be retrieved with all of it's data.

2
MediaBrowser.Model/Entities/Studio.cs → MediaBrowser.Controller/Entities/Studio.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class Studio : BaseEntity
{

2
MediaBrowser.Model/Entities/TV/Episode.cs → MediaBrowser.Controller/Entities/TV/Episode.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities.TV
namespace MediaBrowser.Controller.Entities.TV
{
public class Episode : Video
{

2
MediaBrowser.Model/Entities/TV/Season.cs → MediaBrowser.Controller/Entities/TV/Season.cs
Unescape View File

@ -1,6 +1,6 @@
using System;
namespace MediaBrowser.Model.Entities.TV
namespace MediaBrowser.Controller.Entities.TV
{
public class Season : Folder
{

2
MediaBrowser.Model/Entities/TV/Series.cs → MediaBrowser.Controller/Entities/TV/Series.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace MediaBrowser.Model.Entities.TV
namespace MediaBrowser.Controller.Entities.TV
{
public class Series : Folder
{

2
MediaBrowser.Model/Entities/User.cs → MediaBrowser.Controller/Entities/User.cs
Unescape View File

@ -1,6 +1,6 @@
using System;
namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class User : BaseEntity
{

0
MediaBrowser.Model/Entities/UserItemData.cs → MediaBrowser.Controller/Entities/UserItemData.cs
Unescape View File

20
MediaBrowser.Controller/Entities/Video.cs
Unescape View File

@ -0,0 +1,20 @@
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
namespace MediaBrowser.Controller.Entities
{
public class Video : BaseItem
{
public VideoType VideoType { get; set; }
public List<SubtitleStream> Subtitles { get; set; }
public List<AudioStream> AudioStreams { get; set; }
public int Height { get; set; }
public int Width { get; set; }
public string ScanType { get; set; }
public float FrameRate { get; set; }
public int BitRate { get; set; }
public string Codec { get; set; }
}
}

2
MediaBrowser.Model/Entities/Year.cs → MediaBrowser.Controller/Entities/Year.cs
Unescape View File

@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Entities
namespace MediaBrowser.Controller.Entities
{
public class Year : BaseEntity
{

8
MediaBrowser.Controller/FFMpeg/FFProbe.cs
Unescape View File

@ -1,10 +1,10 @@
using System;
using MediaBrowser.Common.Logging;
using MediaBrowser.Common.Serialization;
using MediaBrowser.Controller.Entities;
using System;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using MediaBrowser.Common.Logging;
using MediaBrowser.Common.Serialization;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.FFMpeg
{

4
MediaBrowser.Controller/IO/DirectoryWatchers.cs
Unescape View File

@ -1,10 +1,10 @@
using System;
using MediaBrowser.Controller.Entities;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.IO
{

4
MediaBrowser.Controller/Kernel.cs
Unescape View File

@ -1,5 +1,7 @@
using MediaBrowser.Common.Kernel;
using MediaBrowser.Common.Logging;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
@ -7,8 +9,6 @@ using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Controller.Weather;
using MediaBrowser.Model.Authentication;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Model.Progress;
using System;
using System.Collections.Generic;

4
MediaBrowser.Controller/Library/ItemController.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;

6
MediaBrowser.Controller/Library/ItemResolveEventArgs.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.Entities;
using System;
using System.IO;
namespace MediaBrowser.Controller.Library
{

17
MediaBrowser.Controller/MediaBrowser.Controller.csproj
Unescape View File

@ -50,6 +50,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@ -57,6 +58,22 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Entities\Audio.cs" />
<Compile Include="Entities\BaseEntity.cs" />
<Compile Include="Entities\BaseItem.cs" />
<Compile Include="Entities\Folder.cs" />
<Compile Include="Entities\Genre.cs" />
<Compile Include="Entities\Movies\BoxSet.cs" />
<Compile Include="Entities\Movies\Movie.cs" />
<Compile Include="Entities\Person.cs" />
<Compile Include="Entities\Studio.cs" />
<Compile Include="Entities\TV\Episode.cs" />
<Compile Include="Entities\TV\Season.cs" />
<Compile Include="Entities\TV\Series.cs" />
<Compile Include="Entities\User.cs" />
<Compile Include="Entities\UserItemData.cs" />
<Compile Include="Entities\Video.cs" />
<Compile Include="Entities\Year.cs" />
<Compile Include="Providers\Movies\MovieProviderFromXml.cs" />
<Compile Include="Providers\Movies\MovieSpecialFeaturesProvider.cs" />
<Compile Include="Providers\TV\EpisodeImageFromMediaLocationProvider.cs" />

4
MediaBrowser.Controller/Providers/AudioInfoProvider.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;

3
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Xml;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Xml;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;

4
MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using System.Threading.Tasks;
namespace MediaBrowser.Controller.Providers

4
MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading.Tasks;

4
MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;

4
MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;

7
MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
Unescape View File

@ -1,7 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Xml;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.Movies;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading.Tasks;

6
MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.Movies;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;

6
MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;

6
MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading.Tasks;

2
MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs
Unescape View File

@ -1,4 +1,4 @@
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities.TV;
using System.IO;
using System.Xml;

6
MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading.Tasks;

4
MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Entities;
using System;
using System.Xml;

3
MediaBrowser.Controller/Providers/VideoInfoProvider.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;

4
MediaBrowser.Controller/Resolvers/AudioResolver.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;

6
MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
Unescape View File

@ -1,8 +1,8 @@
using System;
using System.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using System;
using System.IO;
namespace MediaBrowser.Controller.Resolvers
{

4
MediaBrowser.Controller/Resolvers/FolderResolver.cs
Unescape View File

@ -1,6 +1,6 @@
using System.ComponentModel.Composition;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;
namespace MediaBrowser.Controller.Resolvers
{

4
MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities.Movies;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using System;
using System.ComponentModel.Composition;
using System.IO;

5
MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs
Unescape View File

@ -1,7 +1,8 @@
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.Movies;
using System.ComponentModel.Composition;
namespace MediaBrowser.Controller.Resolvers.Movies

4
MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
namespace MediaBrowser.Controller.Resolvers.TV

4
MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs
Unescape View File

@ -1,5 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities.TV;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.ComponentModel.Composition;
using System.IO;

4
MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs
Unescape View File

@ -1,6 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Entities.TV;
using System;
using System.ComponentModel.Composition;
using System.IO;

3
MediaBrowser.Controller/Resolvers/VideoResolver.cs
Unescape View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using System.ComponentModel.Composition;
using System.IO;

43
MediaBrowser.Model/Entities/ItemSpecialCounts.cs
Unescape View File

@ -20,4 +20,47 @@ namespace MediaBrowser.Model.Entities
[ProtoMember(4)]
public decimal PlayedPercentage { get; set; }
}
[ProtoContract]
public class AudioStream
{
[ProtoMember(1)]
public string Codec { get; set; }
[ProtoMember(2)]
public string Language { get; set; }
[ProtoMember(3)]
public int BitRate { get; set; }
[ProtoMember(4)]
public int Channels { get; set; }
[ProtoMember(5)]
public int SampleRate { get; set; }
[ProtoMember(6)]
public bool IsDefault { get; set; }
}
[ProtoContract]
public class SubtitleStream
{
[ProtoMember(1)]
public string Language { get; set; }
[ProtoMember(2)]
public bool IsDefault { get; set; }
[ProtoMember(3)]
public bool IsForced { get; set; }
}
public enum VideoType
{
VideoFile,
Iso,
DVD,
BluRay
}
}

7
MediaBrowser.Model/Entities/Movies/BoxSet.cs
Unescape View File

@ -1,7 +0,0 @@

namespace MediaBrowser.Model.Entities.Movies
{
public class BoxSet : Folder
{
}
}

63
MediaBrowser.Model/Entities/Video.cs
Unescape View File

@ -1,63 +0,0 @@
using System.Collections.Generic;
using ProtoBuf;
namespace MediaBrowser.Model.Entities
{
public class Video : BaseItem
{
public VideoType VideoType { get; set; }
public List<SubtitleStream> Subtitles { get; set; }
public List<AudioStream> AudioStreams { get; set; }
public int Height { get; set; }
public int Width { get; set; }
public string ScanType { get; set; }
public float FrameRate { get; set; }
public int BitRate { get; set; }
public string Codec { get; set; }
}
[ProtoContract]
public class AudioStream
{
[ProtoMember(1)]
public string Codec { get; set; }
[ProtoMember(2)]
public string Language { get; set; }
[ProtoMember(3)]
public int BitRate { get; set; }
[ProtoMember(4)]
public int Channels { get; set; }
[ProtoMember(5)]
public int SampleRate { get; set; }
[ProtoMember(6)]
public bool IsDefault { get; set; }
}
[ProtoContract]
public class SubtitleStream
{
[ProtoMember(1)]
public string Language { get; set; }
[ProtoMember(2)]
public bool IsDefault { get; set; }
[ProtoMember(3)]
public bool IsForced { get; set; }
}
public enum VideoType
{
VideoFile,
Iso,
DVD,
BluRay
}
}

16
MediaBrowser.Model/MediaBrowser.Model.csproj
Unescape View File

@ -44,31 +44,15 @@
<Compile Include="DTO\DTOUser.cs" />
<Compile Include="DTO\VideoInfo.cs" />
<Compile Include="DTO\VideoOutputFormats.cs" />
<Compile Include="Entities\Audio.cs" />
<Compile Include="Entities\BaseEntity.cs" />
<Compile Include="Entities\BaseItem.cs" />
<Compile Include="DTO\IBNItem.cs" />
<Compile Include="Entities\Folder.cs" />
<Compile Include="Entities\Genre.cs" />
<Compile Include="Entities\ImageType.cs" />
<Compile Include="Entities\IHasProviderIds.cs" />
<Compile Include="Entities\ItemSpecialCounts.cs" />
<Compile Include="Entities\MetadataProviders.cs" />
<Compile Include="Entities\Movies\BoxSet.cs" />
<Compile Include="Entities\Movies\Movie.cs" />
<Compile Include="Entities\Person.cs" />
<Compile Include="Entities\Studio.cs" />
<Compile Include="Entities\TV\Episode.cs" />
<Compile Include="Entities\TV\Season.cs" />
<Compile Include="Entities\TV\Series.cs" />
<Compile Include="Entities\Video.cs" />
<Compile Include="Entities\Year.cs" />
<Compile Include="Plugins\BasePluginConfiguration.cs" />
<Compile Include="DTO\PluginInfo.cs" />
<Compile Include="Progress\TaskProgress.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Entities\User.cs" />
<Compile Include="Entities\UserItemData.cs" />
<Compile Include="Weather\WeatherForecast.cs" />
<Compile Include="Weather\WeatherInfo.cs" />
<Compile Include="Weather\WeatherStatus.cs" />

Write Preview
Loading…
Cancel
Save