aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata/Images
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-26 13:30:15 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-26 13:30:15 -0400
commit37c27a26e90b7eff62cec9e2b6a6c003e79fcbe4 (patch)
treed8c628a1f1ffeb33ba021158822eeffa74928f4e /MediaBrowser.LocalMetadata/Images
parentd56fa09ccc5e1a5f9440645330ce337273fa3bd7 (diff)
added sync job database
Diffstat (limited to 'MediaBrowser.LocalMetadata/Images')
-rw-r--r--MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs12
-rw-r--r--MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs14
-rw-r--r--MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs2
-rw-r--r--MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs11
-rw-r--r--MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs27
5 files changed, 47 insertions, 19 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index 29fd76aa5..ccb2acd1d 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -1,11 +1,19 @@
-using System.Collections.Generic;
+using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
+using System.Collections.Generic;
namespace MediaBrowser.LocalMetadata.Images
{
public class CollectionFolderLocalImageProvider : ILocalImageFileProvider, IHasOrder
{
+ private readonly IFileSystem _fileSystem;
+
+ public CollectionFolderLocalImageProvider(IFileSystem fileSystem)
+ {
+ _fileSystem = fileSystem;
+ }
+
public string Name
{
get { return "Collection Folder Images"; }
@@ -29,7 +37,7 @@ namespace MediaBrowser.LocalMetadata.Images
{
var collectionFolder = (CollectionFolder)item;
- return new LocalImageProvider().GetImages(item, collectionFolder.PhysicalLocations, directoryService);
+ return new LocalImageProvider(_fileSystem).GetImages(item, collectionFolder.PhysicalLocations, directoryService);
}
}
}
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index f40020c84..cd9b78201 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
@@ -11,6 +12,13 @@ namespace MediaBrowser.LocalMetadata.Images
{
public class EpisodeLocalLocalImageProvider : ILocalImageFileProvider
{
+ private readonly IFileSystem _fileSystem;
+
+ public EpisodeLocalLocalImageProvider(IFileSystem fileSystem)
+ {
+ _fileSystem = fileSystem;
+ }
+
public string Name
{
get { return "Local Images"; }
@@ -27,7 +35,7 @@ namespace MediaBrowser.LocalMetadata.Images
var parentPathFiles = directoryService.GetFileSystemEntries(parentPath);
- var nameWithoutExtension = Path.GetFileNameWithoutExtension(item.Path);
+ var nameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(item.Path);
var files = GetFilesFromParentFolder(nameWithoutExtension, parentPathFiles);
@@ -60,7 +68,7 @@ namespace MediaBrowser.LocalMetadata.Images
if (BaseItem.SupportedImageExtensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase))
{
- var currentNameWithoutExtension = Path.GetFileNameWithoutExtension(i.Name);
+ var currentNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(i);
if (string.Equals(filenameWithoutExtension, currentNameWithoutExtension, StringComparison.OrdinalIgnoreCase))
{
diff --git a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs b/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
index 3f84df462..d992e2026 100644
--- a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.LocalMetadata.Images
try
{
- return new LocalImageProvider().GetImages(item, path, directoryService);
+ return new LocalImageProvider(_fileSystem).GetImages(item, path, directoryService);
}
catch (DirectoryNotFoundException)
{
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 8c4f6247c..c126af884 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -1,19 +1,22 @@
-using System.Collections.Generic;
-using System.IO;
+using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Providers;
+using System.Collections.Generic;
+using System.IO;
namespace MediaBrowser.LocalMetadata.Images
{
public class InternalMetadataFolderImageProvider : ILocalImageFileProvider, IHasOrder
{
private readonly IServerConfigurationManager _config;
+ private readonly IFileSystem _fileSystem;
- public InternalMetadataFolderImageProvider(IServerConfigurationManager config)
+ public InternalMetadataFolderImageProvider(IServerConfigurationManager config, IFileSystem fileSystem)
{
_config = config;
+ _fileSystem = fileSystem;
}
public string Name
@@ -57,7 +60,7 @@ namespace MediaBrowser.LocalMetadata.Images
try
{
- return new LocalImageProvider().GetImages(item, path, directoryService);
+ return new LocalImageProvider(_fileSystem).GetImages(item, path, directoryService);
}
catch (DirectoryNotFoundException)
{
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 5d7762823..f69c261d8 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -1,19 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
+using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
namespace MediaBrowser.LocalMetadata.Images
{
public class LocalImageProvider : ILocalImageFileProvider
{
+ private readonly IFileSystem _fileSystem;
+
+ public LocalImageProvider(IFileSystem fileSystem)
+ {
+ _fileSystem = fileSystem;
+ }
+
public string Name
{
get { return "Local Images"; }
@@ -117,7 +125,7 @@ namespace MediaBrowser.LocalMetadata.Images
var baseItem = item as BaseItem;
if (baseItem != null && baseItem.IsInMixedFolder)
{
- imagePrefix = Path.GetFileNameWithoutExtension(item.Path) + "-";
+ imagePrefix = _fileSystem.GetFileNameWithoutExtension(item.Path) + "-";
}
PopulatePrimaryImages(item, images, files, imagePrefix);
@@ -172,7 +180,7 @@ namespace MediaBrowser.LocalMetadata.Images
if (!string.IsNullOrEmpty(item.Path))
{
- var name = Path.GetFileNameWithoutExtension(item.Path);
+ var name = _fileSystem.GetFileNameWithoutExtension(item.Path);
if (!string.IsNullOrEmpty(name))
{
@@ -188,7 +196,7 @@ namespace MediaBrowser.LocalMetadata.Images
if (!string.IsNullOrEmpty(item.Path))
{
- var name = Path.GetFileNameWithoutExtension(item.Path);
+ var name = _fileSystem.GetFileNameWithoutExtension(item.Path);
if (!string.IsNullOrEmpty(name))
{
@@ -259,6 +267,7 @@ namespace MediaBrowser.LocalMetadata.Images
}
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
private void PopulateSeasonImagesFromSeriesFolder(Season season, List<LocalImageInfo> images, IDirectoryService directoryService)
{
var seasonNumber = season.IndexNumber;
@@ -316,7 +325,7 @@ namespace MediaBrowser.LocalMetadata.Images
private FileSystemInfo GetImage(IEnumerable<FileSystemInfo> files, string name)
{
var candidates = files
- .Where(i => string.Equals(name, Path.GetFileNameWithoutExtension(i.Name), StringComparison.OrdinalIgnoreCase))
+ .Where(i => string.Equals(name, _fileSystem.GetFileNameWithoutExtension(i), StringComparison.OrdinalIgnoreCase))
.ToList();
return BaseItem.SupportedImageExtensions