diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-07 16:38:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 16:38:18 -0400 |
| commit | ab834f8fdffb64b562ece0512a53f361c62f7f6f (patch) | |
| tree | 818ab159a338df8b99e0d79fd3e85967c153f6c3 /MediaBrowser.Controller/Entities/Video.cs | |
| parent | e9bf2e413222af14ca791d989bd0470d5e282ae0 (diff) | |
| parent | cc679f356131707fa8726b7fc5bc4deca4383b28 (diff) | |
Merge pull request #2797 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/Video.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 7734ab8b0..044ecf9b1 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -184,8 +184,7 @@ namespace MediaBrowser.Controller.Entities public override bool CanDownload() { - if (VideoType == VideoType.HdDvd || VideoType == VideoType.Dvd || - VideoType == VideoType.BluRay) + if (VideoType == VideoType.Dvd || VideoType == VideoType.BluRay) { return false; } @@ -335,8 +334,7 @@ namespace MediaBrowser.Controller.Entities if (!IsPlaceHolder) { - if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd || - VideoType == VideoType.HdDvd) + if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd) { return Path; } @@ -353,7 +351,7 @@ namespace MediaBrowser.Controller.Entities { if (LocationType == LocationType.FileSystem) { - if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd || VideoType == VideoType.HdDvd) + if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd) { return System.IO.Path.GetFileName(Path); } @@ -398,6 +396,11 @@ namespace MediaBrowser.Controller.Entities /// <returns>List{System.String}.</returns> public List<string> GetPlayableStreamFiles(string rootPath) { + if (VideoType == VideoType.VideoFile) + { + return new List<string>(); + } + var allFiles = FileSystem.GetFilePaths(rootPath, true).ToList(); var videoType = VideoType; @@ -737,10 +740,6 @@ namespace MediaBrowser.Controller.Entities { terms.Add("DVD"); } - else if (video.VideoType == VideoType.HdDvd) - { - terms.Add("HD-DVD"); - } else if (video.VideoType == VideoType.Iso) { if (video.IsoType.HasValue) |