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

Fix dateadded and movie NFO recognition

Browse Source
This commit is contained in:
Shadowghost 2024-06-02 22:33:02 +02:00
parent ab4315742f
commit c7ce1aa4c7
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@ -763,7 +763,7 @@ namespace MediaBrowser.Providers.Manager
else else
{ {
var shouldReplace = options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly || options.ReplaceAllMetadata; var shouldReplace = options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly || options.ReplaceAllMetadata;
MergeData(temp, metadata, item.LockedFields, shouldReplace, false); MergeData(temp, metadata, item.LockedFields, shouldReplace, true);
} }
} }
} }
@ -1103,7 +1103,7 @@ namespace MediaBrowser.Providers.Manager
target.IsLocked = target.IsLocked || source.IsLocked; target.IsLocked = target.IsLocked || source.IsLocked;
} }
if (target.LockedFields.Length == 0) if (replaceData || target.LockedFields.Length == 0)
{ {
target.LockedFields = source.LockedFields; target.LockedFields = source.LockedFields;
} }

17
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
View File

@ -45,27 +45,24 @@ namespace MediaBrowser.XbmcMetadata.Savers
internal static IEnumerable<string> GetMovieSavePaths(ItemInfo item) internal static IEnumerable<string> GetMovieSavePaths(ItemInfo item)
{ {
var path = item.ContainingFolderPath;
if (item.VideoType == VideoType.Dvd && !item.IsPlaceHolder) if (item.VideoType == VideoType.Dvd && !item.IsPlaceHolder)
{ {
var path = item.ContainingFolderPath;
yield return Path.Combine(path, "VIDEO_TS", "VIDEO_TS.nfo"); yield return Path.Combine(path, "VIDEO_TS", "VIDEO_TS.nfo");
} }
// only allow movie object to read movie.nfo, not owned videos (which will be itemtype video, not movie)
if (!item.IsInMixedFolder && item.ItemType == typeof(Movie))
{
yield return Path.Combine(path, "movie.nfo");
}
if (!item.IsPlaceHolder && (item.VideoType == VideoType.Dvd || item.VideoType == VideoType.BluRay)) if (!item.IsPlaceHolder && (item.VideoType == VideoType.Dvd || item.VideoType == VideoType.BluRay))
{ {
var path = item.ContainingFolderPath;
yield return Path.Combine(path, Path.GetFileName(path) + ".nfo"); yield return Path.Combine(path, Path.GetFileName(path) + ".nfo");
} }
else else
{ {
// only allow movie object to read movie.nfo, not owned videos (which will be itemtype video, not movie)
if (!item.IsInMixedFolder && item.ItemType == typeof(Movie))
{
yield return Path.Combine(item.ContainingFolderPath, "movie.nfo");
}
yield return Path.ChangeExtension(item.Path, ".nfo"); yield return Path.ChangeExtension(item.Path, ".nfo");
} }
} }