aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-20 17:32:43 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-20 17:32:43 -0400
commit329e04780375741d44aba3058a4e35b985903db6 (patch)
tree8cd0010819e37325fe95a9bf7723bac4c20f5e32 /MediaBrowser.Controller
parent432c52f934ffe6c161ee18d343277f31b75f75a1 (diff)
update seasons
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/TV/Season.cs29
-rw-r--r--MediaBrowser.Controller/Entities/TV/Series.cs2
-rw-r--r--MediaBrowser.Controller/Entities/UserViewBuilder.cs2
3 files changed, 17 insertions, 16 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 10436e0f2..53989943b 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -134,7 +134,7 @@ namespace MediaBrowser.Controller.Entities.TV
if (!result)
{
- if (!IsMissingSeason.HasValue)
+ if (!IsVirtualItem.HasValue)
{
return true;
}
@@ -144,12 +144,18 @@ namespace MediaBrowser.Controller.Entities.TV
}
[IgnoreDataMember]
- public bool? IsMissingSeason { get; set; }
+ public bool? IsVirtualItem { get; set; }
+
+ [IgnoreDataMember]
+ public bool IsMissingSeason
+ {
+ get { return (IsVirtualItem ?? false) && !IsUnaired; }
+ }
[IgnoreDataMember]
public bool IsVirtualUnaired
{
- get { return LocationType == LocationType.Virtual && IsUnaired; }
+ get { return (IsVirtualItem ?? false) && IsUnaired; }
}
[IgnoreDataMember]
@@ -313,19 +319,14 @@ namespace MediaBrowser.Controller.Entities.TV
{
var hasChanges = base.BeforeMetadataRefresh();
- var locationType = LocationType;
-
- if (locationType == LocationType.FileSystem || locationType == LocationType.Offline)
+ if (!IndexNumber.HasValue && !string.IsNullOrEmpty(Path))
{
- if (!IndexNumber.HasValue && !string.IsNullOrEmpty(Path))
- {
- IndexNumber = IndexNumber ?? LibraryManager.GetSeasonNumberFromPath(Path);
+ IndexNumber = IndexNumber ?? LibraryManager.GetSeasonNumberFromPath(Path);
- // If a change was made record it
- if (IndexNumber.HasValue)
- {
- hasChanges = true;
- }
+ // If a change was made record it
+ if (IndexNumber.HasValue)
+ {
+ hasChanges = true;
}
}
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index a1e7c7e15..17fc0c0d2 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -240,7 +240,7 @@ namespace MediaBrowser.Controller.Entities.TV
if (!includeMissingSeasons)
{
- seasons = seasons.Where(i => !(i.IsMissingSeason ?? false));
+ seasons = seasons.Where(i => !(i.IsMissingSeason));
}
if (!includeVirtualUnaired)
{
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index fbca357cd..d4a8b0730 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -1142,7 +1142,7 @@ namespace MediaBrowser.Controller.Entities
var e = i as Season;
if (e != null)
{
- return (e.IsMissingSeason ?? false) == val;
+ return (e.IsMissingSeason) == val;
}
return true;
});