diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-27 08:18:59 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-27 08:18:59 -0400 |
| commit | 42a28356337db5e4c82b3a898c7dce8836744fcb (patch) | |
| tree | 60c5a96fe562563a37ea8e2c9d982c6adec593e3 /MediaBrowser.Controller | |
| parent | 81c16c305bca7806e7749e90c23d90aaca2d0ab5 (diff) | |
Removed vf collection type
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 31 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/ItemResolveEventArgs.cs | 40 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/VirtualFolderResolver.cs | 46 |
4 files changed, 33 insertions, 85 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 5359bdc91..ec7bf9c28 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -227,9 +227,40 @@ namespace MediaBrowser.Controller user.Name = "Default User";
user.Id = Guid.Parse("5d1cf7fce25943b790d140095457a42b");
+ user.PrimaryImagePath = "D:\\Video\\TV\\Archer (2009)\\folder.jpg";
list.Add(user);
+
+ user = new User();
+ user.Name = "Test User 1";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+
+ user = new User();
+ user.Name = "Test User 2";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+
+ user = new User();
+ user.Name = "Test User 3";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+ user = new User();
+ user.Name = "Test User 4";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+
+ user = new User();
+ user.Name = "Test User 5";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+
+ user = new User();
+ user.Name = "Test User 6";
+ user.Id = Guid.NewGuid();
+ list.Add(user);
+
return list;
}
diff --git a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs index 0daca3b44..bace0ca49 100644 --- a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs @@ -31,7 +31,7 @@ namespace MediaBrowser.Controller.Library {
for (int i = 0; i < FileSystemChildren.Length; i++)
{
- if (System.IO.Path.GetFileName(FileSystemChildren[i].Path).Equals(name, StringComparison.OrdinalIgnoreCase))
+ if (FileSystemChildren[i].cFileName.Equals(name, StringComparison.OrdinalIgnoreCase))
{
return true;
}
@@ -42,15 +42,7 @@ namespace MediaBrowser.Controller.Library public bool ContainsFolder(string name)
{
- for (int i = 0; i < FileSystemChildren.Length; i++)
- {
- if (System.IO.Path.GetFileName(FileSystemChildren[i].Path).Equals(name, StringComparison.OrdinalIgnoreCase))
- {
- return true;
- }
- }
-
- return false;
+ return ContainsFile(name);
}
}
@@ -77,34 +69,6 @@ namespace MediaBrowser.Controller.Library }
}
- public VirtualFolder VirtualFolder
- {
- get
- {
- if (Parent != null)
- {
- return Parent.VirtualFolder;
- }
-
- return null;
- }
- }
-
- public string VirtualFolderCollectionType
- {
- get
- {
- VirtualFolder vf = VirtualFolder;
-
- if (vf == null)
- {
- return null;
- }
-
- return vf.CollectionType;
- }
- }
-
public bool IsHidden
{
get
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 5055ff1fc..d6f448ac6 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -77,7 +77,6 @@ <Compile Include="Resolvers\BaseItemResolver.cs" />
<Compile Include="Resolvers\FolderResolver.cs" />
<Compile Include="Resolvers\VideoResolver.cs" />
- <Compile Include="Resolvers\VirtualFolderResolver.cs" />
<Compile Include="Xml\BaseItemXmlParser.cs" />
<Compile Include="Xml\XmlExtensions.cs" />
</ItemGroup>
diff --git a/MediaBrowser.Controller/Resolvers/VirtualFolderResolver.cs b/MediaBrowser.Controller/Resolvers/VirtualFolderResolver.cs deleted file mode 100644 index e7940ef14..000000000 --- a/MediaBrowser.Controller/Resolvers/VirtualFolderResolver.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.ComponentModel.Composition;
-using System.IO;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Resolvers
-{
- [Export(typeof(IBaseItemResolver))]
- public class VirtualFolderResolver : BaseFolderResolver<VirtualFolder>
- {
- public override ResolverPriority Priority
- {
- get { return ResolverPriority.Third; }
- }
-
- protected override VirtualFolder Resolve(ItemResolveEventArgs args)
- {
- if (args.IsDirectory && args.Parent != null && args.Parent.IsRoot)
- {
- return new VirtualFolder();
- }
-
- return null;
- }
-
- protected override void SetInitialItemValues(VirtualFolder item, ItemResolveEventArgs args)
- {
- // Set the name initially by stripping off the [CollectionType=...]
- // The name can always be overridden later by folder.xml
- string pathName = Path.GetFileNameWithoutExtension(args.Path);
-
- string srch = "[collectiontype=";
- int index = pathName.IndexOf(srch, System.StringComparison.OrdinalIgnoreCase);
-
- if (index != -1)
- {
- item.Name = pathName.Substring(0, index).Trim();
-
- item.CollectionType = pathName.Substring(index + srch.Length).TrimEnd(']');
- }
-
- base.SetInitialItemValues(item, args);
- }
-
- }
-}
|