alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 01:24:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update collection menus

Browse Source
This commit is contained in:
Luke Pulverenti
2015-10-07 17:42:29 -04:00
parent b82254060d
commit b1859d41e8
6 changed files with 71 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
View File

@@ -172,30 +172,31 @@ namespace MediaBrowser.Server.Implementations.Collections
itemList.Add(item);
if (currentLinkedChildren.Any(i => i.Id == itemId))
if (currentLinkedChildren.All(i => i.Id != itemId))
{
throw new ArgumentException("Item already exists in collection");
list.Add(LinkedChild.Create(item));
}
list.Add(LinkedChild.Create(item));
}
collection.LinkedChildren.AddRange(list);
collection.UpdateRatingToContent();
await collection.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
_providerManager.QueueRefresh(collection.Id, new MetadataRefreshOptions(_fileSystem));
if (fireEvent)
if (list.Count > 0)
{
EventHelper.FireEventIfNotNull(ItemsAddedToCollection, this, new CollectionModifiedEventArgs
{
Collection = collection,
ItemsChanged = itemList
collection.LinkedChildren.AddRange(list);
}, _logger);
collection.UpdateRatingToContent();
await collection.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
_providerManager.QueueRefresh(collection.Id, new MetadataRefreshOptions(_fileSystem));
if (fireEvent)
{
EventHelper.FireEventIfNotNull(ItemsAddedToCollection, this, new CollectionModifiedEventArgs
{
Collection = collection,
ItemsChanged = itemList
}, _logger);
}
}
}

18
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@@ -16,7 +16,6 @@ using System;
using System.IO;
using System.Linq;
using CommonIO;
using MediaBrowser.Common.IO;
namespace MediaBrowser.Server.Implementations.Configuration
{
@@ -25,7 +24,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
/// </summary>
public class ServerConfigurationManager : BaseConfigurationManager, IServerConfigurationManager
{
private readonly IFileSystem _fileSystem;
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfigurationManager" /> class.
@@ -33,10 +31,10 @@ namespace MediaBrowser.Server.Implementations.Configuration
/// <param name="applicationPaths">The application paths.</param>
/// <param name="logManager">The log manager.</param>
/// <param name="xmlSerializer">The XML serializer.</param>
/// <param name="fileSystem">The file system.</param>
public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
: base(applicationPaths, logManager, xmlSerializer)
: base(applicationPaths, logManager, xmlSerializer, fileSystem)
{
_fileSystem = fileSystem;
UpdateItemsByNamePath();
UpdateMetadataPath();
}
@@ -203,7 +201,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
&& !string.Equals(Configuration.ItemsByNamePath ?? string.Empty, newPath))
{
// Validate
if (!_fileSystem.DirectoryExists(newPath))
if (!FileSystem.DirectoryExists(newPath))
{
throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
}
@@ -225,7 +223,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
&& !string.Equals(Configuration.MetadataPath ?? string.Empty, newPath))
{
// Validate
if (!_fileSystem.DirectoryExists(newPath))
if (!FileSystem.DirectoryExists(newPath))
{
throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
}
@@ -234,14 +232,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
}
}
private void EnsureWriteAccess(string path)
{
var file = Path.Combine(path, Guid.NewGuid().ToString());
_fileSystem.WriteAllText(file, string.Empty);
_fileSystem.DeleteFile(file);
}
public void DisableMetadataService(string service)
{
DisableMetadataService(typeof(Movie), Configuration, service);

19
MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
View File

@@ -49,14 +49,23 @@ namespace MediaBrowser.Server.Implementations.Connect
private async void TimerCallback(object state)
{
var index = 0;
foreach (var ipLookupUrl in _ipLookups)
{
try
{
// Sometimes whatismyipaddress might fail, but it won't do us any good having users raise alarms over it.
var logErrors = index > 0;
#if DEBUG
logErrors = true;
#endif
using (var stream = await _httpClient.Get(new HttpRequestOptions
{
Url = ipLookupUrl,
UserAgent = "Emby Server/" + _appHost.ApplicationVersion
UserAgent = "Emby Server/" + _appHost.ApplicationVersion,
LogErrors = logErrors
}).ConfigureAwait(false))
{
@@ -80,6 +89,8 @@ namespace MediaBrowser.Server.Implementations.Connect
{
_logger.ErrorException("Error getting connection info", ex);
}
index++;
}
}
@@ -94,8 +105,8 @@ namespace MediaBrowser.Server.Implementations.Connect
try
{
_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
_fileSystem.WriteAllText(path, address, Encoding.UTF8);
_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
_fileSystem.WriteAllText(path, address, Encoding.UTF8);
}
catch (Exception ex)
{
@@ -109,7 +120,7 @@ namespace MediaBrowser.Server.Implementations.Connect
try
{
var endpoint = _fileSystem.ReadAllText(path, Encoding.UTF8);
var endpoint = _fileSystem.ReadAllText(path, Encoding.UTF8);
if (IsValid(endpoint))
{