open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2392 from MediaBrowser/dev

Browse Source 
Dev
pull/1154/head
Luke 8 years ago committed by GitHub
parent cce6484b6c 0b5d4ce3f8
commit fb31918f9c
15 changed files with 71 additions and 86 deletions
Show Stats Download Patch File Download Diff File

18
Emby.Common.Implementations/IO/ManagedFileSystem.cs
Unescape View File

@ -499,6 +499,24 @@ namespace Emby.Common.Implementations.IO
CopyFile(temp1, file2, true);
}
public bool AreEqual(string path1, string path2)
{
if (path1 == null && path2 == null)
{
return true;
}
if (path1 == null || path2 == null)
{
return false;
}
path1 = path1.TrimEnd(DirectorySeparatorChar);
path2 = path2.TrimEnd(DirectorySeparatorChar);
return string.Equals(path1, path2, StringComparison.OrdinalIgnoreCase);
}
public bool ContainsSubPath(string parentPath, string path)
{
if (string.IsNullOrEmpty(parentPath))

2
Emby.Server.Core/IO/LibraryMonitor.cs
Unescape View File

@ -87,7 +87,7 @@ namespace Emby.Server.Core.IO
public bool IsPathLocked(string path)
{
var lockedPaths = _tempIgnoredPaths.Keys.ToList();
return lockedPaths.Any(i => string.Equals(i, path, StringComparison.OrdinalIgnoreCase) || _fileSystem.ContainsSubPath(i, path));
return lockedPaths.Any(i => _fileSystem.AreEqual(i, path) || _fileSystem.ContainsSubPath(i, path));
}
public async void ReportFileSystemChangeComplete(string path, bool refreshPath)

6
Emby.Server.Implementations/Connect/ConnectManager.cs
Unescape View File

@ -925,7 +925,11 @@ namespace Emby.Server.Implementations.Connect
}
_data.PendingAuthorizations = newPendingList;
CacheData();
if (!newPendingList.Select(i => i.Id).SequenceEqual(currentPendingList.Select(i => i.Id), StringComparer.Ordinal))
{
CacheData();
}
await RefreshGuestNames(list, refreshImages).ConfigureAwait(false);
}

8
Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
Unescape View File

@ -137,6 +137,11 @@ namespace Emby.Server.Implementations.Data
var numComplete = 0;
var numItems = result.Count;
var allLibraryPaths = _libraryManager
.GetVirtualFolders()
.SelectMany(i => i.Locations)
.ToList();
foreach (var item in result)
{
cancellationToken.ThrowIfCancellationRequested();
@ -170,9 +175,8 @@ namespace Emby.Server.Implementations.Data
continue;
}
if (Folder.IsPathOffline(path))
if (Folder.IsPathOffline(path, allLibraryPaths))
{
await libraryItem.UpdateIsOffline(true).ConfigureAwait(false);
continue;
}

5
Emby.Server.Implementations/Dto/DtoService.cs
Unescape View File

@ -361,10 +361,7 @@ namespace Emby.Server.Implementations.Dto
if (collectionFolder != null)
{
dto.OriginalCollectionType = collectionFolder.CollectionType;
dto.CollectionType = user == null ?
collectionFolder.CollectionType :
collectionFolder.GetViewType(user);
dto.CollectionType = collectionFolder.CollectionType;
}
if (fields.Contains(ItemFields.CanDelete))

4
Emby.Server.Implementations/Library/LibraryManager.cs
Unescape View File

