Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed 2013-08-26 13:11:51 -04:00
commit af0d855d58
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -41,3 +41,4 @@
- [rickster53](https://github.com/rickster53) - [rickster53](https://github.com/rickster53)
- [Tharnax] (https://github.com/Tharnax) - [Tharnax] (https://github.com/Tharnax)
- [0sm0] (https://github.com/0sm0) - [0sm0] (https://github.com/0sm0)
- [swhitmore](https://github.com/swhitmore)

7
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View File

@ -192,8 +192,6 @@ namespace MediaBrowser.Providers.Movies
new Regex(@"(?<name>.*)") // last resort matches the whole string as the name new Regex(@"(?<name>.*)") // last resort matches the whole string as the name
}; };
public const string AltMetaFileName = "movie.xml";
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo) protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
{ {
if (HasAltMeta(item)) if (HasAltMeta(item))
@ -236,7 +234,10 @@ namespace MediaBrowser.Providers.Movies
{ {
return item.LocationType == LocationType.FileSystem && item.ResolveArgs.ContainsMetaFileByName("collection.xml"); return item.LocationType == LocationType.FileSystem && item.ResolveArgs.ContainsMetaFileByName("collection.xml");
} }
return item.LocationType == LocationType.FileSystem && item.ResolveArgs.ContainsMetaFileByName(AltMetaFileName);
var xmlFileName = MovieProviderFromXml.GetXmlFilename(item);
return item.LocationType == LocationType.FileSystem && item.ResolveArgs.ContainsMetaFileByName(xmlFileName);
} }
/// <summary> /// <summary>

11
MediaBrowser.Providers/Movies/MovieProviderFromXml.cs
View File

@ -52,6 +52,13 @@ namespace MediaBrowser.Providers.Movies
get { return MetadataProviderPriority.First; } get { return MetadataProviderPriority.First; }
} }
internal static string GetXmlFilename(BaseItem item)
{
var filename = "movie.xml";
return Path.Combine(item.MetaLocation, filename);
}
/// <summary> /// <summary>
/// Override this to return the date that should be compared to the last refresh date /// Override this to return the date that should be compared to the last refresh date
/// to determine if this provider should be re-fetched. /// to determine if this provider should be re-fetched.
@ -60,7 +67,7 @@ namespace MediaBrowser.Providers.Movies
/// <returns>DateTime.</returns> /// <returns>DateTime.</returns>
protected override DateTime CompareDate(BaseItem item) protected override DateTime CompareDate(BaseItem item)
{ {
var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "movie.xml")); var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, GetXmlFilename(item)));
return entry != null ? entry.LastWriteTimeUtc : DateTime.MinValue; return entry != null ? entry.LastWriteTimeUtc : DateTime.MinValue;
} }
@ -86,7 +93,7 @@ namespace MediaBrowser.Providers.Movies
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "movie.xml")); var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, GetXmlFilename(item)));
if (metadataFile != null) if (metadataFile != null)
{ {

11
MediaBrowser.Providers/Savers/MovieXmlSaver.cs
View File

@ -119,11 +119,14 @@ namespace MediaBrowser.Providers.Savers
public string GetSavePath(BaseItem item) public string GetSavePath(BaseItem item)
{ {
var video = (Video)item; if (item.IsInMixedFolder)
{
return Path.ChangeExtension(item.Path, ".xml");
}
return video.IsInMixedFolder ? var filename = MovieProviderFromXml.GetXmlFilename(item);
Path.ChangeExtension(item.Path, ".xml") :
Path.Combine(item.MetaLocation, "movie.xml"); return Path.Combine(item.MetaLocation, filename);
} }
} }
} }