mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-21 08:15:28 +03:00
removed dead code
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Common.Events;
|
||||
using MediaBrowser.Common.IO;
|
||||
using MediaBrowser.Common.Net;
|
||||
using MediaBrowser.Controller.Devices;
|
||||
using MediaBrowser.Controller.Library;
|
||||
@@ -19,8 +18,6 @@ using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using CommonIO;
|
||||
using MediaBrowser.Controller.Configuration;
|
||||
using MediaBrowser.Controller.Plugins;
|
||||
using MediaBrowser.Model.Entities;
|
||||
|
||||
namespace MediaBrowser.Server.Implementations.Devices
|
||||
{
|
||||
@@ -210,8 +207,6 @@ namespace MediaBrowser.Server.Implementations.Devices
|
||||
path = Path.Combine(path, _fileSystem.GetValidFilename(device.Name));
|
||||
}
|
||||
|
||||
EnsureMediaLibrarySetup();
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
@@ -220,64 +215,6 @@ namespace MediaBrowser.Server.Implementations.Devices
|
||||
get { return Path.Combine(_config.CommonApplicationPaths.DataPath, "camerauploads"); }
|
||||
}
|
||||
|
||||
internal void EnsureMediaLibrarySetup()
|
||||
{
|
||||
//EnsureMediaLibrarySetup(DefaultCameraUploadsPath, false);
|
||||
}
|
||||
|
||||
private void EnsureMediaLibrarySetup(string libraryPath, bool force)
|
||||
{
|
||||
var requiresSetup = false;
|
||||
|
||||
var path = Path.Combine(_config.ApplicationPaths.DefaultUserViewsPath, "Camera Uploads");
|
||||
|
||||
var collectionMarkerFile = Path.Combine(path, CollectionType.Photos + ".collection");
|
||||
if (!_fileSystem.FileExists(collectionMarkerFile))
|
||||
{
|
||||
requiresSetup = true;
|
||||
}
|
||||
|
||||
var shortcutFile = Path.Combine(path, "camerauploads.mblink");
|
||||
try
|
||||
{
|
||||
if (!string.Equals(_fileSystem.ReadAllText(shortcutFile), libraryPath))
|
||||
{
|
||||
requiresSetup = true;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
requiresSetup = true;
|
||||
}
|
||||
|
||||
if (requiresSetup)
|
||||
{
|
||||
if (!force)
|
||||
{
|
||||
var extensions = new[] { ".jpg", ".png" };
|
||||
var hasPhotos = _fileSystem.GetFiles(libraryPath, true).Any(i => extensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase));
|
||||
|
||||
// Nothing to do
|
||||
if (!hasPhotos)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (requiresSetup)
|
||||
{
|
||||
Directory.CreateDirectory(path);
|
||||
|
||||
using (File.Create(collectionMarkerFile))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
_fileSystem.CreateShortcut(shortcutFile, libraryPath);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task UpdateDeviceInfo(string id, DeviceOptions options)
|
||||
{
|
||||
var device = GetDevice(id);
|
||||
@@ -337,25 +274,6 @@ namespace MediaBrowser.Server.Implementations.Devices
|
||||
}
|
||||
}
|
||||
|
||||
public class DeviceManagerEntryPoint : IServerEntryPoint
|
||||
{
|
||||
private readonly IDeviceManager _deviceManager;
|
||||
|
||||
public DeviceManagerEntryPoint(IDeviceManager deviceManager)
|
||||
{
|
||||
_deviceManager = deviceManager;
|
||||
}
|
||||
|
||||
public void Run()
|
||||
{
|
||||
((DeviceManager)_deviceManager).EnsureMediaLibrarySetup();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public class DevicesConfigStore : IConfigurationFactory
|
||||
{
|
||||
public IEnumerable<ConfigurationStore> GetConfigurations()
|
||||
|
||||
Reference in New Issue
Block a user