alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'dev' into code-cleanup

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-11 12:50:36 +01:00
parent ec1f5dc317 e5c2dbdf23
commit e2751d42e8
345 changed files with 2991 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
View File

@@ -18,7 +18,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
{
public void Fetch(MetadataResult<Episode> item,
List<LocalImageInfo> images,
string metadataFile,
string metadataFile,
CancellationToken cancellationToken)
{
Fetch(item, metadataFile, cancellationToken);

2
MediaBrowser.XbmcMetadata/Properties/AssemblyInfo.cs
View File

@@ -2,7 +2,7 @@ using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("MediaBrowser.XbmcMetadata")]

6
MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
View File

@@ -41,7 +41,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
protected override void WriteCustomElements(BaseItem item, XmlWriter writer)
{
var album = (MusicAlbum)item;
foreach (var artist in album.Artists)
{
writer.WriteElementString("artist", artist);
@@ -53,8 +53,8 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
AddTracks(album.Tracks, writer);
}
}
private readonly CultureInfo UsCulture = new CultureInfo("en-US");
private void AddTracks(IEnumerable<BaseItem> tracks, XmlWriter writer)

4
MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
View File

@@ -47,7 +47,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("disbanded", artist.EndDate.Value.ToLocalTime().ToString(formatString));
}
var albums = artist
.GetRecursiveChildren(i => i is MusicAlbum);
@@ -55,7 +55,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
private readonly CultureInfo UsCulture = new CultureInfo("en-US");
private void AddAlbums(IList<BaseItem> albums, XmlWriter writer)
{
foreach (var album in albums)

12
MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
View File

@@ -38,7 +38,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
return false;
}
return updateType >= MinimumUpdateType || (updateType >= ItemUpdateType.MetadataImport && FileSystem.FileExists(GetSavePath(item)));
return updateType >= MinimumUpdateType || (updateType >= ItemUpdateType.MetadataImport && FileSystem.FileExists(GetSavePath(item)));
}
protected override void WriteCustomElements(BaseItem item, XmlWriter writer)
@@ -62,7 +62,15 @@ namespace MediaBrowser.XbmcMetadata.Savers
return list;
}
public SeasonNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger, IXmlReaderSettingsFactory xmlReaderSettingsFactory) : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger, xmlReaderSettingsFactory)
public SeasonNfoSaver(
IFileSystem fileSystem,
IServerConfigurationManager configurationManager,
ILibraryManager libraryManager,
IUserManager userManager,
IUserDataManager userDataManager,
ILogger logger,
IXmlReaderSettingsFactory xmlReaderSettingsFactory)
: base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger, xmlReaderSettingsFactory)
{
}
}

2
MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
View File

@@ -58,7 +58,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteAttributeString("cache", string.Format("{0}.xml", tvdb));
writer.WriteString(string.Format("http://www.thetvdb.com/api/1D62F2F90030C444/series/{0}/all/{1}.zip", tvdb, language));
writer.WriteEndElement();
writer.WriteEndElement();
}