alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-23 10:36:43 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

handle year in name when searching

Browse Source
This commit is contained in:
Luke Pulverenti
2014-02-13 23:00:13 -05:00
parent 58a46171ab
commit a4b40ad9d9
21 changed files with 2761 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -900,8 +900,16 @@ namespace MediaBrowser.Server.Implementations.Dto
if (fields.Contains(ItemFields.Path))
{
dto.Path = item.Path;
dto.MappedPaths = GetMappedPaths(item);
var locationType = item.LocationType;
if (locationType == LocationType.FileSystem || locationType == LocationType.Offline)
{
dto.Path = GetMappedPath(item.Path);
}
else
{
dto.Path = item.Path;
}
}
dto.PremiereDate = item.PremiereDate;
@@ -1135,39 +1143,11 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
private List<string> GetMappedPaths(BaseItem item)
private string GetMappedPath(string path)
{
var list = new List<string>();
var locationType = item.LocationType;
if (locationType == LocationType.FileSystem || locationType == LocationType.Offline)
foreach (var map in _config.Configuration.PathSubstitutions)
{
var path = item.Path;
var mappedPaths = _config.Configuration.PathSubstitutions
.Select(p => GetMappedPath(path, p))
.Where(p => !string.Equals(p, path, StringComparison.OrdinalIgnoreCase))
.Distinct(StringComparer.OrdinalIgnoreCase);
list.AddRange(mappedPaths);
}
return list;
}
private string GetMappedPath(string path, PathSubstitution map)
{
var toValue = map.To ?? string.Empty;
path = path.Replace(map.From, toValue, StringComparison.OrdinalIgnoreCase);
if (toValue.IndexOf('/') != -1)
{
path = path.Replace('\\', '/');
}
else
{
path = path.Replace('/', '\\');
path = _fileSystem.SubstitutePath(path, map.From, map.To);
}
return path;

2
MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@@ -74,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
return null;
}
if (args.ContainsMetaFileByName("series.xml") || filename.IndexOf("[tvdbid=", StringComparison.OrdinalIgnoreCase) != -1 || TVUtils.IsSeriesFolder(args.Path, args.FileSystemChildren))
if (args.ContainsMetaFileByName("series.xml") || filename.IndexOf("[tvdbid=", StringComparison.OrdinalIgnoreCase) != -1 || TVUtils.IsSeriesFolder(args.Path, args.FileSystemChildren, args.DirectoryService))
{
return new Series();
}