@ -2010,7 +2010,7 @@ namespace Emby.Server.Implementations.Library
private string GetContentTypeOverride(string path, bool inherit)
{
var nameValuePair = ConfigurationManager.Configuration.ContentTypes.FirstOrDefault(i => string.Equals(i.Name, path, StringComparison.OrdinalIgnoreCase) || (inherit && !string.IsNullOrWhiteSpace(i.Name) && _fileSystem.ContainsSubPath(i.Name, path)));
var nameValuePair = ConfigurationManager.Configuration.ContentTypes.FirstOrDefault(i => _fileSystem.AreEqual(i.Name, path) || (inherit && !string.IsNullOrWhiteSpace(i.Name) && _fileSystem.ContainsSubPath(i.Name, path)));
if (nameValuePair != null)
{
return nameValuePair.Value;
@ -3066,7 +3066,7 @@ namespace Emby.Server.Implementations.Library
{
removeList.Add(contentType);
}
else if (string.Equals(path, contentType.Name, StringComparison.OrdinalIgnoreCase)
else if (_fileSystem.AreEqual(path, contentType.Name)
|| _fileSystem.ContainsSubPath(path, contentType.Name))
{
removeList.Add(contentType);

8
Emby.Server.Implementations/Library/UserViewManager.cs
Unescape View File

@ -55,8 +55,6 @@ namespace Emby.Server.Implementations.Library
}).ToList();
}
var plainFolderIds = user.Configuration.PlainFolderViews.Select(i => new Guid(i)).ToList();
var groupedFolders = new List<ICollectionFolder>();
var list = new List<Folder>();
@ -72,12 +70,6 @@ namespace Emby.Server.Implementations.Library
continue;
}
if (plainFolderIds.Contains(folder.Id) && UserView.IsEligibleForEnhancedView(folderViewType))
{
list.Add(folder);
continue;
}
if (collectionFolder != null && UserView.IsEligibleForGrouping(folder) && user.IsFolderGrouped(folder.Id))
{
groupedFolders.Add(collectionFolder);

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
Unescape View File

@ -150,7 +150,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
foreach (var recordingFolder in recordingFolders)
{
var pathsToCreate = recordingFolder.Locations
.Where(i => !allExistingPaths.Contains(i, StringComparer.OrdinalIgnoreCase))
.Where(i => !allExistingPaths.Any(p => _fileSystem.AreEqual(p, i)))
.ToList();
if (pathsToCreate.Count == 0)

4
Emby.Server.Implementations/UserViews/DynamicImageProvider.cs
Unescape View File

@ -151,7 +151,9 @@ namespace Emby.Server.Implementations.UserViews
string[] collectionStripViewTypes =
{
CollectionType.Movies,
CollectionType.TvShows
CollectionType.TvShows,
CollectionType.Playlists,
CollectionType.Photos
};
return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty);

17
MediaBrowser.Controller/Entities/BaseItem.cs
Unescape View File

@ -272,9 +272,6 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public virtual string Path { get; set; }
[IgnoreDataMember]
public bool IsOffline { get; set; }
[IgnoreDataMember]
public virtual SourceType SourceType { get; set; }
@ -339,20 +336,6 @@ namespace MediaBrowser.Controller.Entities
}
}
public Task UpdateIsOffline(bool newValue)
{
var item = this;
if (item.IsOffline != newValue)
{
item.IsOffline = newValue;
// this is creating too many repeated db updates
//return item.UpdateToRepository(ItemUpdateType.None, CancellationToken.None);
}
return Task.FromResult(true);
}
/// <summary>
/// Gets or sets the type of the location.
/// </summary>

40
MediaBrowser.Controller/Entities/Folder.cs
Unescape View File

