alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

updated nuget

Browse Source
This commit is contained in:
Luke Pulverenti
2014-08-06 22:51:09 -04:00
parent 56e4d6730f
commit 5d5a0e3add
27 changed files with 200 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1309,7 +1309,8 @@ namespace MediaBrowser.Controller.Entities
{
Path = file.FullName,
Type = type,
DateModified = FileSystem.GetLastWriteTimeUtc(file)
DateModified = FileSystem.GetLastWriteTimeUtc(file),
Length = ((FileInfo)file).Length
});
}
else
@@ -1420,11 +1421,14 @@ namespace MediaBrowser.Controller.Entities
return null;
}
var info = new FileInfo(path);
return new ItemImageInfo
{
Path = path,
DateModified = FileSystem.GetLastWriteTimeUtc(path),
Type = imageType
DateModified = FileSystem.GetLastWriteTimeUtc(info),
Type = imageType,
Length = info.Length
};
}

2
MediaBrowser.Controller/Entities/ItemImageInfo.cs
View File

@@ -10,5 +10,7 @@ namespace MediaBrowser.Controller.Entities
public ImageType Type { get; set; }
public DateTime DateModified { get; set; }
public long? Length { get; set; }
}
}

13
MediaBrowser.Controller/Playlists/Playlist.cs
View File

@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Playlists
public IEnumerable<BaseItem> GetManageableItems()
{
return GetLinkedChildren();
return GetPlaylistItems(MediaType, GetLinkedChildren(), null);
}
private IEnumerable<BaseItem> GetPlayableItems(User user)
@@ -40,8 +40,12 @@ namespace MediaBrowser.Controller.Playlists
if (folder != null)
{
var items = folder.GetRecursiveChildren(user, true)
.Where(m => !m.IsFolder && string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
var items = user == null
? folder.GetRecursiveChildren()
: folder.GetRecursiveChildren(user, true);
items = items
.Where(m => !m.IsFolder);
if (!folder.IsPreSorted)
{
@@ -52,7 +56,8 @@ namespace MediaBrowser.Controller.Playlists
}
return new[] { i };
});
}).Where(m => string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
}
[IgnoreDataMember]