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

Merge pull request #1669 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-04-20 11:56:38 -04:00
commit 7207e0112f
12 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/ItemUpdateService.cs
View File

@ -247,6 +247,12 @@ namespace MediaBrowser.Api
hasBudget.Revenue = request.Revenue;
}
var hasOriginalTitle = item as IHasOriginalTitle;
if (hasOriginalTitle != null)
{
hasOriginalTitle.OriginalTitle = hasOriginalTitle.OriginalTitle;
}
var hasCriticRating = item as IHasCriticRating;
if (hasCriticRating != null)
{

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -125,6 +125,8 @@ namespace MediaBrowser.Controller.Entities
}
}
public string OriginalTitle { get; set; }
/// <summary>
/// Gets or sets the id.
/// </summary>

2
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@ -18,8 +18,6 @@ namespace MediaBrowser.Controller.Entities.Movies
{
public List<Guid> SpecialFeatureIds { get; set; }
public string OriginalTitle { get; set; }
public List<Guid> ThemeSongIds { get; set; }
public List<Guid> ThemeVideoIds { get; set; }
public List<string> ProductionLocations { get; set; }

2
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@ -19,8 +19,6 @@ namespace MediaBrowser.Controller.Entities.TV
{
public List<Guid> SpecialFeatureIds { get; set; }
public string OriginalTitle { get; set; }
public int? AnimeSeriesIndex { get; set; }
public Series()

2
MediaBrowser.Controller/Entities/Trailer.cs
View File

@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Trailer
/// </summary>
public class Trailer : Video, IHasCriticRating, IHasProductionLocations, IHasBudget, IHasKeywords, IHasTaglines, IHasMetascore, IHasLookupInfo<TrailerInfo>
public class Trailer : Video, IHasCriticRating, IHasProductionLocations, IHasBudget, IHasKeywords, IHasTaglines, IHasMetascore, IHasOriginalTitle, IHasLookupInfo<TrailerInfo>
{
public List<string> ProductionLocations { get; set; }

11
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@ -61,16 +61,7 @@ namespace MediaBrowser.Controller.Providers
};
//Fetch(item, metadataFile, settings, Encoding.GetEncoding("ISO-8859-1"), cancellationToken);
try
{
Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken);
}
catch
{
Logger.Error("Error parsing xml file {0}", metadataFile);
throw;
}
Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken);
}
/// <summary>

2
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -26,6 +26,8 @@ namespace MediaBrowser.Model.Dto
/// <value>The name.</value>
public string Name { get; set; }
public string OriginalTitle { get; set; }
/// <summary>
/// Gets or sets the server identifier.
/// </summary>

2
MediaBrowser.Model/Querying/ItemFields.cs
View File

@ -130,6 +130,8 @@
/// </summary>
Metascore,
OriginalTitle,
/// <summary>
/// The item overview
/// </summary>

9
MediaBrowser.Providers/Manager/ProviderUtils.cs
View File

@ -40,6 +40,15 @@ namespace MediaBrowser.Providers.Manager
}
}
if (replaceData || string.IsNullOrEmpty(target.OriginalTitle))
{
// Safeguard against incoming data having an emtpy name
if (!string.IsNullOrWhiteSpace(source.OriginalTitle))
{
target.OriginalTitle = source.OriginalTitle;
}
}
if (replaceData || !target.CommunityRating.HasValue)
{
target.CommunityRating = source.CommunityRating;

5
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -1126,6 +1126,11 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.Overview = item.Overview;
}
if (fields.Contains(ItemFields.OriginalTitle))
{
dto.OriginalTitle = item.OriginalTitle;
}
if (fields.Contains(ItemFields.ShortOverview))
{
var hasShortOverview = item as IHasShortOverview;

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -781,9 +781,6 @@
<Content Include="dashboard-ui\collections.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\editor\lock.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\images\editor\missing.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

1
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -479,7 +479,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("dateadded", item.DateCreated.ToLocalTime().ToString(DateAddedFormat));
writer.WriteElementString("title", item.Name ?? string.Empty);
writer.WriteElementString("originaltitle", item.Name ?? string.Empty);
var hasOriginalTitle = item as IHasOriginalTitle;
if (hasOriginalTitle != null)