@ -369,6 +369,11 @@ namespace MediaBrowser.Controller.Entities
var validChildren = new List<BaseItem>();
var allLibraryPaths = LibraryManager
.GetVirtualFolders()
.SelectMany(i => i.Locations)
.ToList();
if (locationType != LocationType.Remote && locationType != LocationType.Virtual)
{
IEnumerable<BaseItem> nonCachedChildren;
@ -402,7 +407,6 @@ namespace MediaBrowser.Controller.Entities
if (currentChildren.TryGetValue(child.Id, out currentChild) && IsValidFromResolver(currentChild, child))
{
await currentChild.UpdateIsOffline(false).ConfigureAwait(false);
validChildren.Add(currentChild);
continue;
@ -429,9 +433,8 @@ namespace MediaBrowser.Controller.Entities
{
}
else if (!string.IsNullOrEmpty(item.Path) && IsPathOffline(item.Path))
else if (!string.IsNullOrEmpty(item.Path) && IsPathOffline(item.Path, allLibraryPaths))
{
await item.UpdateIsOffline(true).ConfigureAwait(false);
}
else
{
@ -446,7 +449,6 @@ namespace MediaBrowser.Controller.Entities
Logger.Debug("Removed item: " + item.Path);
item.SetParent(null);
item.IsOffline = false;
await LibraryManager.DeleteItem(item, new DeleteOptions { DeleteFileLocation = false }).ConfigureAwait(false);
LibraryManager.ReportItemRemoved(item);
}
@ -611,6 +613,11 @@ namespace MediaBrowser.Controller.Entities
/// <param name="path">The path.</param>
/// <returns><c>true</c> if the specified path is offline; otherwise, <c>false</c>.</returns>
public static bool IsPathOffline(string path)
{
return IsPathOffline(path, LibraryManager.GetVirtualFolders().SelectMany(i => i.Locations).ToList());
}
public static bool IsPathOffline(string path, List<string> allLibraryPaths)
{
if (FileSystem.FileExists(path))
{
@ -627,31 +634,20 @@ namespace MediaBrowser.Controller.Entities
return false;
}
path = System.IO.Path.GetDirectoryName(path);
}
if (allLibraryPaths.Contains(path, StringComparer.OrdinalIgnoreCase))
{
return true;
}
if (ContainsPath(LibraryManager.GetVirtualFolders(), originalPath))
{
return true;
path = System.IO.Path.GetDirectoryName(path);
}
return false;
}
/// <summary>
/// Determines whether the specified folders contains path.
/// </summary>
/// <param name="folders">The folders.</param>
/// <param name="path">The path.</param>
/// <returns><c>true</c> if the specified folders contains path; otherwise, <c>false</c>.</returns>
private static bool ContainsPath(IEnumerable<VirtualFolderInfo> folders, string path)
{
return folders.SelectMany(i => i.Locations).Any(i => ContainsPath(i, path));
return allLibraryPaths.Any(i => ContainsPath(i, originalPath));
}
private static bool ContainsPath(string parent, string path)
{
return string.Equals(parent, path, StringComparison.OrdinalIgnoreCase) || FileSystem.ContainsSubPath(parent, path);
return FileSystem.AreEqual(parent, path) || FileSystem.ContainsSubPath(parent, path);
}
/// <summary>

13
MediaBrowser.Controller/Entities/ICollectionFolder.cs
Unescape View File

@ -20,17 +20,4 @@ namespace MediaBrowser.Controller.Entities
{
bool EnableUserSpecificView { get; }
}
public static class CollectionFolderExtensions
{
public static string GetViewType(this ICollectionFolder folder, User user)
{
if (user.Configuration.PlainFolderViews.Contains(folder.Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
{
return null;
}
return folder.CollectionType;
}
}
}

3
MediaBrowser.Model/Configuration/UserConfiguration.cs
Unescape View File

@ -37,7 +37,6 @@ namespace MediaBrowser.Model.Configuration
public string[] OrderedViews { get; set; }
public string[] LatestItemsExcludes { get; set; }
public string[] PlainFolderViews { get; set; }
public bool HidePlayedInLatest { get; set; }
@ -61,8 +60,6 @@ namespace MediaBrowser.Model.Configuration
LatestItemsExcludes = new string[] { };
OrderedViews = new string[] { };
PlainFolderViews = new string[] { };
GroupedFolders = new string[] { };
}
}

2
MediaBrowser.Model/IO/IFileSystem.cs
Unescape View File

@ -120,6 +120,8 @@ namespace MediaBrowser.Model.IO
/// <param name="file2">The file2.</param>
void SwapFiles(string file1, string file2);
bool AreEqual(string path1, string path2);
/// <summary>
/// Determines whether [contains sub path] [the specified parent path].
/// </summary>

25
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
Unescape View File

@ -846,7 +846,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
AddUserData(item, writer, userManager, userDataRepo, options);
AddActors(people, writer, libraryManager, fileSystem, config);
AddActors(people, writer, libraryManager, fileSystem, config, options.SaveImagePathsInNfo);
var folder = item as BoxSet;
if (folder != null)
@ -974,7 +974,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteEndElement();
}
private static void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, IFileSystem fileSystem, IServerConfigurationManager config)
private static void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, IFileSystem fileSystem, IServerConfigurationManager config, bool saveImagePath)
{
var actors = people
.Where(i => !IsPersonType(i, PersonType.Director) && !IsPersonType(i, PersonType.Writer))
@ -1004,20 +1004,23 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("sortorder", person.SortOrder.Value.ToString(UsCulture));
}
try
if (saveImagePath)
{
var personEntity = libraryManager.GetPerson(person.Name);
var image = personEntity.GetImageInfo(ImageType.Primary, 0);
try
{
var personEntity = libraryManager.GetPerson(person.Name);
var image = personEntity.GetImageInfo(ImageType.Primary, 0);
if (image != null)
if (image != null)
{
writer.WriteElementString("thumb", GetImagePathToSave(image, libraryManager, config));
}
}
catch (Exception)
{
writer.WriteElementString("thumb", GetImagePathToSave(image, libraryManager, config));
// Already logged in core
}
}
catch (Exception)
{
// Already logged in core
}
writer.WriteEndElement();
}

Write Preview
Loading…
Cancel
Save